From a5987878be9abe79bf1ccf7d1d63a2bb7f422695 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Fri, 16 May 2025 22:26:34 +1000
Subject: [PATCH] Deps: Version updates

SDL3, ffmpeg.
---
 CMakeModules/DuckStationDependencies.cmake    |  4 +-
 .../deps/build-dependencies-linux-cross.sh    |  4 +-
 scripts/deps/build-dependencies-linux.sh      |  4 +-
 scripts/deps/build-dependencies-mac.sh        |  8 ++--
 .../deps/build-dependencies-windows-arm64.bat |  4 +-
 .../deps/build-dependencies-windows-x64.bat   |  4 +-
 scripts/deps/build-ffmpeg-linux.sh            | 39 +++++++++++++------
 .../packaging/flatpak/modules/30-sdl3.yaml    |  4 +-
 8 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/CMakeModules/DuckStationDependencies.cmake b/CMakeModules/DuckStationDependencies.cmake
index 9f7eea070..b22309422 100644
--- a/CMakeModules/DuckStationDependencies.cmake
+++ b/CMakeModules/DuckStationDependencies.cmake
@@ -9,7 +9,7 @@ endif()
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
-find_package(SDL3 3.2.0 REQUIRED)
+find_package(SDL3 3.2.14 REQUIRED)
 find_package(zstd 1.5.6 REQUIRED)
 find_package(WebP REQUIRED) # v1.4.0, spews an error on Linux because no pkg-config.
 find_package(ZLIB REQUIRED) # 1.3, but Mac currently doesn't use it.
@@ -40,7 +40,7 @@ if(ENABLE_WAYLAND)
 endif()
 
 if(BUILD_QT_FRONTEND)
-  find_package(Qt6 6.8.0 COMPONENTS Core Gui Widgets LinguistTools REQUIRED)
+  find_package(Qt6 6.9.0 COMPONENTS Core Gui Widgets LinguistTools REQUIRED)
 endif()
 
 find_package(Shaderc REQUIRED)
diff --git a/scripts/deps/build-dependencies-linux-cross.sh b/scripts/deps/build-dependencies-linux-cross.sh
index 2d9be923b..cf8003309 100755
--- a/scripts/deps/build-dependencies-linux-cross.sh
+++ b/scripts/deps/build-dependencies-linux-cross.sh
@@ -108,7 +108,7 @@ LIBJPEGTURBO=3.1.0
 LIBPNG=1.6.47
 LIBWEBP=1.5.0
 LIBZIP=1.11.3
-SDL3=3.2.10
+SDL3=3.2.14
 QT=6.9.0
 ZLIBNG=2.2.4
 ZSTD=1.5.7
@@ -137,7 +137,7 @@ fi
 
 cat > SHASUMS <<EOF
 baf8aebd22002b762d803ba0e1e389b6b4415159334e9d34bba1a938f6de8ce6  libbacktrace-$LIBBACKTRACE.tar.gz
-f87be7b4dec66db4098e9c167b2aa34e2ca10aeb5443bdde95ae03185ed513e0  SDL3-$SDL3.tar.gz
+b7e7dc05011b88c69170fe18935487b2559276955e49113f8c1b6b72c9b79c1f  SDL3-$SDL3.tar.gz
 b60832071919220d2fe692151fb420fa9ea489aa4c7a2eb0e01c830cbe469858  cpuinfo-$CPUINFO.tar.gz
 297cd48a287a9113eec44902574084c6ab3b6a8b28d02606765a7fded431d7d8  discord-rpc-$DISCORD_RPC.tar.gz
 cc8eed38daf68aaaaa96e904f68f5524c02f10b5d42062b91cdc93f93445f68a  plutosvg-$PLUTOSVG.tar.gz
diff --git a/scripts/deps/build-dependencies-linux.sh b/scripts/deps/build-dependencies-linux.sh
index 2be790e0a..eec9378b9 100755
--- a/scripts/deps/build-dependencies-linux.sh
+++ b/scripts/deps/build-dependencies-linux.sh
@@ -76,7 +76,7 @@ LIBJPEGTURBO=3.1.0
 LIBPNG=1.6.47
 LIBWEBP=1.5.0
 LIBZIP=1.11.3
