From 808c51b3ceeb7723c9fa3be56f725d31bbdb1f87 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 5 Jun 2025 17:48:05 +1000 Subject: [PATCH] CMake: Bump version requirements Can't do it for Qt because of course flatpak.... --- CMakeModules/DuckStationDependencies.cmake | 8 ++++---- scripts/packaging/arch/PKGBUILD | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeModules/DuckStationDependencies.cmake b/CMakeModules/DuckStationDependencies.cmake index e8e110adc..c9b2f57f5 100644 --- a/CMakeModules/DuckStationDependencies.cmake +++ b/CMakeModules/DuckStationDependencies.cmake @@ -9,11 +9,11 @@ endif() set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -find_package(SDL3 3.2.14 REQUIRED) -find_package(zstd 1.5.6 REQUIRED) +find_package(SDL3 3.2.16 REQUIRED) +find_package(zstd 1.5.7 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. -find_package(PNG 1.6.40 REQUIRED) +find_package(PNG 1.6.40 REQUIRED) # 1.6.48, but Fedora is out of date. find_package(JPEG REQUIRED) find_package(Freetype 2.13.2 REQUIRED) # 2.13.3, but flatpak is still on 2.13.2. find_package(plutosvg 0.0.6 REQUIRED) @@ -40,7 +40,7 @@ if(ENABLE_WAYLAND) endif() if(BUILD_QT_FRONTEND) - find_package(Qt6 6.9.0 COMPONENTS Core Gui Widgets LinguistTools REQUIRED) + find_package(Qt6 6.9.0 COMPONENTS Core Gui Widgets LinguistTools REQUIRED) # 6.9.1, but flatpak stuck on 6.9.0. endif() find_package(Shaderc REQUIRED) diff --git a/scripts/packaging/arch/PKGBUILD b/scripts/packaging/arch/PKGBUILD index 28a30c8c5..a11510605 100644 --- a/scripts/packaging/arch/PKGBUILD +++ b/scripts/packaging/arch/PKGBUILD @@ -33,9 +33,9 @@ depends=('libjpeg.so' # libjpeg or libjpeg-turbo 'libx11' 'libxrandr' 'libzip' - 'qt6-base>=6.8.2' - 'qt6-imageformats>=6.8.2' - 'qt6-svg>=6.8.2' + 'qt6-base>=6.9.1' + 'qt6-imageformats>=6.9.1' + 'qt6-svg>=6.9.1' 'wayland' 'zlib' 'zstd' @@ -51,7 +51,7 @@ makedepends=('base-devel' 'lld' 'llvm' 'ninja' - 'qt6-tools>=6.8.2') + 'qt6-tools>=6.9.1') source=( "${pkgname}::git+file://${startdir}/../../.."