Opensubdiv: enable GL, GLEW, GPU (#2012)

* Opensubdiv: enable GL, GLEW, GPU

* Cleanup

media-libs/opensubdiv/opensubdiv-3.3.0.recipe

@@ -7,26 +7,34 @@ surface matches Pixar's Renderman to numerical precision."
 HOMEPAGE="http://graphics.pixar.com/opensubdiv/"
 COPYRIGHT="2013-2017 Pixar"
 LICENSE="Apache v2"
-REVISION="1"
-SOURCE_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_3_0.tar.gz"
+REVISION="2"
+SOURCE_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${portVersion//\./_}.tar.gz"
 CHECKSUM_SHA256="93d364340518515129fe199c80c4030f666ff71414d9c543e1526f14b5ffc8d0"
-SOURCE_DIR="OpenSubdiv-3_3_0"
+SOURCE_DIR="OpenSubdiv-${portVersion//\./_}"
 PATCHES="opensubdiv-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	opensubdiv$secondaryArchSuffix = $portVersion
 	cmd:far_perf = $portVersion
 	cmd:far_regression = $portVersion
 	cmd:hbr_baseline = $portVersion
 	cmd:hbr_regression = $portVersion
-	lib:libosdCPU$secondaryArchSuffix = 3.3.0 compat >= 3
+	cmd:stringify = $portVersion
+	lib:libosdCPU$secondaryArchSuffix = $libVersionCompat
+	lib:libosdGPU$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-#	cmd:python2
+	cmd:python2
+	lib:libGl$secondaryArchSuffix
+	lib:libglu$secondaryArchSuffix
+	lib:libglew$secondaryArchSuffix
 	lib:libgomp$secondaryArchSuffix
 	lib:libtbb$secondaryArchSuffix
 	lib:libtbbmalloc$secondaryArchSuffix
@@ -36,7 +44,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	opensubdiv${secondaryArchSuffix}_devel = $portVersion
-	devel:libosdCPU$secondaryArchSuffix = 3.3.0 compat >= 3
+	devel:libosdCPU$secondaryArchSuffix = $libVersionCompat
+	devel:libosdGPU$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	opensubdiv$secondaryArchSuffix == $portVersion
@@ -44,6 +53,9 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libGl$secondaryArchSuffix
+	devel:libglu$secondaryArchSuffix
+	devel:libglew$secondaryArchSuffix
 	devel:libgomp$secondaryArchSuffix
 	devel:libtbb$secondaryArchSuffix
 	devel:libtbbmalloc$secondaryArchSuffix
@@ -55,22 +67,24 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
-#	cmd:python2
+	cmd:python2
 	"
 
 defineDebugInfoPackage opensubdiv$secondaryArchSuffix \
-	$libDir/libosdCPU.so.$portVersion
+	$libDir/libosdCPU.so.$libVersion \
+	$libDir/libosdGPU.so.$libVersion
 
 BUILD()
 {
 	mkdir -p build
 	cd build
+
+	export GLEW_LOCATION="`finddir B_SYSTEM_DEVELOP_DIRECTORY`"
+	export GLEW_INC_LOCATION="`finddir B_SYSTEM_HEADERS_DIRECTORY`"
+
 	cmake .. \
-		-DNO_CUDA=ON \
-		-DNO_OPENCL=OFF \
-		-DNO_OPENGL=ON \
-		-DNO_TUTORIALS=ON \
 		-DNO_EXAMPLES=ON \
+		-DNO_TUTORIALS=ON \
 		$cmakeDirArgs
 }
 
@@ -83,7 +97,9 @@ INSTALL()
 	mv $prefix/include/* $includeDir
 	rmdir $prefix/include/
 
-	prepareInstalledDevelLib libosdCPU
+	prepareInstalledDevelLibs \
+		libosdCPU \
+		libosdGPU
 
 	fixPkgconfig
 

media-libs/opensubdiv/patches/opensubdiv-3.3.0.patchset

@@ -1,11 +1,8 @@
-From d81e3fc27521b9b0e5bd9bf2ff1abbbcc25a3c8d Mon Sep 17 00:00:00 2001
+From 0bd024622a84da627e47b0fbc0da26359f7e2e79 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Sun, 10 Dec 2017 11:27:28 +0100
-Subject: [PATCH] Platform fixes
+Subject: Platform fixes
 
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 4f3cd9d..84aafb6 100644
@@ -21,5 +18,27 @@ index 4f3cd9d..84aafb6 100644
  endif()
  if(NOT NO_PTEX)
 -- 
-2.15.0
+2.15.1
+
+
+From da6fa9031b56dada1b92902b38c50b90e2b5f4f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Sat, 30 Dec 2017 19:18:39 +0100
+Subject: GLEW detection
+
+
+diff --git a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
+index 6fa8e89..bcd5252 100644
+--- a/cmake/FindGLEW.cmake
++++ b/cmake/FindGLEW.cmake
+@@ -73,6 +73,7 @@ if (${CMAKE_HOST_UNIX})
+         HINTS
+             "${GLEW_LOCATION}/include"
+             "$ENV{GLEW_LOCATION}/include"
++            "$ENV{GLEW_INC_LOCATION}"
+         PATHS
+             /usr/include
+             /usr/local/include
+-- 
+2.15.1