From 5d89b68cec6f529afcc5644d4c89cbb5ebe545a7 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Mon, 10 Nov 2025 22:36:24 +0200 Subject: [PATCH] libsndfile: adjust for cmake 4.x, remove absent maintainer Backport upstream commit to adust to cmake 4.x requirements. (modify patch to overlook missing intermediate commits. Remove inactive maintainer. Signed-off-by: Hannu Nyman --- libs/libsndfile/Makefile | 4 +-- libs/libsndfile/patches/001-cmake4.patch | 36 ++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 libs/libsndfile/patches/001-cmake4.patch diff --git a/libs/libsndfile/Makefile b/libs/libsndfile/Makefile index f60043163b..bc1aef35d0 100644 --- a/libs/libsndfile/Makefile +++ b/libs/libsndfile/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsndfile PKG_VERSION:=1.2.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/libsndfile/libsndfile/releases/download/$(PKG_VERSION) PKG_HASH:=3799ca9924d3125038880367bf1468e53a1b7e3686a934f098b7e1d286cdb80e -PKG_MAINTAINER:=Peter Wagner +PKG_MAINTAINER:= PKG_LICENSE:=LGPLv2.1 PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:libsndfile_project:libsndfile diff --git a/libs/libsndfile/patches/001-cmake4.patch b/libs/libsndfile/patches/001-cmake4.patch new file mode 100644 index 0000000000..2de4a32c0f --- /dev/null +++ b/libs/libsndfile/patches/001-cmake4.patch @@ -0,0 +1,36 @@ +From 52b803f57a1f4d23471f5c5f77e1a21e0721ea0e Mon Sep 17 00:00:00 2001 +From: Sidney Markowitz +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() -- 2.30.2