From b44b98151f1c2e971f294389b936d95610c67c5d Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 1 Feb 2020 07:29:18 +0100
Subject: [PATCH] opensubdiv, enable secondary architecture, fix install paths
 (#4667)

---
 media-libs/opensubdiv/opensubdiv-3.4.0.recipe | 42 ++++++++----------
 .../patches/opensubdiv-3.4.0.patchset         | 44 -------------------
 2 files changed, 18 insertions(+), 68 deletions(-)
 delete mode 100644 media-libs/opensubdiv/patches/opensubdiv-3.4.0.patchset

diff --git a/media-libs/opensubdiv/opensubdiv-3.4.0.recipe b/media-libs/opensubdiv/opensubdiv-3.4.0.recipe
index e498bd8c9..78d5c956d 100644
--- a/media-libs/opensubdiv/opensubdiv-3.4.0.recipe
+++ b/media-libs/opensubdiv/opensubdiv-3.4.0.recipe
@@ -7,26 +7,20 @@ surface matches Pixar's Renderman to numerical precision."
 HOMEPAGE="http://graphics.pixar.com/opensubdiv/"
 COPYRIGHT="2013-2018 Pixar"
 LICENSE="Apache v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${portVersion//\./_}.tar.gz"
 CHECKSUM_SHA256="d932b292f83371c7518960b2135c7a5b931efb43cdd8720e0b27268a698973e4"
 SOURCE_FILENAME="opensubdiv-$portVersion.tar.gz"
 SOURCE_DIR="OpenSubdiv-${portVersion//\./_}"
-PATCHES="opensubdiv-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+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
-	cmd:stringify = $portVersion
 	lib:libosdCPU$secondaryArchSuffix = $libVersionCompat
 	lib:libosdGPU$secondaryArchSuffix = $libVersionCompat
 	"
@@ -35,7 +29,7 @@ REQUIRES="
 	cmd:python2
 	lib:libGl$secondaryArchSuffix
 	lib:libglew$secondaryArchSuffix
-	lib:libglu$secondaryArchSuffix
+	lib:libGLU$secondaryArchSuffix
 	lib:libgomp$secondaryArchSuffix
 	lib:libopencl$secondaryArchSuffix
 	lib:libtbb$secondaryArchSuffix
@@ -70,7 +64,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libGl$secondaryArchSuffix
 	devel:libglew$secondaryArchSuffix
-	devel:libglu$secondaryArchSuffix
+	devel:libGLU$secondaryArchSuffix
 	devel:libgomp$secondaryArchSuffix
 	devel:libopencl$secondaryArchSuffix
 	devel:libopencl_headers$secondaryArchSuffix
@@ -92,16 +86,19 @@ defineDebugInfoPackage opensubdiv$secondaryArchSuffix \
 
 BUILD()
 {
-	mkdir -p build
-	cd build
+	mkdir -p build && cd build
 
-	export GLEW_LOCATION="$portPackageLinksDir/devel~libglew/$relativeDevelopDir/"
-	export GLEW_INC_LOCATION="$portPackageLinksDir/devel~libglew/$relativeIncludeDir/"
-
-	cmake .. \
+	cmake .. -DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=$prefix \
+		-DCMAKE_BINDIR_BASE=$prefix/bin \
+		-DCMAKE_INCDIR_BASE=$includeDir/opensubdiv \
+		-DCMAKE_LIBDIR_BASE=$libDir \
 		-DNO_EXAMPLES=ON \
 		-DNO_TUTORIALS=ON \
-		$cmakeDirArgs
+		-DNO_GLFW_X11=ON \
+		-DGLEW_LIBRARY="`finddir B_SYSTEM_DIRECTORY`/$relativeLibDir" \
+		-DGLEW_INCLUDE_DIR="`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir/GL"
+	make $jobArgs
 }
 
 INSTALL()
@@ -109,18 +106,15 @@ INSTALL()
 	cd build
 	make install
 
-	mkdir -p $includeDir
-	mv $prefix/include/* $includeDir
-	rmdir $prefix/include/
-
 	prepareInstalledDevelLibs \
 		libosdCPU \
 		libosdGPU
-
 	fixPkgconfig
 
-	packageEntries tools $binDir
-	packageEntries devel $developDir
+	packageEntries tools \
+		$prefix/bin
+	packageEntries devel \
+		$developDir
 }
 
 TEST()
diff --git a/media-libs/opensubdiv/patches/opensubdiv-3.4.0.patchset b/media-libs/opensubdiv/patches/opensubdiv-3.4.0.patchset
deleted file mode 100644
index 1ae2e98f7..000000000
--- a/media-libs/opensubdiv/patches/opensubdiv-3.4.0.patchset
+++ /dev/null
@@ -1,44 +0,0 @@
-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: Platform fixes
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3920896..254a4db 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -337,7 +337,7 @@ endif()
- if(NOT NO_CUDA)
-     find_package(CUDA 4.0)
- endif()
--if(NOT NO_GLFW AND NOT NO_OPENGL AND NOT ANDROID AND NOT IOS)
-+if(NOT NO_GLFW AND NOT NO_OPENGL AND NOT ANDROID AND NOT IOS AND NOT HAIKU)
-     find_package(GLFW 3.0.0)
- endif()
- if(NOT NO_PTEX)
--- 
-2.16.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.16.1
-