-SDL3=3.2.10
+SDL3=3.2.14
 QT=6.9.0
 ZLIBNG=2.2.4
 ZSTD=1.5.7
@@ -104,7 +104,7 @@ fi
 
 cat > SHASUMS <<EOF
 baf8aebd22002b762d803ba0e1e389b6b4415159334e9d34bba1a938f6de8ce6  libbacktrace-$LIBBACKTRACE.tar.gz
-f87be7b4dec66db4098e9c167b2aa34e2ca10aeb5443bdde95ae03185ed513e0  SDL3-$SDL3.tar.gz
+b7e7dc05011b88c69170fe18935487b2559276955e49113f8c1b6b72c9b79c1f  SDL3-$SDL3.tar.gz
 b60832071919220d2fe692151fb420fa9ea489aa4c7a2eb0e01c830cbe469858  cpuinfo-$CPUINFO.tar.gz
 297cd48a287a9113eec44902574084c6ab3b6a8b28d02606765a7fded431d7d8  discord-rpc-$DISCORD_RPC.tar.gz
 cc8eed38daf68aaaaa96e904f68f5524c02f10b5d42062b91cdc93f93445f68a  plutosvg-$PLUTOSVG.tar.gz
diff --git a/scripts/deps/build-dependencies-mac.sh b/scripts/deps/build-dependencies-mac.sh
index 9fb477558..7afbafe89 100755
--- a/scripts/deps/build-dependencies-mac.sh
+++ b/scripts/deps/build-dependencies-mac.sh
@@ -38,13 +38,13 @@ fi
 
 FREETYPE=2.13.3
 HARFBUZZ=10.4.0
-SDL3=3.2.10
+SDL3=3.2.14
 ZSTD=1.5.7
 LIBPNG=1.6.47
 LIBJPEGTURBO=3.1.0
 LIBWEBP=1.5.0
 LIBZIP=1.11.3
-FFMPEG=7.1
+FFMPEG=7.1.1
 MOLTENVK=1.2.9
 QT=6.9.0
 
@@ -86,9 +86,9 @@ b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631  libpng-$LIBPNG
 9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
 7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c  libwebp-$LIBWEBP.tar.gz
 9509d878ba788271c8b5abca9cfde1720f075335686237b7e9a9e7210fe67c1b  libzip-$LIBZIP.tar.xz
-f87be7b4dec66db4098e9c167b2aa34e2ca10aeb5443bdde95ae03185ed513e0  SDL3-$SDL3.tar.gz
+b7e7dc05011b88c69170fe18935487b2559276955e49113f8c1b6b72c9b79c1f  SDL3-$SDL3.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
-40973d44970dbc83ef302b0609f2e74982be2d85916dd2ee7472d30678a7abe6  ffmpeg-$FFMPEG.tar.xz
+733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1  ffmpeg-$FFMPEG.tar.xz
 f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
 c1800c2ea835801af04a05d4a32321d79a93954ee3ae2172bbeacf13d1f0598c  qtbase-everywhere-src-$QT.tar.xz
 2047c6242a57bf97cf40079fa9f91752c137cd9ae84760faa9a2e5e8a440606f  qtimageformats-everywhere-src-$QT.tar.xz
diff --git a/scripts/deps/build-dependencies-windows-arm64.bat b/scripts/deps/build-dependencies-windows-arm64.bat
index c81704a53..035afda98 100644
--- a/scripts/deps/build-dependencies-windows-arm64.bat
+++ b/scripts/deps/build-dependencies-windows-arm64.bat
@@ -51,7 +51,7 @@ set LIBJPEGTURBO=3.1.0
 set LIBPNG=1647
 set QT=6.9.0
 set QTMINOR=6.9
-set SDL3=3.2.10
+set SDL3=3.2.14
 set WEBP=1.5.0
 set LIBZIP=1.11.3
 set ZLIBNG=2.2.4
