From ce5432ebfd9d233c3f0abf5465725ee96aedcbf4 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Wed, 12 Sep 2018 19:05:14 +0200
Subject: [PATCH] OpenVDB: bump, packagelinksdir, cleanup (#2938)

---
 media-gfx/openvdb/openvdb-5.1.0.recipe    |   9 +-
 media-gfx/openvdb/openvdb520-5.2.0.recipe | 108 ++++++++++++++++++++++
 2 files changed, 112 insertions(+), 5 deletions(-)
 create mode 100644 media-gfx/openvdb/openvdb520-5.2.0.recipe

diff --git a/media-gfx/openvdb/openvdb-5.1.0.recipe b/media-gfx/openvdb/openvdb-5.1.0.recipe
index 5a9c90f27..629f26d7c 100644
--- a/media-gfx/openvdb/openvdb-5.1.0.recipe
+++ b/media-gfx/openvdb/openvdb-5.1.0.recipe
@@ -77,8 +77,8 @@ BUILD()
 		DESTDIR=$prefix \
 		DESTDIR_LIB_DIR=$libDir \
 		DESTDIR_INC_DIR=$includeDir \
-		SYS_LIB_DIR="`finddir B_SYSTEM_LIB_DIRECTORY`" \
-		SYS_INC_DIR="`finddir B_SYSTEM_HEADERS_DIRECTORY`" \
+		SYS_LIB_DIR="$portPackageLinksDir/devel~libblosc/$relativeDevelopDir/" \
+		SYS_INC_DIR="$portPackageLinksDir/devel~libblosc/$relativeIncludeDir/" \
 		lib $jobArgs
 }
 
@@ -88,8 +88,8 @@ INSTALL()
 		DESTDIR=$prefix \
 		DESTDIR_LIB_DIR=$libDir \
 		DESTDIR_INC_DIR=$includeDir \
-		SYS_LIB_DIR="`finddir B_SYSTEM_LIB_DIRECTORY`" \
-		SYS_INC_DIR="`finddir B_SYSTEM_HEADERS_DIRECTORY`" \
+		SYS_LIB_DIR="$portPackageLinksDir/devel~libblosc/$relativeDevelopDir/" \
+		SYS_INC_DIR="$portPackageLinksDir/devel~libblosc/$relativeIncludeDir/" \
 		install_lib
 
 	prepareInstalledDevelLib libopenvdb
@@ -100,6 +100,5 @@ INSTALL()
 
 TEST()
 {
-	cd build
 	make test
 }
diff --git a/media-gfx/openvdb/openvdb520-5.2.0.recipe b/media-gfx/openvdb/openvdb520-5.2.0.recipe
new file mode 100644
index 000000000..5781967b1
--- /dev/null
+++ b/media-gfx/openvdb/openvdb520-5.2.0.recipe
@@ -0,0 +1,108 @@
+SUMMARY="Libs for the efficient manipulation of volumetric data"
+DESCRIPTION="The OpenVDB library comprises a hierarchical data structure and \
+a suite of tools for the efficient manipulation of sparse, possibly \
+time-varying, volumetric data discretized on a three-dimensional grid."
+HOMEPAGE="http://www.openvdb.org/"
+COPYRIGHT="2012-2018 DreamWorks Animation LLC"
+LICENSE="MPL v2.0"
+REVISION="1"
+SOURCE_URI="http://www.openvdb.org/download/openvdb_${portVersion//./_}_library.zip"
+CHECKSUM_SHA256="ee660dfd4b60d11e775a20d9dbd455513dcbead7f26cea1088506ac8550c86a6"
+SOURCE_DIR="openvdb"
+ADDITIONAL_FILES="Makefile.HAIKU"
+
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	openvdb520$secondaryArchSuffix = $portVersion
+	lib:libopenvdb$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libblosc$secondaryArchSuffix
+	lib:libboost_iostreams$secondaryArchSuffix
+	lib:libboost_system$secondaryArchSuffix
+	lib:libboost_thread$secondaryArchSuffix
+	lib:libcppunit$secondaryArchSuffix
+	lib:libHalf$secondaryArchSuffix
+	lib:libIex$secondaryArchSuffix
+	lib:libIlmImf$secondaryArchSuffix
+	lib:libIlmThread$secondaryArchSuffix
+	lib:libImath$secondaryArchSuffix
+	lib:libtbb$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	openvdb520${secondaryArchSuffix}_devel = $portVersion
+	devel:libopenvdb$secondaryArchSuffix = $libVersion
+	"
+REQUIRES_devel="
+	openvdb520$secondaryArchSuffix == $portVersion base
+	"
+CONFLICTS_devel="
+	openvdb${secondaryArchSuffix}_devel
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libblosc$secondaryArchSuffix
+	devel:libboost_iostreams$secondaryArchSuffix
+	devel:libboost_system$secondaryArchSuffix
+	devel:libboost_thread$secondaryArchSuffix
+	devel:libcppunit$secondaryArchSuffix
+	devel:libHalf$secondaryArchSuffix
+	devel:libIex$secondaryArchSuffix
+	devel:libIlmImf$secondaryArchSuffix
+	devel:libIlmThread$secondaryArchSuffix
+	devel:libImath$secondaryArchSuffix
+	devel:libtbb$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cppunit_config$secondaryArchSuffix
+	cmd:g++$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+defineDebugInfoPackage openvdb520$secondaryArchSuffix \
+	$libDir/libopenvdb.so.$libVersion
+
+BUILD()
+{
+	cp $portDir/additional-files/Makefile.HAIKU Makefile.HAIKU
+
+	make -f Makefile.HAIKU \
+		DESTDIR=$prefix \
+		DESTDIR_LIB_DIR=$libDir \
+		DESTDIR_INC_DIR=$includeDir \
+		SYS_LIB_DIR="$portPackageLinksDir/devel~libblosc/$relativeDevelopDir/" \
+		SYS_INC_DIR="$portPackageLinksDir/devel~libblosc/$relativeIncludeDir/" \
+		lib $jobArgs
+}
+
+INSTALL()
+{
+	make -f Makefile.HAIKU \
+		DESTDIR=$prefix \
+		DESTDIR_LIB_DIR=$libDir \
+		DESTDIR_INC_DIR=$includeDir \
+		SYS_LIB_DIR="$portPackageLinksDir/devel~libblosc/$relativeDevelopDir/" \
+		SYS_INC_DIR="$portPackageLinksDir/devel~libblosc/$relativeIncludeDir/" \
+		install_lib
+
+	prepareInstalledDevelLib libopenvdb
+
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make test
+}