From 3bfb866e36699e71d9b60c461c21f45f0ca39907 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 15 Apr 2023 15:16:57 +0200
Subject: [PATCH] libsndfile, cleanup, move cmake config to dev package, fix
 libVersion (#8402)

---
 media-libs/libsndfile/libsndfile-1.1.0.recipe | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/media-libs/libsndfile/libsndfile-1.1.0.recipe b/media-libs/libsndfile/libsndfile-1.1.0.recipe
index 859e20005..5658bb79f 100644
--- a/media-libs/libsndfile/libsndfile-1.1.0.recipe
+++ b/media-libs/libsndfile/libsndfile-1.1.0.recipe
@@ -4,12 +4,15 @@ files containing sampled audio data."
 HOMEPAGE="http://libsndfile.github.io/libsndfile/"
 COPYRIGHT="1999-2021 Erik de Castro Lopo"
 LICENSE="GNU LGPL v2.1"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://github.com/libsndfile/libsndfile/releases/download/$portVersion/libsndfile-$portVersion.tar.xz"
 CHECKSUM_SHA256="0f98e101c0f7c850a71225fb5feaf33b106227b3d331333ddc9bacee190bcf41"
 
 ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="1.0.34"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	libsndfile$secondaryArchSuffix = $portVersion compat >= 1
@@ -23,7 +26,7 @@ PROVIDES="
 	cmd:sndfile_metadata_set$secondaryArchSuffix
 	cmd:sndfile_play$secondaryArchSuffix
 	cmd:sndfile_salvage$secondaryArchSuffix
-	lib:libsndfile$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libsndfile$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -36,7 +39,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libsndfile${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libsndfile$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libsndfile$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libsndfile$secondaryArchSuffix == $portVersion base
@@ -68,21 +71,21 @@ BUILD()
 	if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
 		export CFLAGS=-O1
 	fi
-	cmake $cmakeDirArgs \
+	cmake -Bbuild -S. $cmakeDirArgs \
 		  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		  -DBUILD_SHARED_LIBS=TRUE \
-		  .
-	make $jobArgs
+		  -DBUILD_SHARED_LIBS=TRUE
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	make install
+	make -C build install
 
-	prepareInstalledDevelLibs libsndfile
+	prepareInstalledDevelLib libsndfile
 	fixPkgconfig
 
 	# devel package
 	packageEntries devel \
-		$developDir
+		$developDir \
+		$libDir/cmake
 }