python 3.6 and opencl updates

2 files changed, 13 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5dc9797b28c..c49d612c08a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Nov 30 20:39:25 UTC 2016
+# Mon Mar 27 17:55:27 UTC 2017
 pkgbase = luxrender-hg
 	pkgdesc = Rendering system for physically correct, unbiased image synthesis
-	pkgver = 4912+.55596283ec1e+
+	pkgver = 4916+.e8f1c5ff54b0+
 	pkgrel = 1
 	url = http://www.luxrender.net/
 	arch = x86_64
@@ -21,16 +21,14 @@ pkgbase = luxrender-hg
 	depends = openexr
 	depends = openimageio
 	depends = libpng
-	depends = libcl
+	depends = opencl-icd-loader
 	depends = libgl
 	depends = fftw
 	depends = embree-bvh_build-git
 	optdepends = luxblend25: Blender exporter
 	optdepends = qt4: Qt GUI
 	optdepends = python: pylux Python interface
-	optdepends = opencl-nvidia: OpenCL support for nVidia GPUs
-	optdepends = amdapp-sdk: OpenCL support for AMD GPUs
-	optdepends = intel-opencl-runtime: OpenCL support for Intel CPUs
+	optdepends = opencl-driver: OpenCL support
 	provides = luxrender
 	conflicts = luxrender
 	source = lux::hg+https://bitbucket.org/luxrender/lux#branch=default
diff --git a/PKGBUILD b/PKGBUILD
index 346d9ffbdc97..01ff291b9938 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,17 @@
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=luxrender-hg
-pkgver=4912+.55596283ec1e+
+pkgver=4916+.e8f1c5ff54b0+
 pkgrel=1
 pkgdesc="Rendering system for physically correct, unbiased image synthesis"
 arch=('x86_64')
 url="http://www.luxrender.net/"
 license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'openimageio' 'libpng' 'libcl' 'libgl' 'fftw'
+depends=('boost-libs' 'freeimage' 'openexr' 'openimageio' 'libpng' 'opencl-icd-loader' 'libgl' 'fftw'
          'embree-bvh_build-git')
-optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \
-            'python: pylux Python interface'
-            'opencl-nvidia: OpenCL support for nVidia GPUs' \
-            'amdapp-sdk: OpenCL support for AMD GPUs' \
-            'intel-opencl-runtime: OpenCL support for Intel CPUs')
+optdepends=('luxblend25: Blender exporter' \
+            'qt4: Qt GUI' \
+            'python: pylux Python interface' \
+            'opencl-driver: OpenCL support')
 makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays-hg" 'python' 'opencl-headers'
              'eos_portable_archive' 'mercurial')
 provides=('luxrender')
@@ -32,8 +31,6 @@ prepare() {
 
   # force use of python 3 with boost_python
   patch -Np1 < "$srcdir/force_python3.diff"
-  # the build requires some extensions
-  sed -i 's|std=c++11|std=gnu++11|' CMakeLists.txt
 }
 
 build() {
@@ -44,8 +41,8 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLUXRAYS_DISABLE_OPENCL=OFF \
     -DPYTHON_CUSTOM=ON \
-    -DPYTHON_LIBRARIES=/usr/lib/libpython3.5m.so \
-    -DPYTHON_INCLUDE_PATH=/usr/include/python3.5m/ \
+    -DPYTHON_LIBRARIES=/usr/lib/libpython3.6m.so \
+    -DPYTHON_INCLUDE_PATH=/usr/include/python3.6m/ \
     -DCMAKE_EXE_LINKER_FLAGS=-lpthread
   make
 }
@@ -58,7 +55,7 @@ package() {
   [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
 
   # install pylux
-  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.5/pylux.so
+  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.6/pylux.so
 }
 
 # vim:set ts=2 sw=2 et: