From 4df6f3bc4dd6c56d6971272ab559557a5e808d85 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 25 Apr 2024 14:59:43 +1000 Subject: [PATCH] Scripts: Drop freetype/zlib from Linux deps build Qt pulls in fontconfig, which needs the system version. --- CMakeModules/DuckStationDependencies.cmake | 2 +- scripts/build-dependencies-linux.sh | 47 +--------------------- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/CMakeModules/DuckStationDependencies.cmake b/CMakeModules/DuckStationDependencies.cmake index 8948360d4..dab95401c 100644 --- a/CMakeModules/DuckStationDependencies.cmake +++ b/CMakeModules/DuckStationDependencies.cmake @@ -15,7 +15,7 @@ find_package(WebP REQUIRED) # v1.3.2, spews an error on Linux because no pkg-con find_package(ZLIB REQUIRED) # 1.3, but Mac currently doesn't use it. find_package(PNG 1.6.40 REQUIRED) find_package(JPEG REQUIRED) # No version because flatpak uses libjpeg-turbo. -find_package(Freetype 2.13.1 REQUIRED) +find_package(Freetype 2.11.1 REQUIRED) if(NOT WIN32) find_package(CURL REQUIRED) diff --git a/scripts/build-dependencies-linux.sh b/scripts/build-dependencies-linux.sh index 9d6972c21..3c04b86f9 100755 --- a/scripts/build-dependencies-linux.sh +++ b/scripts/build-dependencies-linux.sh @@ -11,15 +11,12 @@ INSTALLDIR="$1" SCRIPTDIR=$(realpath $(dirname "${BASH_SOURCE[0]}")) NPROCS="$(getconf _NPROCESSORS_ONLN)" -FREETYPE=2.13.2 -HARFBUZZ=8.3.1 LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075 LIBJPEG=9f LIBPNG=1.6.43 LIBWEBP=1.3.2 SDL=SDL2-2.30.2 QT=6.7.0 -ZLIB=1.3.1 ZSTD=1.5.5 SHADERC=2024.0 @@ -32,14 +29,11 @@ mkdir -p deps-build cd deps-build cat > SHASUMS <