From 12b2190782d99dcaac395b2e9e78da11f337701a Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Thu, 15 Mar 2018 20:51:28 +0100
Subject: [PATCH] Bullet: fix pkgconfig, debuginfo (#2310)

---
 sci-physics/bullet/bullet-2.87.recipe | 71 ++++++++++++++++-----------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/sci-physics/bullet/bullet-2.87.recipe b/sci-physics/bullet/bullet-2.87.recipe
index 961151dee..b8ef5d600 100644
--- a/sci-physics/bullet/bullet-2.87.recipe
+++ b/sci-physics/bullet/bullet-2.87.recipe
@@ -7,7 +7,7 @@ the ZLib license."
 HOMEPAGE="http://www.bulletphysics.com/"
 COPYRIGHT="2003-2017 Erwin Coumans and the Bullet Physics Library Team"
 LICENSE="Zlib"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/bulletphysics/bullet3/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="438c151c48840fe3f902ec260d9496f8beb26dba4b17769a4a53212903935f95"
 SOURCE_DIR="bullet3-$portVersion"
@@ -15,19 +15,22 @@ SOURCE_DIR="bullet3-$portVersion"
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
+libVersion=$portVersion
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	bullet$secondaryArchSuffix = $portVersion
-	lib:libBullet3Collision$secondaryArchSuffix = $portVersion
-	lib:libBullet3Common$secondaryArchSuffix = $portVersion
-	lib:libBullet3Dynamics$secondaryArchSuffix = $portVersion
-	lib:libBullet3Geometry$secondaryArchSuffix = $portVersion
-	lib:libBullet3OpenCL_clew$secondaryArchSuffix = $portVersion
-	lib:libBullet2FileLoader$secondaryArchSuffix = $portVersion
-	lib:libBulletCollision$secondaryArchSuffix = $portVersion
-	lib:libBulletDynamics$secondaryArchSuffix = $portVersion
-	lib:libBulletInverseDynamics$secondaryArchSuffix = $portVersion
-	lib:libBulletSoftBody$secondaryArchSuffix = $portVersion
-	lib:libLinearMath$secondaryArchSuffix = $portVersion
+	lib:libBullet3Collision$secondaryArchSuffix = $libVersionCompat
+	lib:libBullet3Common$secondaryArchSuffix = $libVersionCompat
+	lib:libBullet3Dynamics$secondaryArchSuffix = $libVersionCompat
+	lib:libBullet3Geometry$secondaryArchSuffix = $libVersionCompat
+	lib:libBullet3OpenCL_clew$secondaryArchSuffix = $libVersionCompat
+	lib:libBullet2FileLoader$secondaryArchSuffix = $libVersionCompat
+	lib:libBulletCollision$secondaryArchSuffix = $libVersionCompat
+	lib:libBulletDynamics$secondaryArchSuffix = $libVersionCompat
+	lib:libBulletInverseDynamics$secondaryArchSuffix = $libVersionCompat
+	lib:libBulletSoftBody$secondaryArchSuffix = $libVersionCompat
+	lib:libLinearMath$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -39,17 +42,17 @@ REQUIRES="
 
 PROVIDES_devel="
 	bullet${secondaryArchSuffix}_devel = $portVersion
-	devel:libBullet3Collision$secondaryArchSuffix = $portVersion
-	devel:libBullet3Common$secondaryArchSuffix = $portVersion
-	devel:libBullet3Dynamics$secondaryArchSuffix = $portVersion
-	devel:libBullet3Geometry$secondaryArchSuffix = $portVersion
-	devel:libBullet3OpenCL_clew$secondaryArchSuffix = $portVersion
-	devel:libBullet2FileLoader$secondaryArchSuffix = $portVersion
-	devel:libBulletCollision$secondaryArchSuffix = $portVersion
-	devel:libBulletDynamics$secondaryArchSuffix = $portVersion
-	devel:libBulletInverseDynamics$secondaryArchSuffix = $portVersion
-	devel:libBulletSoftBody$secondaryArchSuffix = $portVersion
-	devel:libLinearMath$secondaryArchSuffix = $portVersion
+	devel:libBullet3Collision$secondaryArchSuffix = $libVersionCompat
+	devel:libBullet3Common$secondaryArchSuffix = $libVersionCompat
+	devel:libBullet3Dynamics$secondaryArchSuffix = $libVersionCompat
+	devel:libBullet3Geometry$secondaryArchSuffix = $libVersionCompat
+	devel:libBullet3OpenCL_clew$secondaryArchSuffix = $libVersionCompat
+	devel:libBullet2FileLoader$secondaryArchSuffix = $libVersionCompat
+	devel:libBulletCollision$secondaryArchSuffix = $libVersionCompat
+	devel:libBulletDynamics$secondaryArchSuffix = $libVersionCompat
+	devel:libBulletInverseDynamics$secondaryArchSuffix = $libVersionCompat
+	devel:libBulletSoftBody$secondaryArchSuffix = $libVersionCompat
+	devel:libLinearMath$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	bullet$secondaryArchSuffix == $portVersion base
@@ -65,9 +68,23 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
 	cmd:python2
 	"
 
+defineDebugInfoPackage bullet$secondaryArchSuffix \
+	$libDir/libBullet3Collision.so.$libVersion \
+	$libDir/libBullet3Common.so.$libVersion \
+	$libDir/libBullet3Dynamics.so.$libVersion \
+	$libDir/libBullet3Geometry.so.$libVersion \
+	$libDir/libBullet3OpenCL_clew.so.$libVersion \
+	$libDir/libBullet2FileLoader.so.$libVersion \
+	$libDir/libBulletCollision.so.$libVersion \
+	$libDir/libBulletDynamics.so.$libVersion \
+	$libDir/libBulletInverseDynamics.so.$libVersion \
+	$libDir/libBulletSoftBody.so.$libVersion \
+	$libDir/libLinearMath.so.$libVersion
+
 BUILD()
 {
 	mkdir -p build_haiku
@@ -95,9 +112,6 @@ INSTALL()
 {
 	cd build_haiku
 
-	mkdir -p $libDir
-	mkdir -p $includeDir
-
 	make install
 
 	prepareInstalledDevelLibs \
@@ -113,12 +127,11 @@ INSTALL()
 		libBulletSoftBody \
 		libLinearMath
 
+	fixPkgconfig
+
 	packageEntries devel \
 		$developDir \
-		$libDir/pkgconfig \
 		$libDir/cmake
-
-	fixPkgconfig
 }
 
 TEST()