@@ -70,7 +70,7 @@ call :downloadfile "freetype-%FREETYPE%.tar.gz" "https://download.savannah.gnu.o
 call :downloadfile "harfbuzz-%HARFBUZZ%.zip" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip" 1af1d03abfef15e556ba7bee2ef3b62643387836affffb66f458ce74dcbeba04 || goto error
 call :downloadfile "lpng%LIBPNG%.zip" "https://download.sourceforge.net/libpng/lpng%LIBPNG%.zip" 883340209fccd5353e406a79e22a2d226fc61666b83e700ab1e367bc1a679101 || goto error
 call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93 || goto error
-call :downloadfile "SDL3-%SDL3%.zip" "https://github.com/libsdl-org/SDL/releases/download/release-%SDL3%/SDL3-%SDL3%.zip" 01d9ab20fc071b076be91df5396b464b4ef159e93b2b2addda1cc36750fc1f29 || goto error
+call :downloadfile "SDL3-%SDL3%.zip" "https://github.com/libsdl-org/SDL/releases/download/release-%SDL3%/SDL3-%SDL3%.zip" 46a17d3ea71fe2580a7f43ca7da286c5b9106dd761e2fd5533bb113e5d86b633 || goto error
 call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 513df15a6365a40f6230ec9463ad8c71b824e181d4b661dac9707e103b24ae0c || goto error
 call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" d428fd17a0d3f92c48a30f1d23806bf20352fbce2e80e5bbee27fa80576480ee || goto error
 call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" 54bf06afeb67035f1c6afcd00beec755c0d776626b4cce9ab56992a55215ba69 || goto error
diff --git a/scripts/deps/build-dependencies-windows-x64.bat b/scripts/deps/build-dependencies-windows-x64.bat
index c0aa12d35..bc319fbe8 100644
--- a/scripts/deps/build-dependencies-windows-x64.bat
+++ b/scripts/deps/build-dependencies-windows-x64.bat
@@ -49,7 +49,7 @@ set LIBJPEGTURBO=3.1.0
 set LIBPNG=1647
 set QT=6.9.0
 set QTMINOR=6.9
-set SDL3=3.2.10
+set SDL3=3.2.14
 set WEBP=1.5.0
 set LIBZIP=1.11.3
 set ZLIBNG=2.2.4
@@ -68,7 +68,7 @@ call :downloadfile "freetype-%FREETYPE%.tar.gz" "https://download.savannah.gnu.o
 call :downloadfile "harfbuzz-%HARFBUZZ%.zip" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip" 1af1d03abfef15e556ba7bee2ef3b62643387836affffb66f458ce74dcbeba04 || goto error
 call :downloadfile "lpng%LIBPNG%.zip" "https://download.sourceforge.net/libpng/lpng%LIBPNG%.zip" 883340209fccd5353e406a79e22a2d226fc61666b83e700ab1e367bc1a679101 || goto error
 call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93 || goto error
-call :downloadfile "SDL3-%SDL3%.zip" "https://github.com/libsdl-org/SDL/releases/download/release-%SDL3%/SDL3-%SDL3%.zip" 01d9ab20fc071b076be91df5396b464b4ef159e93b2b2addda1cc36750fc1f29 || goto error
+call :downloadfile "SDL3-%SDL3%.zip" "https://github.com/libsdl-org/SDL/releases/download/release-%SDL3%/SDL3-%SDL3%.zip" 46a17d3ea71fe2580a7f43ca7da286c5b9106dd761e2fd5533bb113e5d86b633 || goto error
 call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 513df15a6365a40f6230ec9463ad8c71b824e181d4b661dac9707e103b24ae0c || goto error
 call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" d428fd17a0d3f92c48a30f1d23806bf20352fbce2e80e5bbee27fa80576480ee || goto error
 call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" 54bf06afeb67035f1c6afcd00beec755c0d776626b4cce9ab56992a55215ba69 || goto error
