diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20f8ddf9..3cbe2d90 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -427,13 +427,13 @@ jobs: - name: Cache APT packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev libasound2-dev libmpv-dev mpv + packages: clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev libasound2-dev libmpv-dev mpv libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxi-dev libxss-dev libpulse-dev libdbus-1-dev libdrm-dev libgbm-dev libegl-dev libgl-dev libwayland-dev version: 1.1 - name: Install Linux dependencies run: | sudo apt-get update - sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev libasound2-dev libmpv-dev mpv + sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev libasound2-dev libmpv-dev mpv libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxi-dev libxss-dev libpulse-dev libdbus-1-dev libdrm-dev libgbm-dev libegl-dev libgl-dev libwayland-dev - name: Install dependencies run: flutter pub get @@ -483,13 +483,13 @@ jobs: - name: Cache APT packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev libasound2-dev libmpv-dev mpv + packages: clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev libasound2-dev libmpv-dev mpv libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxi-dev libxss-dev libpulse-dev libdbus-1-dev libdrm-dev libgbm-dev libegl-dev libgl-dev libwayland-dev version: 1.1 - name: Install Linux dependencies run: | sudo apt-get update - sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev libasound2-dev libmpv-dev mpv + sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev libasound2-dev libmpv-dev mpv libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxi-dev libxss-dev libpulse-dev libdbus-1-dev libdrm-dev libgbm-dev libegl-dev libgl-dev libwayland-dev - name: Install dependencies run: flutter pub get diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 12906643..b8666e01 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -70,6 +70,10 @@ set_target_properties(${BINARY_NAME} ) +# Bundle SDL3 from source so the build works on systems without libsdl3-dev +# (e.g. arm64 Linux where no distro package exists yet). +set(BUNDLE_SDL3 ON CACHE BOOL "" FORCE) + # Generated plugin build rules, which manage building the plugins and adding # them to the application. include(flutter/generated_plugins.cmake) diff --git a/linux/packaging/build-packages.py b/linux/packaging/build-packages.py index 35663aea..3b75f174 100755 --- a/linux/packaging/build-packages.py +++ b/linux/packaging/build-packages.py @@ -39,7 +39,6 @@ DISTROS = { "libgtk-3-0", "libmpv2 | libmpv1", "libepoxy0", - "libsdl3-0", "libasound2", "libglib2.0-0", ], @@ -54,7 +53,6 @@ DISTROS = { "gtk3", "mpv-libs", "libepoxy", - "SDL3", "alsa-lib", "glib2", ], @@ -69,7 +67,6 @@ DISTROS = { "gtk3", "mpv", "libepoxy", - "sdl3", "alsa-lib", "glib2", ], diff --git a/pubspec.lock b/pubspec.lock index 88007384..708a498f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1247,10 +1247,10 @@ packages: dependency: "direct main" description: name: universal_gamepad - sha256: e31955d2f9b2a1aa11eebd64a80df6a2a66ccdae309471c447b36b44bf55d1c1 + sha256: fff36a78ac91986ec4ef6281e16df644f14b690a0c4978792e86055e0cc809ad url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.0" url_launcher: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 205f29c2..04f0a695 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -35,7 +35,7 @@ dependencies: wakelock_plus: ^1.2.10 path_provider: ^2.1.0 path: ^1.9.0 - universal_gamepad: ^1.0.0 + universal_gamepad: ^1.1.0 drift: ^2.28.2 sqlite3_flutter_libs: ^0.5.41 workmanager: ^0.9.0+3 @@ -49,7 +49,6 @@ dependencies: dart_discord_presence: ^1.1.0 flutter_svg: ^2.2.3 - dev_dependencies: flutter_test: sdk: flutter