From f566ab403132b1bb3eb3a5b2e604c117bc0630c7 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 25 Jun 2013 01:24:59 -0700
Subject: Tue Jun 25 01:24:57 PDT 2013

---
 community/luxrays/PKGBUILD                 | 51 +++++++++++++++++++++++-------
 community/luxrays/luxmark_scenes_path.diff | 20 ++++++++++++
 2 files changed, 59 insertions(+), 12 deletions(-)
 create mode 100644 community/luxrays/luxmark_scenes_path.diff

(limited to 'community/luxrays')

diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD
index 166c74c70..693101a11 100644
--- a/community/luxrays/PKGBUILD
+++ b/community/luxrays/PKGBUILD
@@ -1,38 +1,65 @@
-# $Id: PKGBUILD 87419 2013-03-31 19:18:23Z stephane $
+# $Id: PKGBUILD 93109 2013-06-24 13:55:35Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=luxrays
+pkgname=('luxrays' 'luxmark')
 pkgver=1.2
 _pkgver=475fbf15f0ca
-pkgrel=2
+pkgrel=3
 pkgdesc="Accelerate the ray intersection process by using GPUs"
 arch=('i686' 'x86_64')
 url="http://www.luxrender.net/"
 license=('GPL')
 depends=('freeimage' 'libcl' 'libgl')
-optdepends=('glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU etc.)'
-            'boost-libs: demos (SmallLuxGPU etc.)')
-makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut')
-source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('ac98e9a42ecc20d97d4c12dcdf17e315')
+makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut' 'qt4')
+source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \
+        http://www.luxrender.net/release/luxmark/room_scene_v2.1.zip \
+        luxmark_scenes_path.diff)
+md5sums=('ac98e9a42ecc20d97d4c12dcdf17e315'
+         'ae917f025e32e20b1d20ebf8d22204cb'
+         '1fd2a6f32e2822b5e0f147304292a1b9')
 
 build() {
-  cd "$srcdir/luxrender-$pkgname-$_pkgver"
+  cd "$srcdir/luxrender-luxrays-$_pkgver"
+
+  # change the path to luxmark scenes
+  patch -Np1 < "$srcdir/luxmark_scenes_path.diff" || true
 
   export CXXFLAGS="$CXXFLAGS -lpthread"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=ON \
     -DLUXRAYS_DISABLE_OPENCL=OFF \
+    -DBUILD_LUXMARK=ON \
     .
   make
 }
 
-package() {
-  cd "$srcdir/luxrender-$pkgname-$_pkgver"
+package_luxrays() {
+  optdepends=('glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU etc.)'
+              'boost-libs: demos (SmallLuxGPU etc.)')
+
+  cd "$srcdir/luxrender-luxrays-$_pkgver"
 
   install -d -m755 "$pkgdir"/usr/{bin,include,lib}
   install -m755 bin/* "$pkgdir"/usr/bin
   install -m644 lib/* "$pkgdir"/usr/lib
-  cp -a include/luxrays "$pkgdir"/usr/include
+  cp -a include "$pkgdir"/usr
+
+  # remove luxmark (packaged separately)
+  rm "$pkgdir"/usr/bin/luxmark
+}
+
+package_luxmark() {
+  pkgdesc="OpenCL benchmark tool"
+  depends+=("${depends[@]}" 'boost-libs' 'qt4')
+
+  cd "$srcdir/luxrender-luxrays-$_pkgver"
+  install -d -m755 "$pkgdir"/usr/{bin,share}
+  install -m755 bin/luxmark "$pkgdir"/usr/bin
+
+  # install scenes
+  cp -a samples/luxmark/scenes  "$pkgdir"/usr/share/luxmark
+  cp -a "$srcdir"/samples/luxmark/scenes/room "$pkgdir"/usr/share/luxmark
+  # fix the paths
+  sed -i 's|scenes/|/usr/share/luxmark/|' "$pkgdir"/usr/share/luxmark/*/*.cfg "$pkgdir"/usr/share/luxmark/*/*.scn
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/luxrays/luxmark_scenes_path.diff b/community/luxrays/luxmark_scenes_path.diff
new file mode 100644
index 000000000..80f909a05
--- /dev/null
+++ b/community/luxrays/luxmark_scenes_path.diff
@@ -0,0 +1,20 @@
+diff -rup luxrender-luxrays-475fbf15f0ca/samples/luxmark/luxmarkapp.h luxrender-luxrays-475fbf15f0ca.new/samples/luxmark/luxmarkapp.h
+--- luxrender-luxrays-475fbf15f0ca/samples/luxmark/luxmarkapp.h	2013-02-22 22:29:42.000000000 +0100
++++ luxrender-luxrays-475fbf15f0ca.new/samples/luxmark/luxmarkapp.h	2013-06-24 14:54:12.946992718 +0200
+@@ -36,11 +36,11 @@
+ //------------------------------------------------------------------------------
+ 
+ // List of supported scenes
+-#define SCENE_ROOM "scenes/room/render.cfg"
+-#define SCENE_SALA "scenes/sala/render.cfg"
+-#define SCENE_LUXBALL_HDR "scenes/luxball/render-hdr.cfg"
+-#define SCENE_LUXBALL "scenes/luxball/render.cfg"
+-#define SCENE_LUXBALL_SKY "scenes/luxball/render-sunset.cfg"
++#define SCENE_ROOM "/usr/share/luxmark/room/render.cfg"
++#define SCENE_SALA "/usr/share/luxmark/sala/render.cfg"
++#define SCENE_LUXBALL_HDR "/usr/share/luxmark/luxball/render-hdr.cfg"
++#define SCENE_LUXBALL "/usr/share/luxmark/luxball/render.cfg"
++#define SCENE_LUXBALL_SKY "/usr/share/luxmark/luxball/render-sunset.cfg"
+ 
+ class LuxMarkApp : public QApplication {
+ 	Q_OBJECT
-- 
cgit v1.2.3-54-g00ecf