diff --git a/scripts/deps/build-ffmpeg-linux.sh b/scripts/deps/build-ffmpeg-linux.sh
index 70d844118..e8822786f 100755
--- a/scripts/deps/build-ffmpeg-linux.sh
+++ b/scripts/deps/build-ffmpeg-linux.sh
@@ -36,19 +36,20 @@ DEPSINSTALLDIR="$PWD/ffmpeg-deps"
 echo "Installation directory is $INSTALLDIR"
 echo "FFmpeg dependencies directory is $DEPSINSTALLDIR"
 
-FFMPEG=7.0.2
+FFMPEG=7.1.1
 LAME=3.100
-LIBVPX=1.14.1
+LIBVPX=1.15.0
 FDK_AAC=0fc0e0e0b89de3becd5f099eae725f13eeecc0d1
-LIBAOM=3ab84a7710ee34db3e43b3e61c7d69ab80276a33
+LIBAOM=fc5cf6a132697487fbaa9965b249012e0238768f
 LIBOGG=1.3.5
 LIBVORBIS=1.3.7
 LIBTHEORA=1.1.1
-FLAC=1.4.3
+FLAC=1.5.0
 SPEEX=1.2.0
 AMF=1.4.34
 OPUS=1.5.2
-SVT_AV1=2.2.1
+SVT_AV1=2.3.0
+GLSLANG=15.3.0
 
 # Encoder list from freedesktop SDK, which apparently came from Fedora.
 # Disabled list: av1_qsv h264_qsv hevc_qsv mjpeg_qsv mpeg2_qsv vc1_qsv vp8_qsv vp9_qsv
@@ -65,8 +66,8 @@ FFMPEG_ENCODER_LIST=""\
 "dvdsub dvvideo exr ffv1 ffvhuff flac "\
 "flashsv flashsv2 flv g723_1 gif h261 "\
 "h263 h263_v4l2m2m h263p h264_amf "\
-"h264_v4l2m2m h264_vaapi hdr hevc_amf "\
-"hevc_v4l2m2m hevc_vaapi huffyuv jpegls "\
+"h264_v4l2m2m h264_vaapi h264_vulkan hdr hevc_amf "\
+"hevc_v4l2m2m hevc_vaapi hevc_vulkan huffyuv jpegls "\
 "jpeg2000 libaom libaom_av1 libmp3lame "\
 "libopus libschroedinger libspeex libsvtav1 libtheora "\
 "libvorbis libvpx_vp8 libvpx_vp9 libwebp "\
@@ -141,22 +142,26 @@ if [ "$SKIP_DOWNLOAD" != true ]; then
 	if [ ! -f "SVT-AV1-$SVT_AV1.tar.gz" ]; then
 		curl -C - -L -O "https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v$SVT_AV1/SVT-AV1-$SVT_AV1.tar.gz"
 	fi
+	if [ ! -f "glslang-$GLSLANG.tar.gz" ]; then
+		curl -C - -L -o "glslang-$GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/refs/tags/$GLSLANG.tar.gz"
+	fi
 fi
 
 cat > SHASUMS <<EOF
 5393759308f6d7bc9eb1ed8013c954e03aadb85f0ed6e96f969a5df447b0f79c  AMF-headers.tar.gz
 7322744f239a0d8460fde84e92cca77f2fe9d7e25a213789659df9e86b696b42  fdk-aac-stripped-$FDK_AAC.tar.gz
-8646515b638a3ad303e23af6a3587734447cb8fc0a0c064ecdb8e95c4fd8b389  ffmpeg-$FFMPEG.tar.xz
-6c58e69cd22348f441b861092b825e591d0b822e106de6eb0ee4d05d27205b70  flac-$FLAC.tar.xz
+733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1  ffmpeg-$FFMPEG.tar.xz
+f2c1c76592a82ffff8413ba3c4a1299b6c7ab06c734dee03fd88630485c2b920  flac-$FLAC.tar.xz
 ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e  lame-$LAME.tar.gz
 0eb4b4b9420a0f51db142ba3f9c64b333f826532dc0f48c6410ae51f4799b664  libogg-$LIBOGG.tar.gz
 b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc  libtheora-$LIBTHEORA.tar.bz2
 0e982409a9c3fc82ee06e08205b1355e5c6aa4c36bca58146ef399621b0ce5ab  libvorbis-$LIBVORBIS.tar.gz
 b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc  libtheora-$LIBTHEORA.tar.bz2
