General cleanup, and add vgmstream patch

.gitea/workflows/compile.yaml

@@ -44,6 +44,8 @@ jobs:
           java-version: 17
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2.0.10
+      - name: Fix vgmstream repo
+        run: ./setup.sh
       - name: Build Debug apk
         run: ./setup-android-build.sh && cd sdl-android-project && ./gradlew assembleDebug --stacktrace
       - name: Build Debug bundle

build-android.sh

@@ -1,11 +0,0 @@
-#!/bin/env -S NOT_SOURCED=1 /bin/sh
-if ! [ "$NOT_SOURCED" = "1" ]; then
-	echo "Error: This script must not be sourced!" >&2
-	return 1
-fi
-pushd "$(dirname "$0")"
-./setup-android-project.sh
-cd sdl-android-project
-ln -fs "$(dirname "$(pwd)")" ./app/jni
-./gradlew build
-popd

build-file.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-rm -fr build-flatpak flatpak-repo
-flatpak-builder build-flatpak com.experimentalcraft.NekoPlayer.yml --repo ./flatpak-repo
-rm -f neko-player.flatpak
-flatpak build-bundle flatpak-repo/ neko-player.flatpak com.experimentalcraft.NekoPlayer

cmake-android.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-export CMAKE_TOOLCHAIN_FILE="$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake"
-#export CXX=$ANDROID_ABI-linux-$ANDROID_PLATFORM-clang++ CC=$ANDROID_ABI-linux-$ANDROID_PLATFORM-clang
-cmake -DUSE_GLES=ON -DUSE_PORTALS=OFF -DANDROID_ABI="$ANDROID_ABI" -DANDROID_NDK="$ANDROID_NDK_HOME" -DANDROID_PLATFORM="$ANDROID_PLATFORM" -DDOWNLOAD_AUDIO_CODECS_DEPENDENCY=ON -DCMAKE_TOOLCHAIN_FILE="$CMAKE_TOOLCHAIN_FILE" -DENABLE_DBUS=OFF -DBUILD_SDL=ON -DBUILD_SDL_IMAGE=ON "$@"

com.experimentalcraft.NekoPlayer.yml

@@ -1,43 +0,0 @@
-app-id: com.experimentalcraft.NekoPlayer
-runtime: org.freedesktop.Platform
-runtime-version: '22.08'
-sdk: org.freedesktop.Sdk
-command: neko-player
-rename-desktop-file: neko-player.desktop
-rename-icon: neko-player
-modules:
-  - name: soundtouch
-    buildsystem: cmake
-    sources:
-      - type: git
-        url: https://codeberg.org/soundtouch/soundtouch.git
-        tag: 2.3.2
-  - name: libportal
-    buildsystem: meson
-    config-opts:
-      - -Dvapi=false
-      - -Ddocs=false
-      - -Dtests=false
-      - -Dintrospection=false
-      - -Dbackends=[]
-    sources:
-      - type: archive
-        url: https://github.com/flatpak/libportal/releases/download/0.6/libportal-0.6.tar.xz
-        sha256: 88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566
-  - name: player
-    buildsystem: meson
-    builddir: true
-    config-opts:
-      - --buildtype
-      - release
-    sources:
-      - type: git
-        path: .git
-        branch: main
-        disable-shallow-clone: true
-finish-args:
-    - --share=ipc
-    - --socket=x11
-    - --socket=pulseaudio
-    - --device=dri
-    - --filesystem=xdg-music:ro

conanfile.txt

@@ -1,9 +0,0 @@
-[requires]
-sdl2/2.28.3
-SDL2_image/2.0.5
-soundtouch/2.3.2
-libgettext/0.22
-
-[generators]
-PkgConfigDeps
-MesonToolchain

flatpakref/nightly.flatpakref

@@ -1,12 +0,0 @@
-[Flatpak Ref]
-Version=1
-Name=com.experimentalcraft.NekoPlayer
-Url=https://flatpak.complecwaft.com/repo/beta
-RuntimeRepo=https://flatpak.complecwaft.com/repo/beta.flatpakrepo
-Title=Neko player
-Comment=Looping audio player
-Description=An audio player that can play back files with seamless loops using their metadata
-Icon=https://complecwaft.com/catmeow/neko-player/raw/branch/main/assets/icon.svg
-Homepage=https://complecwaft.com/catmeow/neko-player
-GPGKey=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
-SuggestRemoteName=catmeow72-beta

flatpakref/stable.flatpakref

@@ -1,12 +0,0 @@
-[Flatpak Ref]
-Version=1
-Name=com.experimentalcraft.NekoPlayer
-Url=https://flatpak.complecwaft.com/repo/stable
-RuntimeRepo=https://flatpak.complecwaft.com/repo/stable.flatpakrepo
-Title=Neko player
-Comment=Looping audio player
-Description=An audio player that can play back files with seamless loops using their metadata
-Icon=https://complecwaft.com/catmeow/neko-player/raw/branch/main/assets/icon.svg
-Homepage=https://complecwaft.com/catmeow/neko-player
-GPGKey=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
-SuggestRemoteName=catmeow72-stable

setup-android-project.ps1

@@ -1,13 +0,0 @@
-function Get-ScriptDirectory {
-    $scriptpath = $MyInvocation.MyCommand.Path
-    return Split-Path $scriptpath
-}
-$scriptdir = Get-ScriptDirectory
-Push-Location $scriptdir
-$android_project_dir = Join-Path($scriptdir, "sdl-android-project")
-$android_app_dir = Join-Path($android_project_dir, "app")
-$android_jni_dir = Join-Path($android_app_dir, "jni")
-if (test-path $android_jni_dir) {
-    rm $android_jni_dir
-}
-New-Item -ItemType Junction -Path $android_jni_dir -Value $scriptdir

setup.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+pushd "$(dirname "$0")subprojects/vgmstream"
+git apply ../../vgmstream.patch
+popd