From 5e35f44c49e854351c13e6b4d97ae27dd01fd089 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Mon, 3 Oct 2016 22:45:53 +0200
Subject: testing/opensubdiv: improve abuild and fix some issues

---
 testing/opensubdiv/APKBUILD | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'testing/opensubdiv/APKBUILD')

diff --git a/testing/opensubdiv/APKBUILD b/testing/opensubdiv/APKBUILD
index dd4279961c..885d8b700d 100644
--- a/testing/opensubdiv/APKBUILD
+++ b/testing/opensubdiv/APKBUILD
@@ -1,24 +1,30 @@
 # Contributor: Mark Riedesel <mark@klowner.com>
 # Maintainer: Mark Riedesel <mark@klowner.com>
 pkgname=opensubdiv
+_pkgname=OpenSubdiv
 pkgver=3.0.5
+_pkgver=${pkgver//./_}
 pkgrel=0
 pkgdesc="An Open-Source subdivision surface library"
 url="http://graphics.pixar.com/opensubdiv"
 arch="all"
 license="ASL-2.0"
+depends=""
 makedepends="cmake glew-dev glfw-dev doxygen py-docutils libxcursor-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tutorials $pkgname-tools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${pkgver//./_}.tar.gz"
-builddir="$srcdir/"OpenSubdiv-${pkgver//./_}
+source="$pkgname-$pkgver.tar.gz::https://github.com/PixarAnimationStudios/$_pkgname/archive/v$_pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$_pkgver"
 
 build() {
-	cd "$builddir"
-	mkdir -p build
-	cd build
+	mkdir -p "$builddir"/build
+	cd "$builddir"/build
+
 	cmake .. \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_SKIP_RPATH=TRUE \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DNO_TBB=TRUE \
 		-DNO_PTEX=TRUE \
 		-DNO_MAYA=TRUE \
@@ -34,14 +40,21 @@ package() {
 }
 
 tutorials() {
+	pkgdesc="$pkgdesc (tutorials)"
+	depends="$pkgname"
+
+	cd "$pkgdir"
+
 	mkdir -p "$subpkgdir"/usr/bin/
-	for tut in "$pkgdir"/usr/bin/tutorials/*; do
+	local tut; for tut in ./usr/bin/tutorials/*; do
 		mv $tut "$subpkgdir"/usr/bin/opensubdiv_${tut##*/}
 	done
-	rmdir "$pkgdir"/usr/bin/tutorials
+	rmdir ./usr/bin/tutorials
 }
 
 tools() {
+	pkgdesc="$pkgdesc (tools)"
+
 	mkdir -p "$subpkgdir"/usr
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
-- 
cgit v1.2.3