-901747254d80a7937c933d03bd7c5d41e8e6c883e0665fadcb172542167c7977  libvpx-$LIBVPX.tar.gz
+e935eded7d81631a538bfae703fd1e293aad1c7fd3407ba00440c95105d2011e  libvpx-$LIBVPX.tar.gz
 65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1  opus-$OPUS.tar.gz
 eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094  speex-$SPEEX.tar.gz
-66ba0c0c33329e776e363432cf9bdf22e78f10e3771c3e36a8af5bbef13f3356  SVT-AV1-$SVT_AV1.tar.gz
+d4a77bb13a0a2d75c9a17c60260fc7dd3cb48ee8e9ad3a60071f87a923275e93  SVT-AV1-$SVT_AV1.tar.gz
+c6c21fe1873c37e639a6a9ac72d857ab63a5be6893a589f34e09a6c757174201  glslang-$GLSLANG.tar.gz
 EOF
 
 shasum -a 256 --check SHASUMS
@@ -288,6 +293,16 @@ cmake --build build-ds --parallel
 cmake --install build-ds
 cd ..
 
+echo "Building glslang..."
+rm -fr "glslang-$GLSLANG"
+tar xf "glslang-$GLSLANG.tar.gz"
+cd "glslang-$GLSLANG"
+./update_glslang_sources.py
+cmake -B build-ds -G Ninja -DCMAKE_INSTALL_PREFIX="$DEPSINSTALLDIR" -DCMAKE_PREFIX_PATH="$DEPSINSTALLDIR" -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF -DGLSLANG_TESTS=OFF
+cmake --build build-ds --parallel
+cmake --install build-ds
+cd ..
+
 echo "Building ffmpeg..."
 rm -fr "ffmpeg-$FFMPEG"
 tar xf "ffmpeg-$FFMPEG.tar.xz"
@@ -301,7 +316,7 @@ cd build
     --extra-ldsoflags="-Wl,-rpath,XORIGIN" \
     --disable-all --disable-autodetect --enable-libmp3lame --enable-libvpx --enable-zlib --enable-libwebp \
     --enable-libfdk-aac --enable-libaom --enable-libvorbis --enable-libtheora --enable-libspeex \
-    --enable-v4l2-m2m --enable-vaapi --enable-amf --enable-libopus --enable-libsvtav1 \
+    --enable-v4l2-m2m --enable-vaapi --enable-amf --enable-libopus --enable-libsvtav1 --enable-vulkan --enable-libglslang \
     --enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale \
     --enable-muxer=avi,matroska,mov,mp3,mp4,wav \
     --enable-protocol=file \
diff --git a/scripts/packaging/flatpak/modules/30-sdl3.yaml b/scripts/packaging/flatpak/modules/30-sdl3.yaml
index d29c5c54d..f5be32d2b 100644
--- a/scripts/packaging/flatpak/modules/30-sdl3.yaml
+++ b/scripts/packaging/flatpak/modules/30-sdl3.yaml
@@ -15,8 +15,8 @@ build-options:
   no-debuginfo: true
 sources:
   - type: archive
-    url: "https://github.com/libsdl-org/SDL/releases/download/release-3.2.10/SDL3-3.2.10.tar.gz"
-    sha256: "f87be7b4dec66db4098e9c167b2aa34e2ca10aeb5443bdde95ae03185ed513e0"
+    url: "https://github.com/libsdl-org/SDL/releases/download/release-3.2.14/SDL3-3.2.14.tar.gz"
+    sha256: "b7e7dc05011b88c69170fe18935487b2559276955e49113f8c1b6b72c9b79c1f"
 cleanup:
   - /bin
   - /include