From e1a9c69a4ada80b3f059c7ff51f1a508f5b800c2 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 7 Jul 2024 13:47:39 +1000 Subject: [PATCH] Deps: Bump to SDL 2.30.5 --- .github/workflows/rolling-release.yml | 36 +++++++++---------- scripts/deps/build-dependencies-linux.sh | 14 ++++---- scripts/deps/build-dependencies-mac.sh | 14 ++++---- .../deps/build-dependencies-windows-arm64.bat | 12 +++---- .../deps/build-dependencies-windows-x64.bat | 10 +++--- scripts/flatpak/modules/20-sdl2.json | 4 +-- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml index fdf5dbe8c..9fa66390f 100644 --- a/.github/workflows/rolling-release.yml +++ b/.github/workflows/rolling-release.yml @@ -276,7 +276,7 @@ jobs: linux-flatpak-build: runs-on: ubuntu-22.04 container: - image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.7 + image: bilelmoussaoui/flatpak-github-actions:kde-6.7 options: --privileged timeout-minutes: 120 steps: @@ -299,14 +299,14 @@ jobs: scripts/generate-metainfo.sh scripts/flatpak cat scripts/flatpak/org.duckstation.DuckStation.metainfo.xml - - name: Validate AppStream XML - run: flatpak-builder-lint appstream scripts/flatpak/org.duckstation.DuckStation.metainfo.xml + #- name: Validate AppStream XML + # run: flatpak-builder-lint appstream scripts/flatpak/org.duckstation.DuckStation.metainfo.xml - - name: Validate manifest - run: flatpak-builder-lint manifest scripts/flatpak/org.duckstation.DuckStation.json + #- name: Validate manifest + # run: flatpak-builder-lint manifest scripts/flatpak/org.duckstation.DuckStation.json - name: Build Flatpak - uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8 + uses: flatpak/flatpak-github-actions/flatpak-builder@d6ddccb268e43e87b19ca0112b83de26fb83b215 with: bundle: duckstation-x64.flatpak upload-artifact: false @@ -314,24 +314,24 @@ jobs: arch: x86_64 build-bundle: true verbose: true - mirror-screenshots-url: https://dl.flathub.org/media + #mirror-screenshots-url: https://dl.flathub.org/media branch: stable cache: true restore-cache: true cache-key: flatpak-x64-${{ hashFiles('scripts/flatpak/**/*.json') }} - - name: Push to Flathub stable - if: github.ref == 'refs/heads/dev' - uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8 - with: - flat-manager-url: https://hub.flathub.org/ - repository: stable - token: ${{ secrets.FLATHUB_STABLE_TOKEN }} - build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} + #- name: Push to Flathub stable + # if: github.ref == 'refs/heads/dev' + # uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8 + # with: + # flat-manager-url: https://hub.flathub.org/ + # repository: stable + # token: ${{ secrets.FLATHUB_STABLE_TOKEN }} + # build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} - - name: Validate build - run: | - flatpak-builder-lint repo repo + #- name: Validate build + # run: | + # flatpak-builder-lint repo repo - name: Upload Flatpak uses: actions/upload-artifact@v4.3.3 diff --git a/scripts/deps/build-dependencies-linux.sh b/scripts/deps/build-dependencies-linux.sh index 68f073c88..f757f625a 100755 --- a/scripts/deps/build-dependencies-linux.sh +++ b/scripts/deps/build-dependencies-linux.sh @@ -18,7 +18,7 @@ LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075 LIBJPEG=9f LIBPNG=1.6.43 LIBWEBP=1.4.0 -SDL=SDL2-2.30.4 +SDL2=2.30.5 QT=6.7.2 ZSTD=1.5.6 @@ -38,7 +38,7 @@ fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79 $LIBBACKTRACE. 04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b jpegsrc.v$LIBJPEG.tar.gz 6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c libpng-$LIBPNG.tar.xz 61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5 libwebp-$LIBWEBP.tar.gz -59c89d0ed40d4efb23b7318aa29fe7039dbbc098334b14f17f1e7e561da31a26 $SDL.tar.gz +f374f3fa29c37dfcc20822d4a7d7dc57e58924d1a5f2ad511bfab4c8193de63b SDL2-$SDL2.tar.gz 8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1 zstd-$ZSTD.tar.gz c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599 qtbase-everywhere-src-$QT.tar.xz e1a1d8785fae67d16ad0a443b01d5f32663a6b68d275f1806ebab257485ce5d6 qtimageformats-everywhere-src-$QT.tar.xz @@ -60,7 +60,7 @@ curl -C - -L \ -O "https://ijg.org/files/jpegsrc.v$LIBJPEG.tar.gz" \ -O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \ -O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \ - -O "https://libsdl.org/release/$SDL.tar.gz" \ + -O "https://github.com/libsdl-org/SDL/releases/download/release-$SDL2/SDL2-$SDL2.tar.gz" \ -O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \ -O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \ @@ -127,10 +127,10 @@ cmake --build build --parallel ninja -C build install cd .. -echo "Building SDL..." -rm -fr "$SDL" -tar xf "$SDL.tar.gz" -cd "$SDL" +echo "Building SDL2..." +rm -fr "SDL2-$SDL2" +tar xf "SDL2-$SDL2.tar.gz" +cd "SDL2-$SDL2" cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja cmake --build build --parallel ninja -C build install diff --git a/scripts/deps/build-dependencies-mac.sh b/scripts/deps/build-dependencies-mac.sh index 1ab62b248..2b07257f1 100755 --- a/scripts/deps/build-dependencies-mac.sh +++ b/scripts/deps/build-dependencies-mac.sh @@ -36,7 +36,7 @@ fi FREETYPE=2.13.2 HARFBUZZ=8.3.1 -SDL=SDL2-2.30.4 +SDL2=2.30.5 ZSTD=1.5.6 LIBPNG=1.6.43 LIBJPEG=9f @@ -73,7 +73,7 @@ CMAKE_ARCH_UNIVERSAL=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" cat > SHASUMS <