From d087ce1ff375b0d8a74240ac3223aa985bfae353 Mon Sep 17 00:00:00 2001 From: Sandy <1013356+bwrsandman@users.noreply.github.com> Date: Wed, 7 Aug 2024 20:30:12 -0400 Subject: [PATCH] [libsquish]: Fix config error on android ndk r27 (#40263) --- ports/libsquish/cmake-version.patch | 16 ++++++++++++++++ ports/libsquish/portfile.cmake | 1 + ports/libsquish/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libsquish.json | 5 +++++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/libsquish/cmake-version.patch diff --git a/ports/libsquish/cmake-version.patch b/ports/libsquish/cmake-version.patch new file mode 100644 index 0000000000..8dde416c23 --- /dev/null +++ b/ports/libsquish/cmake-version.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a36e574..6f137d5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,9 +9,9 @@ + # Unix and VS: SSE2 support is enabled by default + # use BUILD_SQUISH_WITH_SSE2 and BUILD_SQUISH_WITH_ALTIVEC to override + +-PROJECT(squish) ++CMAKE_MINIMUM_REQUIRED(VERSION 3.5) + +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3) ++PROJECT(squish) + + OPTION(BUILD_SQUISH_WITH_OPENMP "Build with OpenMP." ON) + diff --git a/ports/libsquish/portfile.cmake b/ports/libsquish/portfile.cmake index 4b482e492e..9112e11f47 100644 --- a/ports/libsquish/portfile.cmake +++ b/ports/libsquish/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_sourceforge( PATCHES fix-export-symbols.patch export-target.patch + cmake-version.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libsquish/vcpkg.json b/ports/libsquish/vcpkg.json index f956f3b25f..1d1d947b95 100644 --- a/ports/libsquish/vcpkg.json +++ b/ports/libsquish/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsquish", "version": "1.15", - "port-version": 13, + "port-version": 14, "description": "Open source DXT compression library.", "homepage": "https://sourceforge.net/projects/libsquish", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 0e00b52199..bda797a212 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5062,7 +5062,7 @@ }, "libsquish": { "baseline": "1.15", - "port-version": 13 + "port-version": 14 }, "libsrt": { "baseline": "1.5.3", diff --git a/versions/l-/libsquish.json b/versions/l-/libsquish.json index e700c49ce8..16e4446df3 100644 --- a/versions/l-/libsquish.json +++ b/versions/l-/libsquish.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb13fe850ce51bd142d19b0662ba0d990efb5d77", + "version": "1.15", + "port-version": 14 + }, { "git-tree": "b6a8a3e697c1cfcd378bfe725d5994ac9e9dc6d3", "version": "1.15",