libsndfile: drop cmake4 patch for a policy override

001-cmake4.patch backported the unreleased upstream commit 52b803f. The
buildroot's CMake 4 only needs the raised minimum (FindPythonInterp still
resolves), so replace it with -DCMAKE_POLICY_VERSION_MINIMUM=3.5.

Signed-off-by: Alexandru Ardelean <redacted>

diff --git a/libs/libsndfile/Makefile b/libs/libsndfile/Makefile
index 9cab382877608422996fde79206170082816951f..eab581ebb50dd1cdc6b184b3a937f6323600b36f 100644 (file)
--- a/libs/libsndfile/Makefile
+++ b/libs/libsndfile/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libsndfile
 PKG_VERSION:=1.2.2
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/libsndfile/libsndfile/releases/download/$(PKG_VERSION)
@@ -37,6 +37,7 @@ define Package/libsndfile/description
 endef
 
 CMAKE_OPTIONS += \
+       -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
        -DENABLE_MPEG=ON \
        -DBUILD_SHARED_LIBS=ON \
        -DENABLE_EXTERNAL_LIBS=OFF

diff --git a/libs/libsndfile/patches/001-cmake4.patch b/libs/libsndfile/patches/001-cmake4.patch
deleted file mode 100644 (file)
index 2de4a32..0000000
--- a/libs/libsndfile/patches/001-cmake4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 52b803f57a1f4d23471f5c5f77e1a21e0721ea0e Mon Sep 17 00:00:00 2001
-From: Sidney Markowitz <sidney@sidney.com>
-Date: Sun, 11 May 2025 15:55:19 +1200
-Subject: [PATCH] Update for cmake 4
-
----
- CMakeLists.txt            | 4 ++--
- cmake/SndFileChecks.cmake | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required (VERSION 3.1..3.18)
-+cmake_minimum_required (VERSION 3.5...4.0)
- 
- # MSVC runtime library flags are selected by an abstraction, CMake >= 3.15
- # This policy still need to be set even with cmake_minimum_required() command above.
-@@ -487,7 +487,7 @@ if (BUILD_SHARED_LIBS)
-       if (DEFINED SYMBOL_OS)
-               add_custom_command (
-                       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/${SYMBOL_FILENAME}
--                      COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/src/create_symbols_file.py ${SYMBOL_OS} ${SNDFILE_ABI_VERSION} > ${CMAKE_CURRENT_BINARY_DIR}/src/${SYMBOL_FILENAME}
-+                      COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/src/create_symbols_file.py ${SYMBOL_OS} ${SNDFILE_ABI_VERSION} > ${CMAKE_CURRENT_BINARY_DIR}/src/${SYMBOL_FILENAME}
-                       COMMENT "Generating ${SYMBOL_FILENAME}..."
-                       )
- 
---- a/cmake/SndFileChecks.cmake
-+++ b/cmake/SndFileChecks.cmake
-@@ -252,5 +252,5 @@ if (DEFINED ENABLE_STATIC_RUNTIME)
- endif ()
- 
- if (BUILD_SHARED_LIBS)
--      find_package (PythonInterp REQUIRED)
-+      find_package (Python REQUIRED)
- endif()