fix libtbb version matching

3 files changed, 17 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 91e8bded3ed1..7a9a21e20d6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Aug 11 00:16:12 UTC 2016
+# Mon Sep 26 04:29:28 UTC 2016
 pkgbase = ospray
 	pkgdesc = A Ray Tracing Based Rendering Engine for High-Fidelity Visualization
 	pkgver = 1.0.0
@@ -12,10 +12,11 @@ pkgbase = ospray
 	depends = qt4>=4.6
 	depends = ispc
 	depends = intel-tbb
+	depends = glut
 	source = https://github.com/ospray/OSPRay/archive/v1.0.0.tar.gz
 	source = patch
 	md5sums = faf022e6448f4bc750055d2c28847fb7
-	md5sums = a14f2a7da967fe078cf1b6aeb7beb961
+	md5sums = 73a59bcfac9db6c34e1df130de5d1435
 
 pkgname = ospray
 
diff --git a/PKGBUILD b/PKGBUILD
index ccceff805c06..2aa690bbbded 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,12 +6,12 @@ pkgdesc="A Ray Tracing Based Rendering Engine for High-Fidelity Visualization"
 arch=('i686' 'x86_64')
 url="http://www.ospray.org/"
 license=('Apache')
-depends=('qt4>=4.6' 'ispc' 'intel-tbb')
+depends=('qt4>=4.6' 'ispc' 'intel-tbb' 'glut')
 makedepends=('cmake')
 source=(https://github.com/ospray/OSPRay/archive/v$pkgver.tar.gz
        patch)
 md5sums=('faf022e6448f4bc750055d2c28847fb7'
-         'a14f2a7da967fe078cf1b6aeb7beb961')
+         '73a59bcfac9db6c34e1df130de5d1435')
 
 prepare() {
   cd "$srcdir"
@@ -26,6 +26,7 @@ build() {
   cd "$srcdir/${pkgname}-build"
 
   cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+        -DTBB_ROOT:PATH=/usr \
         ../OSPRay-$pkgver
   make
 }
diff --git a/patch b/patch
index ce0856821a61..09abb3e4982c 100644
--- a/patch
+++ b/patch
@@ -36,3 +36,14 @@ diff -ru OSPRay-1.0.0/ospray/lights/SpotLight.cpp src/OSPRay-1.0.0/ospray/lights
      const float cosAngleScale = 1.0f/(cosAngleMin - cosAngleMax);
      
      ispc::SpotLight_set(getIE(),
+--- OSPRay-1.0.0/cmake/FindTBB.cmake	2016-07-20 13:30:36.000000000 -0500
++++ OSPRay-1.0.0/cmake/FindTBB.cmake	2016-09-25 23:22:28.673616827 -0500
+@@ -132,7 +132,7 @@
+ IF (TBB_INCLUDE_DIR)
+   FILE(READ ${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h TBB_STDDEF_H)
+ 
+-  STRING(REGEX MATCH "#define TBB_VERSION_MAJOR ([0-9])" DUMMY "${TBB_STDDEF_H}")
++  STRING(REGEX MATCH "#define TBB_VERSION_MAJOR ([0-9]*)" DUMMY "${TBB_STDDEF_H}")
+   SET(TBB_VERSION_MAJOR ${CMAKE_MATCH_1})
+ 
+   STRING(REGEX MATCH "#define TBB_VERSION_MINOR ([0-9])" DUMMY "${TBB_STDDEF_H}")