OpenVDB: bump (#4179)

switch to cmake. SONAME bump.

media-gfx/openvdb/openvdb-6.1.0.recipe

@@ -5,11 +5,9 @@ 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="3"
+REVISION="1"
-SOURCE_URI="http://www.openvdb.org/download/openvdb_${portVersion//./_}_library.zip"
+SOURCE_URI="https://github.com/AcademySoftwareFoundation/openvdb/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="915c7ee80e850d9963f96d22eaebff933f20470fbc4b92412a2a9564383feb32"
+CHECKSUM_SHA256="d8803214c245cf0ca14a2c30cd215b183147c03c888c59fc642f213f98b4d68f"
-SOURCE_DIR="openvdb"
-ADDITIONAL_FILES="Makefile.HAIKU"
 
 ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -37,6 +35,22 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 
+PROVIDES_tools="
+	openvdb${secondaryArchSuffix}_tools = $portVersion
+	cmd:vdb_print
+	"
+REQUIRES_tools="
+	haiku$secondaryArchSuffix
+	lib:libblosc$secondaryArchSuffix
+	lib:libboost_iostreams$secondaryArchSuffix
+	lib:libboost_regex$secondaryArchSuffix
+	lib:libboost_system$secondaryArchSuffix
+	lib:libHalf$secondaryArchSuffix
+	lib:libopenvdb$secondaryArchSuffix
+	lib:libtbb$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
 PROVIDES_devel="
 	openvdb${secondaryArchSuffix}_devel = $portVersion
 	devel:libopenvdb$secondaryArchSuffix = $libVersion
@@ -61,6 +75,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
@@ -71,34 +86,39 @@ defineDebugInfoPackage openvdb$secondaryArchSuffix \
 
 BUILD()
 {
-	cp $portDir/additional-files/Makefile.HAIKU Makefile.HAIKU
+	mkdir -p haiku_build
+	cd haiku_build
 
-	make -f Makefile.HAIKU \
+	cmake .. \
-		DESTDIR=$prefix \
+		-DTBB_ROOT="$portPackageLinksDir/devel~libblosc/$relativeDevelopDir/" \
-		DESTDIR_LIB_DIR=$libDir \
+		-DTBB_INCLUDEDIR="$portPackageLinksDir/devel~libblosc/$relativeIncludeDir/" \
-		DESTDIR_INC_DIR=$includeDir \
+		-DTBB_LIBRARYDIR="$portPackageLinksDir/devel~libblosc/$relativeDevelopLibDir/" \
-		SYS_LIB_DIR="$portPackageLinksDir/devel~libblosc/$relativeDevelopDir/" \
+		-DOPENVDB_BUILD_PYTHON_MODULE=OFF \
-		SYS_INC_DIR="$portPackageLinksDir/devel~libblosc/$relativeIncludeDir/" \
+		$cmakeDirArgs
-		lib $jobArgs
+
+	make $jobArgs
 }
 
 INSTALL()
 {
-	make -f Makefile.HAIKU \
+	cd haiku_build
-		DESTDIR=$prefix \
+	make install
-		DESTDIR_LIB_DIR=$libDir \
+
-		DESTDIR_INC_DIR=$includeDir \
+	# move include dir to correct location
-		SYS_LIB_DIR="$portPackageLinksDir/devel~libblosc/$relativeDevelopDir/" \
+	mkdir -p $(dirname $includeDir)
-		SYS_INC_DIR="$portPackageLinksDir/devel~libblosc/$relativeIncludeDir/" \
+	mv $prefix/include $includeDir
-		install_lib
 
 	prepareInstalledDevelLib libopenvdb
 
 	packageEntries devel \
-		$developDir
+		$developDir \
+		$libDir/cmake
+
+	packageEntries tools $binDir
 }
 
 TEST()
 {
+	cd haiku_build
 	make test
 }

media-gfx/openvdb/openvdb520-5.2.0.recipe

@@ -1,107 +0,0 @@
-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="2"
-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: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
-}