depend libgl; fix sse4.2 config error

3 files changed, 27 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee5b01441f1f..3b6058528e55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Feb 24 21:07:40 UTC 2017
+# Tue Feb 28 22:00:46 UTC 2017
 pkgbase = ospray
 	pkgdesc = A Ray Tracing Based Rendering Engine for High-Fidelity Visualization
 	pkgver = 1.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.ospray.org/
 	arch = i686
 	arch = x86_64
@@ -13,11 +13,14 @@ pkgbase = ospray
 	depends = ispc
 	depends = intel-tbb
 	depends = embree-isa
+	depends = libgl
 	depends = freeglut
 	depends = glu
 	depends = imagemagick
 	source = ospray-1.2.0.tar.gz::https://github.com/ospray/OSPRay/archive/v1.2.0.tar.gz
+	source = sse4_2.patch
 	md5sums = 91d88c6e9b0ee5da3eca73a2c77aa019
+	md5sums = cc7a98c9480594afd7db401948e0ceb8
 
 pkgname = ospray
 
diff --git a/PKGBUILD b/PKGBUILD
index 0875a646a7f3..f1f80cbe6fc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,27 @@
 
 pkgname=ospray
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 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' 'embree-isa' 'freeglut' 'glu' 'imagemagick')
+depends=('qt4>=4.6' 'ispc' 'intel-tbb' 'embree-isa' 'libgl' 'freeglut' 'glu' 'imagemagick')
 makedepends=('cmake')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ospray/OSPRay/archive/v$pkgver.tar.gz")
-md5sums=('91d88c6e9b0ee5da3eca73a2c77aa019')
-
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ospray/OSPRay/archive/v$pkgver.tar.gz"
+       'sse4_2.patch')
+md5sums=('91d88c6e9b0ee5da3eca73a2c77aa019'
+         'cc7a98c9480594afd7db401948e0ceb8')
 
 prepare() {
   cd "$srcdir"
 
   [[ -d ${pkgname}-build ]] && rm -r ${pkgname}-build
   mkdir ${pkgname}-build
+
+  # issue #129
+  cd ${pkgname}-${pkgver}
+  patch -p1 < ../sse4_2.patch
 }
 
 build() {
diff --git a/sse4_2.patch b/sse4_2.patch
new file mode 100644
index 000000000000..fe323568de81
--- /dev/null
+++ b/sse4_2.patch
@@ -0,0 +1,12 @@
+diff -Naur ospray-1.2.0/cmake/configure_embree.cmake ospray-1.2.0_modified/cmake/configure_embree.cmake

+--- ospray-1.2.0/cmake/configure_embree.cmake	2017-02-08 21:47:00.000000000 +0100

++++ ospray-1.2.0_modified/cmake/configure_embree.cmake	2017-02-28 09:57:52.830269111 +0100

+@@ -65,6 +65,8 @@

+   

+   IF (${EMBREE_MAX_ISA} STREQUAL "SSE4.1")

+     SET(EMBREE_ISA_SUPPORTS_SSE4 TRUE)

++  ELSEIF (${EMBREE_MAX_ISA} STREQUAL "SSE4.2")

++    SET(EMBREE_ISA_SUPPORTS_SSE4 TRUE)

+   ELSEIF (${EMBREE_MAX_ISA} STREQUAL "AVX")

+     SET(EMBREE_ISA_SUPPORTS_SSE4 TRUE)

+     SET(EMBREE_ISA_SUPPORTS_AVX  TRUE)