add embree2-bvh.patch for altered embree-bvh_build

3 files changed, 67 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0fbf24c10ed6..b6207cf5e584 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = luxrays-hg
 	pkgdesc = Accelerate the ray intersection process by using GPUs
-	pkgver = 3752+.36522ab16096+
-	pkgrel = 1
+	pkgver = 3755+.ceb10f796325+
+	pkgrel = 2
 	url = http://www.luxrender.net/
 	arch = x86_64
 	license = GPL
@@ -29,8 +29,10 @@ pkgbase = luxrays-hg
 	options = staticlibs
 	source = luxrays::hg+https://bitbucket.org/luxrender/luxrays#branch=default
 	source = force_python3.diff
+	source = embree2-bvh.patch
 	md5sums = SKIP
 	md5sums = ba9a42dbe073009189c6d21845bff767
+	md5sums = e6be00520ee90bdd24d1d7d0b31f3429
 
 pkgname = luxrays-hg
 
diff --git a/PKGBUILD b/PKGBUILD
index 06758334d87d..a478f0db8d71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Comaintainer: bartus <aur@bartus.33mail.com>
 _pyver=$(python -c "from sys import version_info; print(\"%d.%d\" % (version_info[0],version_info[1]))")
 pkgname=luxrays-hg
-pkgver=3752+.36522ab16096+
-pkgrel=1
+pkgver=3755+.ceb10f796325+
+pkgrel=2
 pkgdesc="Accelerate the ray intersection process by using GPUs"
 arch=('x86_64')
 url="http://www.luxrender.net/"
@@ -20,10 +20,13 @@ optdepends=('opencl-driver: OpenCL support' \
 options=('staticlibs')
 provides=('luxrays')
 conflicts=('luxrays')
-source=('luxrays::hg+https://bitbucket.org/luxrender/luxrays#branch=default' \
-        force_python3.diff)
+source=('luxrays::hg+https://bitbucket.org/luxrender/luxrays#branch=default'
+        force_python3.diff
+        embree2-bvh.patch
+)
 md5sums=('SKIP'
-         'ba9a42dbe073009189c6d21845bff767')
+         'ba9a42dbe073009189c6d21845bff767'
+         'e6be00520ee90bdd24d1d7d0b31f3429')
 
 pkgver() {
   cd "$srcdir/luxrays"
@@ -35,15 +38,20 @@ prepare() {
 
   # force python3 for boost
   patch -Np1 < "$srcdir/force_python3.diff" || true
+  patch -Np1 -i ../embree2-bvh.patch
 }
 
 build() {
   cd "$srcdir/luxrays"
+  mkdir -p build
+  cd build
 
-  cmake . \
+  cmake .. \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=ON \
     -DLUXRAYS_DISABLE_OPENCL=OFF
+  #  -DEMBREE_INCLUDE_PATH=/usr/include/embree-bvh_build \
+  #  -DEMBREE_LIBRARY=/usr/lib/embree-bvh_build/libembree.a
   # this sucks, but luxrays doesn't seem to honor  CMAKE_*_LINKER_FLAGS
   # thanks bartus from AUR for the fix
   for file in `grep lboost_python -l -R ` ;do sed -i 's/$/ -lpython3/' $file ; done
@@ -51,12 +59,12 @@ build() {
 }
 
 package() {
-  cd "$srcdir/luxrays"
+  cd "$srcdir/luxrays/build"
 
   install -d -m755 "$pkgdir"/usr/{bin,include,lib}
   install -m755 bin/* "$pkgdir"/usr/bin
   install -m644 lib/* "$pkgdir"/usr/lib
-  cp -a include "$pkgdir"/usr
+  cp -a ../include "$pkgdir"/usr
 
   # install pyluxcore to the Python search path
   install -d -m755 "$pkgdir"/usr/lib/python${_pyver}/
diff --git a/embree2-bvh.patch b/embree2-bvh.patch
new file mode 100644
index 000000000000..1e9f7c8ade8d
--- /dev/null
+++ b/embree2-bvh.patch
@@ -0,0 +1,47 @@
+diff -r 46e269afdd30 include/luxrays/accelerators/embreeaccel.h
+--- a/include/luxrays/accelerators/embreeaccel.h	Tue Aug 08 19:03:07 2017 +0200
++++ b/include/luxrays/accelerators/embreeaccel.h	Tue Oct 03 10:29:50 2017 +0200
+@@ -21,8 +21,8 @@
+ 
+ #include <boost/thread.hpp>
+ 
+-#include <embree2/rtcore.h>
+-#include <embree2/rtcore_ray.h>
++#include <embree2-bvh/rtcore.h>
++#include <embree2-bvh/rtcore_ray.h>
+ 
+ #include "luxrays/luxrays.h"
+ #include "luxrays/core/accelerator.h"
+diff -r 46e269afdd30 src/luxrays/core/bvh/bvhembreebuild.cpp
+--- a/src/luxrays/core/bvh/bvhembreebuild.cpp	Tue Aug 08 19:03:07 2017 +0200
++++ b/src/luxrays/core/bvh/bvhembreebuild.cpp	Tue Oct 03 10:29:50 2017 +0200
+@@ -22,8 +22,8 @@
+ #include <boost/foreach.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include <embree2/rtcore.h>
+-#include <embree2/rtcore_bvh_builder.h>
++#include <embree2-bvh/rtcore.h>
++#include <embree2-bvh/rtcore_bvh_builder.h>
+ 
+ #include "luxrays/core/bvh/bvhbuild.h"
+ 
+diff -r 46e269afdd30 cmake/Packages/FindEmbree.cmake
+--- a/cmake/Packages/FindEmbree.cmake	Tue Aug 08 19:03:07 2017 +0200
++++ b/cmake/Packages/FindEmbree.cmake	Tue Oct 03 10:36:59 2017 +0200
+@@ -14,13 +14,13 @@
+ ## limitations under the License.                                           ##
+ ## ======================================================================== ##
+ 
+-FIND_PATH(EMBREE_INCLUDE_PATH embree2/rtcore.h
++FIND_PATH(EMBREE_INCLUDE_PATH embree2-bvh/rtcore.h
+ 	/usr/include
+ 	/usr/local/include
+ 	/opt/local/include
+ 	${EMBREE_ROOT}/include)
+ 
+-FIND_LIBRARY(EMBREE_LIBRARY NAMES embree libembree.so.2 PATHS 
++FIND_LIBRARY(EMBREE_LIBRARY NAMES libembree.so.2.8.0 PATHS 
+ 	/usr/lib 
+ 	/usr/local/lib 
+ 	/opt/local/lib