From 851376cd7720e1f9b35e0a7c26bfd66399f0c4d3 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 3 Dec 2011 23:14:41 +0000
Subject: Sat Dec  3 23:14:41 UTC 2011

---
 community/luxrays/PKGBUILD                              | 16 ++++++++++++----
 community/luxrays/luxrays_opencl1.2_use_deprecated.diff | 12 ++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 community/luxrays/luxrays_opencl1.2_use_deprecated.diff

(limited to 'community/luxrays')

diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD
index c9d204dc6..ff955101f 100644
--- a/community/luxrays/PKGBUILD
+++ b/community/luxrays/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57940 2011-11-04 18:08:34Z stativ $
+# $Id: PKGBUILD 59944 2011-12-02 20:59:16Z ibiru $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=luxrays
 pkgver=0.8
 _pkgver=ed424ec77571
-pkgrel=6
+pkgrel=7
 epoch=0
 pkgdesc="Accelerate the ray intersection process by using GPUs"
 arch=('i686' 'x86_64')
@@ -11,12 +11,20 @@ url="http://www.luxrender.net/"
 license=('GPL')
 depends=('freeimage' 'freeglut' 'glew' 'libcl')
 makedepends=('cmake' 'boost' 'opencl-headers')
-source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('2ac9c588675c5971c57f473ef10ac67d')
+source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \
+        luxrays_opencl1.2_use_deprecated.diff)
+md5sums=('2ac9c588675c5971c57f473ef10ac67d'
+         '27b3eb7c6332aa7f040cc4ca94dc3df6')
 
 build() {
   cd "$srcdir/luxrender-$pkgname-$_pkgver"
 
+  # fix the build with opencl-headers 1.2
+  # they doesn't support OpenCL 1.1, so we have to use this ugly hack of using deprecated API
+  patch -Np1 < "$srcdir/luxrays_opencl1.2_use_deprecated.diff"
+  # fix the break caused by the change of the name of the namespace 'detail' to 'ipcdetail'
+  sed -i 's|::detail|::ipcdetail|' include/luxrays/utils/core/atomic.h
+
   export CXXFLAGS="$CXXFLAGS -lpthread"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=ON \
diff --git a/community/luxrays/luxrays_opencl1.2_use_deprecated.diff b/community/luxrays/luxrays_opencl1.2_use_deprecated.diff
new file mode 100644
index 000000000..0876628d7
--- /dev/null
+++ b/community/luxrays/luxrays_opencl1.2_use_deprecated.diff
@@ -0,0 +1,12 @@
+diff -rup luxrender-luxrays-ed424ec77571.orig/include/luxrays/luxrays.h luxrender-luxrays-ed424ec77571/include/luxrays/luxrays.h
+--- luxrender-luxrays-ed424ec77571.orig/include/luxrays/luxrays.h	2011-04-24 17:43:08.000000000 +0200
++++ luxrender-luxrays-ed424ec77571/include/luxrays/luxrays.h	2011-11-26 11:38:00.336459874 +0100
+@@ -30,6 +30,8 @@
+ 
+ #define __CL_ENABLE_EXCEPTIONS
+ 
++#define CL_USE_DEPRECATED_OPENCL_1_1_APIS
++
+ #if defined(__APPLE__)
+ #include <OpenCL/cl.hpp>
+ #else
-- 
cgit v1.2.3-54-g00ecf