From 3e8ef44a1d7febbf9164f1a4265adb85926c5f28 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 9 Feb 2025 13:28:35 +1000 Subject: [PATCH] Deps: Update to SDL3 3.2.4 --- .../deps/build-dependencies-linux-cross.sh | 4 ++-- scripts/deps/build-dependencies-linux.sh | 4 ++-- scripts/deps/build-dependencies-mac.sh | 4 ++-- .../deps/build-dependencies-windows-arm64.bat | 4 ++-- .../deps/build-dependencies-windows-x64.bat | 4 ++-- scripts/packaging/arch/PKGBUILD | 24 +++++++++++++++---- scripts/packaging/fedora/duckstation.spec | 13 +++++++--- .../packaging/flatpak/modules/20-sdl3.yaml | 4 ++-- 8 files changed, 42 insertions(+), 19 deletions(-) diff --git a/scripts/deps/build-dependencies-linux-cross.sh b/scripts/deps/build-dependencies-linux-cross.sh index a3c0ee789..5be278d81 100755 --- a/scripts/deps/build-dependencies-linux-cross.sh +++ b/scripts/deps/build-dependencies-linux-cross.sh @@ -90,7 +90,7 @@ LIBJPEGTURBO=3.1.0 LIBPNG=1.6.45 LIBWEBP=1.5.0 LIBZIP=1.11.3 -SDL3=3.2.2 +SDL3=3.2.4 QT=6.8.2 ZSTD=1.5.6 @@ -118,7 +118,7 @@ fi cat > SHASUMS < SHASUMS < SHASUMS <=6.8.0' - 'qt6-imageformats>=6.8.0' - 'qt6-svg>=6.8.0' + 'qt6-base>=6.8.2' + 'qt6-imageformats>=6.8.2' + 'qt6-svg>=6.8.2' 'wayland' 'zlib' 'zstd' @@ -46,13 +51,21 @@ makedepends=('base-devel' 'lld' 'llvm' 'ninja' - 'qt6-tools>=6.8.0') + 'qt6-tools>=6.8.2') source=( "${pkgname}::git+file://${startdir}/../../.." + "https://github.com/duckstation/chtdb/releases/download/latest/cheats.zip" + "https://github.com/duckstation/chtdb/releases/download/latest/patches.zip" ) sha256sums=( "SKIP" + "SKIP" + "SKIP" +) +noextract=( + "cheats.zip" + "patches.zip" ) # Name of the .desktop file that will be installed. @@ -70,6 +83,9 @@ pkgver() { prepare() { cd "${pkgname}" + # Copy resources + cp "../cheats.zip" "../patches.zip" "data/resources" + # Are we creating a CI/official build? _tagpath="${startdir}/../../../src/scmversion/tag.h" if [[ -f "${_tagpath}" ]]; then diff --git a/scripts/packaging/fedora/duckstation.spec b/scripts/packaging/fedora/duckstation.spec index a8f8ca4d9..e40f9c43e 100644 --- a/scripts/packaging/fedora/duckstation.spec +++ b/scripts/packaging/fedora/duckstation.spec @@ -1,8 +1,13 @@ -# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-FileCopyrightText: 2019-2025 Connor McLaughlin # SPDX-License-Identifier: CC-BY-NC-ND-4.0 # NOTE: These package files are intended for your own personal/private use. # You do not have permission to upload them independently to other package repositories. +# +# To build: +# git clone https://github.com/stenzek/duckstation.git +# rpmbuild -bb scripts/packaging/fedora/duckstation.spec +# sudo rpm -ivh ~/rpmbuild/RPMS/duckstation-*.rpm Name: duckstation Version: 0.0.0 @@ -14,7 +19,7 @@ BuildRequires: alsa-lib-devel, clang, cmake, dbus-devel, egl-wayland-devel, extr BuildRequires: extra-cmake-modules, freetype-devel, libavcodec-free-devel, libavformat-free-devel BuildRequires: libavutil-free-devel, libcurl-devel, libevdev-devel, libswresample-free-devel BuildRequires: libswscale-free-devel, libpng-devel, libwebp-devel, libX11-devel, libXrandr-devel -BuildRequires: libzip-devel, libzstd-devel, lld, llvm, make, mesa-libEGL-devel, mesa-libGL-devel +BuildRequires: libzip-devel, libzip-tools, libzstd-devel, lld, llvm, make, mesa-libEGL-devel, mesa-libGL-devel BuildRequires: ninja-build, patch, pipewire-devel pulseaudio-libs-devel, wayland-devel, zlib-devel BuildRequires: qt6-qtbase-devel, qt6-qtbase-private-devel, qt6-qttools, qt6-qttools-devel @@ -28,7 +33,7 @@ Requires: qt6-qtbase qt6-qtbase-gui qt6-qtimageformats qt6-qtsvg %undefine _include_frame_pointers # Defines -O2, -flto, and others. We manage LTO ourselves. -%global _general_options "-O2" "-pipe" +%global _general_options "-O3" "-pipe" %global _preprocessor_defines "" # We include debug information in the main package for user backtrace reporting. @@ -44,6 +49,8 @@ DuckStation is an simulator/emulator of the Sony PlayStation(TM) console, focusi %prep %setup -n duckstation -c -T git clone file://%{SOURCEURL0} . +curl -L -o "data/resources/cheats.zip" "https://github.com/duckstation/chtdb/releases/download/latest/cheats.zip" +curl -L -o "data/resources/patches.zip" "https://github.com/duckstation/chtdb/releases/download/latest/patches.zip" if [ -f "%{SOURCEURL0}/src/scmversion/tag.h" ]; then echo "Copying SCM release tag..." cp "%{SOURCEURL0}/src/scmversion/tag.h" src/scmversion diff --git a/scripts/packaging/flatpak/modules/20-sdl3.yaml b/scripts/packaging/flatpak/modules/20-sdl3.yaml index 9ff1ca8b4..51baa5130 100644 --- a/scripts/packaging/flatpak/modules/20-sdl3.yaml +++ b/scripts/packaging/flatpak/modules/20-sdl3.yaml @@ -14,8 +14,8 @@ build-options: strip: true sources: - type: archive - url: "https://github.com/libsdl-org/SDL/releases/download/release-3.2.2/SDL3-3.2.2.tar.gz" - sha256: "d3dcf1b2f64746be0f248ef27b35aec4f038dafadfb83491f98a7fecdaf6efec" + url: "https://github.com/libsdl-org/SDL/releases/download/release-3.2.4/SDL3-3.2.4.tar.gz" + sha256: "2938328317301dfbe30176d79c251733aa5e7ec5c436c800b99ed4da7adcb0f0" cleanup: - /bin - /include