[arch-commits] Commit in luxrays/repos (6 files)

2015-04-22 Thread Felix Yan 
Date: Thursday, April 23, 2015 @ 08:26:04
  Author: fyan
Revision: 132037

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  luxrays/repos/community-staging-i686/
  luxrays/repos/community-staging-i686/PKGBUILD
(from rev 132036, luxrays/trunk/PKGBUILD)
  luxrays/repos/community-staging-i686/force_python3.diff
(from rev 132036, luxrays/trunk/force_python3.diff)
  luxrays/repos/community-staging-x86_64/
  luxrays/repos/community-staging-x86_64/PKGBUILD
(from rev 132036, luxrays/trunk/PKGBUILD)
  luxrays/repos/community-staging-x86_64/force_python3.diff
(from rev 132036, luxrays/trunk/force_python3.diff)

-+
 community-staging-i686/PKGBUILD |   53 ++
 community-staging-i686/force_python3.diff   |   12 +
 community-staging-x86_64/PKGBUILD   |   53 ++
 community-staging-x86_64/force_python3.diff |   12 +
 4 files changed, 130 insertions(+)

Copied: luxrays/repos/community-staging-i686/PKGBUILD (from rev 132036, 
luxrays/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-04-23 06:26:04 UTC (rev 132037)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky 
+pkgname='luxrays'
+pkgver=1.4
+_pkgver=7c7127ee1fa4
+pkgrel=4
+pkgdesc="Accelerate the ray intersection process by using GPUs"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/";
+license=('GPL')
+depends=('freetype2' 'libcl' 'libgl' 'libpng' 'openimageio')
+makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut')
+optdepends=('opencl-nvidia: OpenCL support for nVidia GPUs' \
+'amdapp-sdk: OpenCL support for AMD GPUs' \
+'intel-opencl-runtime: OpenCL support for Intel CPUs' \
+'glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU 
etc.)' \
+'boost-libs: demos (SmallLuxGPU etc.)')
+options=('staticlibs')
+source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/luxrays/get/${_pkgver}.tar.bz2
 \
+force_python3.diff)
+md5sums=('2dda3316fb2ae9be6e58b5fa3a35de62'
+ '3bfb5594a709d1ea772866d66904b8fd')
+
+prepare() {
+  cd "$srcdir"/luxrender-luxrays-$_pkgver
+
+  patch -Np1 < "$srcdir/force_python3.diff" || true
+}
+
+build() {
+  cd "$srcdir/luxrender-luxrays-$_pkgver"
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_SKIP_RPATH=ON \
+-DLUXRAYS_DISABLE_OPENCL=OFF \
+.
+  make
+}
+
+package() {
+  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 "$pkgdir"/usr
+
+  # install pyluxcore to the Python search path
+  install -d -m755 "$pkgdir"/usr/lib/python3.4/
+  mv "$pkgdir"/usr/lib/pyluxcore.so "$pkgdir"/usr/lib/python3.4/
+}
+
+# vim:set ts=2 sw=2 et:

Copied: luxrays/repos/community-staging-i686/force_python3.diff (from rev 
132036, luxrays/trunk/force_python3.diff)
===
--- community-staging-i686/force_python3.diff   (rev 0)
+++ community-staging-i686/force_python3.diff   2015-04-23 06:26:04 UTC (rev 
132037)
@@ -0,0 +1,12 @@
+diff -rup luxrender-luxrays-7c7127ee1fa4/cmake/Dependencies.cmake 
luxrender-luxrays-7c7127ee1fa4.new/cmake/Dependencies.cmake
+--- luxrender-luxrays-7c7127ee1fa4/cmake/Dependencies.cmake2015-01-20 
23:45:32.0 +0100
 luxrender-luxrays-7c7127ee1fa4.new/cmake/Dependencies.cmake
2015-02-15 22:19:40.775351414 +0100
+@@ -58,7 +58,7 @@ set(Boost_MINIMUM_VERSION   "1.44.0"
+ 
+ set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.1" "1.46" "1.46.0" "1.45" 
"1.45.0" "1.44" "1.44.0")
+ 
+-set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization 
iostreams regex system python)
++set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization 
iostreams regex system python3)
+ find_package(Boost ${Boost_MINIMUM_VERSION} COMPONENTS 
${LUXRAYS_BOOST_COMPONENTS})
+ if (NOT Boost_FOUND)
+ # Try again with the other type of libs

Copied: luxrays/repos/community-staging-x86_64/PKGBUILD (from rev 132036, 
luxrays/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2015-04-23 06:26:04 UTC (rev 132037)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky 
+pkgname='luxrays'
+pkgver=1.4
+_pkgver=7c7127ee1fa4
+pkgrel=4
+pkgdesc="Accelerate the ray intersection process by using GPUs"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/";
+license=('GPL')
+depends=('freetype2' 'libcl' 'libgl' 'libpng' 'openimageio')
+makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut')
+optdepe

[arch-commits] Commit in luxrays/repos (6 files)

2015-03-14 Thread Sven-Hendrik Haase 
Date: Sunday, March 15, 2015 @ 00:25:09
  Author: svenstaro
Revision: 129279

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  luxrays/repos/community-staging-i686/
  luxrays/repos/community-staging-i686/PKGBUILD
(from rev 129278, luxrays/trunk/PKGBUILD)
  luxrays/repos/community-staging-i686/force_python3.diff
(from rev 129278, luxrays/trunk/force_python3.diff)
  luxrays/repos/community-staging-x86_64/
  luxrays/repos/community-staging-x86_64/PKGBUILD
(from rev 129278, luxrays/trunk/PKGBUILD)
  luxrays/repos/community-staging-x86_64/force_python3.diff
(from rev 129278, luxrays/trunk/force_python3.diff)

-+
 community-staging-i686/PKGBUILD |   53 ++
 community-staging-i686/force_python3.diff   |   12 +
 community-staging-x86_64/PKGBUILD   |   53 ++
 community-staging-x86_64/force_python3.diff |   12 +
 4 files changed, 130 insertions(+)

Copied: luxrays/repos/community-staging-i686/PKGBUILD (from rev 129278, 
luxrays/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-03-14 23:25:09 UTC (rev 129279)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky 
+pkgname='luxrays'
+pkgver=1.4
+_pkgver=7c7127ee1fa4
+pkgrel=2
+pkgdesc="Accelerate the ray intersection process by using GPUs"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/";
+license=('GPL')
+depends=('freetype2' 'libcl' 'libgl' 'libpng' 'openimageio')
+makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut')
+optdepends=('opencl-nvidia: OpenCL support for nVidia GPUs' \
+'amdapp-sdk: OpenCL support for AMD GPUs' \
+'intel-opencl-runtime: OpenCL support for Intel CPUs' \
+'glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU 
etc.)' \
+'boost-libs: demos (SmallLuxGPU etc.)')
+options=('staticlibs')
+source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/luxrays/get/${_pkgver}.tar.bz2
 \
+force_python3.diff)
+md5sums=('2dda3316fb2ae9be6e58b5fa3a35de62'
+ '3bfb5594a709d1ea772866d66904b8fd')
+
+prepare() {
+  cd "$srcdir"/luxrender-luxrays-$_pkgver
+
+  patch -Np1 < "$srcdir/force_python3.diff" || true
+}
+
+build() {
+  cd "$srcdir/luxrender-luxrays-$_pkgver"
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_SKIP_RPATH=ON \
+-DLUXRAYS_DISABLE_OPENCL=OFF \
+.
+  make
+}
+
+package() {
+  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 "$pkgdir"/usr
+
+  # install pyluxcore to the Python search path
+  install -d -m755 "$pkgdir"/usr/lib/python3.4/
+  mv "$pkgdir"/usr/lib/pyluxcore.so "$pkgdir"/usr/lib/python3.4/
+}
+
+# vim:set ts=2 sw=2 et:

Copied: luxrays/repos/community-staging-i686/force_python3.diff (from rev 
129278, luxrays/trunk/force_python3.diff)
===
--- community-staging-i686/force_python3.diff   (rev 0)
+++ community-staging-i686/force_python3.diff   2015-03-14 23:25:09 UTC (rev 
129279)
@@ -0,0 +1,12 @@
+diff -rup luxrender-luxrays-7c7127ee1fa4/cmake/Dependencies.cmake 
luxrender-luxrays-7c7127ee1fa4.new/cmake/Dependencies.cmake
+--- luxrender-luxrays-7c7127ee1fa4/cmake/Dependencies.cmake2015-01-20 
23:45:32.0 +0100
 luxrender-luxrays-7c7127ee1fa4.new/cmake/Dependencies.cmake
2015-02-15 22:19:40.775351414 +0100
+@@ -58,7 +58,7 @@ set(Boost_MINIMUM_VERSION   "1.44.0"
+ 
+ set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.1" "1.46" "1.46.0" "1.45" 
"1.45.0" "1.44" "1.44.0")
+ 
+-set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization 
iostreams regex system python)
++set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization 
iostreams regex system python3)
+ find_package(Boost ${Boost_MINIMUM_VERSION} COMPONENTS 
${LUXRAYS_BOOST_COMPONENTS})
+ if (NOT Boost_FOUND)
+ # Try again with the other type of libs

Copied: luxrays/repos/community-staging-x86_64/PKGBUILD (from rev 129278, 
luxrays/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2015-03-14 23:25:09 UTC (rev 129279)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky 
+pkgname='luxrays'
+pkgver=1.4
+_pkgver=7c7127ee1fa4
+pkgrel=2
+pkgdesc="Accelerate the ray intersection process by using GPUs"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/";
+license=('GPL')
+depends=('freetype2' 'libcl' 'libgl' 'libpng' 'openimageio')
+makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut')
+optd

[arch-commits] Commit in luxrays/repos (6 files)

2013-07-09 Thread Lukas Jirkovsky 
Date: Tuesday, July 9, 2013 @ 12:07:19
  Author: stativ
Revision: 93736

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  luxrays/repos/community-staging-i686/
  luxrays/repos/community-staging-i686/PKGBUILD
(from rev 93735, luxrays/trunk/PKGBUILD)
  luxrays/repos/community-staging-i686/luxmark_scenes_path.diff
(from rev 93735, luxrays/trunk/luxmark_scenes_path.diff)
  luxrays/repos/community-staging-x86_64/
  luxrays/repos/community-staging-x86_64/PKGBUILD
(from rev 93735, luxrays/trunk/PKGBUILD)
  luxrays/repos/community-staging-x86_64/luxmark_scenes_path.diff
(from rev 93735, luxrays/trunk/luxmark_scenes_path.diff)

---+
 community-staging-i686/PKGBUILD   |   65 
 community-staging-i686/luxmark_scenes_path.diff   |   20 ++
 community-staging-x86_64/PKGBUILD |   65 
 community-staging-x86_64/luxmark_scenes_path.diff |   20 ++
 4 files changed, 170 insertions(+)

Copied: luxrays/repos/community-staging-i686/PKGBUILD (from rev 93735, 
luxrays/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-07-09 10:07:19 UTC (rev 93736)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky 
+pkgname=('luxrays' 'luxmark')
+pkgver=1.2.1
+_pkgver=475fbf15f0ca
+pkgrel=1
+pkgdesc="Accelerate the ray intersection process by using GPUs"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/";
+license=('GPL')
+depends=('freeimage' 'libcl' 'libgl')
+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-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_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 "$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:

Copied: luxrays/repos/community-staging-i686/luxmark_scenes_path.diff (from rev 
93735, luxrays/trunk/luxmark_scenes_path.diff)
===
--- community-staging-i686/luxmark_scenes_path.diff 
(rev 0)
+++ community-staging-i686/luxmark_scenes_path.diff 2013-07-09 10:07:19 UTC 
(rev 93736)
@@ -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.0 +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

Co

[arch-commits] Commit in luxrays/repos (6 files)

2013-06-24 Thread Lukas Jirkovsky 
Date: Monday, June 24, 2013 @ 15:55:35
  Author: stativ
Revision: 93109

archrelease: copy trunk to community-i686, community-x86_64

Added:
  luxrays/repos/community-i686/PKGBUILD
(from rev 93108, luxrays/trunk/PKGBUILD)
  luxrays/repos/community-i686/luxmark_scenes_path.diff
(from rev 93108, luxrays/trunk/luxmark_scenes_path.diff)
  luxrays/repos/community-x86_64/PKGBUILD
(from rev 93108, luxrays/trunk/PKGBUILD)
  luxrays/repos/community-x86_64/luxmark_scenes_path.diff
(from rev 93108, luxrays/trunk/luxmark_scenes_path.diff)
Deleted:
  luxrays/repos/community-i686/PKGBUILD
  luxrays/repos/community-x86_64/PKGBUILD

---+
 /PKGBUILD |  130 
 community-i686/PKGBUILD   |   38 
 community-i686/luxmark_scenes_path.diff   |   20 
 community-x86_64/PKGBUILD |   38 
 community-x86_64/luxmark_scenes_path.diff |   20 
 5 files changed, 170 insertions(+), 76 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-06-24 13:55:28 UTC (rev 93108)
+++ community-i686/PKGBUILD 2013-06-24 13:55:35 UTC (rev 93109)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky 
-pkgname=luxrays
-pkgver=1.2
-_pkgver=475fbf15f0ca
-pkgrel=2
-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')
-
-build() {
-  cd "$srcdir/luxrender-$pkgname-$_pkgver"
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_SKIP_RPATH=ON \
--DLUXRAYS_DISABLE_OPENCL=OFF \
-.
-  make
-}
-
-package() {
-  cd "$srcdir/luxrender-$pkgname-$_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
-}
-
-# vim:set ts=2 sw=2 et:

Copied: luxrays/repos/community-i686/PKGBUILD (from rev 93108, 
luxrays/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-06-24 13:55:35 UTC (rev 93109)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky 
+pkgname=('luxrays' 'luxmark')
+pkgver=1.2
+_pkgver=475fbf15f0ca
+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')
+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-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_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 "$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:

Copied: luxrays/repos/community-i686/luxmark_scenes_path.diff (from rev 93108, 
luxrays/trunk/luxmark_scenes_path.diff)
===
--- community-i686/luxmark_scenes_path.d

[arch-commits] Commit in luxrays/repos (6 files)

2013-03-31 Thread Stéphane Gaudreault 
Date: Sunday, March 31, 2013 @ 21:18:23
  Author: stephane
Revision: 87419

db-move: moved luxrays from [community-testing] to [community] (i686, x86_64)

Added:
  luxrays/repos/community-i686/PKGBUILD
(from rev 87401, luxrays/repos/community-testing-i686/PKGBUILD)
  luxrays/repos/community-x86_64/PKGBUILD
(from rev 87401, luxrays/repos/community-testing-x86_64/PKGBUILD)
Deleted:
  luxrays/repos/community-i686/PKGBUILD
  luxrays/repos/community-testing-i686/
  luxrays/repos/community-testing-x86_64/
  luxrays/repos/community-x86_64/PKGBUILD

---+
 /PKGBUILD |   76 
 community-i686/PKGBUILD   |   37 -
 community-x86_64/PKGBUILD |   37 -
 3 files changed, 76 insertions(+), 74 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-03-31 19:18:22 UTC (rev 87418)
+++ community-i686/PKGBUILD 2013-03-31 19:18:23 UTC (rev 87419)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky 
-pkgname=luxrays
-pkgver=1.2
-_pkgver=475fbf15f0ca
-pkgrel=1
-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: slg, slg2, smallppmgpu' 'freeglut: slg, slg2, smallppmgpu')
-makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut')
-source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('e7c24e8407514f2f2211ded105756b2a')
-
-build() {
-  cd "$srcdir/luxrender-$pkgname-$_pkgver"
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_SKIP_RPATH=ON \
--DLUXRAYS_DISABLE_OPENCL=OFF \
-.
-  make
-}
-
-package() {
-  cd "$srcdir/luxrender-$pkgname-$_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
-}
-
-# vim:set ts=2 sw=2 et:

Copied: luxrays/repos/community-i686/PKGBUILD (from rev 87401, 
luxrays/repos/community-testing-i686/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-03-31 19:18:23 UTC (rev 87419)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky 
+pkgname=luxrays
+pkgver=1.2
+_pkgver=475fbf15f0ca
+pkgrel=2
+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')
+
+build() {
+  cd "$srcdir/luxrender-$pkgname-$_pkgver"
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_SKIP_RPATH=ON \
+-DLUXRAYS_DISABLE_OPENCL=OFF \
+.
+  make
+}
+
+package() {
+  cd "$srcdir/luxrender-$pkgname-$_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
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/PKGBUILD
===
--- community-x86_64/PKGBUILD   2013-03-31 19:18:22 UTC (rev 87418)
+++ community-x86_64/PKGBUILD   2013-03-31 19:18:23 UTC (rev 87419)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky 
-pkgname=luxrays
-pkgver=1.2
-_pkgver=475fbf15f0ca
-pkgrel=1
-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: slg, slg2, smallppmgpu' 'freeglut: slg, slg2, smallppmgpu')
-makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut')
-source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('e7c24e8407514f2f2211ded105756b2a')
-
-build() {
-  cd "$srcdir/luxrender-$pkgname-$_pkgver"
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_SKIP_RPATH=ON \
--DLUXRAYS_DISABLE_OPENCL=OFF \
-.
-  make
-}
-
-package() {
-  cd "$srcdir/luxrender-$pkgname-$_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
-}
-
-# vim:set ts=2 sw=2 et:

Copied: luxrays/repos/community-x86_64/PKGBUILD (from rev 87401, 
luxrays/repos/community-testing-x86_64/PKGBUILD)
=

[arch-commits] Commit in luxrays/repos (6 files)

2013-03-29 Thread Stéphane Gaudreault 
Date: Friday, March 29, 2013 @ 20:32:18
  Author: stephane
Revision: 87295

db-move: moved luxrays from [community-staging] to [community-testing] (i686, 
x86_64)

Added:
  luxrays/repos/community-testing-i686/
  luxrays/repos/community-testing-i686/PKGBUILD
(from rev 87277, luxrays/repos/community-staging-i686/PKGBUILD)
  luxrays/repos/community-testing-x86_64/
  luxrays/repos/community-testing-x86_64/PKGBUILD
(from rev 87277, luxrays/repos/community-staging-x86_64/PKGBUILD)
Deleted:
  luxrays/repos/community-staging-i686/
  luxrays/repos/community-staging-x86_64/

---+
 community-testing-i686/PKGBUILD   |   38 
 community-testing-x86_64/PKGBUILD |   38 
 2 files changed, 76 insertions(+)

Copied: luxrays/repos/community-testing-i686/PKGBUILD (from rev 87277, 
luxrays/repos/community-staging-i686/PKGBUILD)
===
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2013-03-29 19:32:18 UTC (rev 87295)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky 
+pkgname=luxrays
+pkgver=1.2
+_pkgver=475fbf15f0ca
+pkgrel=2
+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')
+
+build() {
+  cd "$srcdir/luxrender-$pkgname-$_pkgver"
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_SKIP_RPATH=ON \
+-DLUXRAYS_DISABLE_OPENCL=OFF \
+.
+  make
+}
+
+package() {
+  cd "$srcdir/luxrender-$pkgname-$_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
+}
+
+# vim:set ts=2 sw=2 et:

Copied: luxrays/repos/community-testing-x86_64/PKGBUILD (from rev 87277, 
luxrays/repos/community-staging-x86_64/PKGBUILD)
===
--- community-testing-x86_64/PKGBUILD   (rev 0)
+++ community-testing-x86_64/PKGBUILD   2013-03-29 19:32:18 UTC (rev 87295)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky 
+pkgname=luxrays
+pkgver=1.2
+_pkgver=475fbf15f0ca
+pkgrel=2
+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')
+
+build() {
+  cd "$srcdir/luxrender-$pkgname-$_pkgver"
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_SKIP_RPATH=ON \
+-DLUXRAYS_DISABLE_OPENCL=OFF \
+.
+  make
+}
+
+package() {
+  cd "$srcdir/luxrender-$pkgname-$_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
+}
+
+# vim:set ts=2 sw=2 et:

[arch-commits] Commit in luxrays/repos (6 files)

2013-01-28 Thread Stéphane Gaudreault 
Date: Monday, January 28, 2013 @ 17:49:44
  Author: stephane
Revision: 83257

db-move: moved luxrays from [community-testing] to [community] (i686, x86_64)

Added:
  luxrays/repos/community-i686/PKGBUILD
(from rev 83238, luxrays/repos/community-testing-i686/PKGBUILD)
  luxrays/repos/community-x86_64/PKGBUILD
(from rev 83238, luxrays/repos/community-testing-x86_64/PKGBUILD)
Deleted:
  luxrays/repos/community-i686/PKGBUILD
  luxrays/repos/community-testing-i686/
  luxrays/repos/community-testing-x86_64/
  luxrays/repos/community-x86_64/PKGBUILD

---+
 community-i686/PKGBUILD   |   72 ++--
 community-x86_64/PKGBUILD |   72 ++--
 2 files changed, 72 insertions(+), 72 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-01-28 16:49:43 UTC (rev 83256)
+++ community-i686/PKGBUILD 2013-01-28 16:49:44 UTC (rev 83257)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky 
-pkgname=luxrays
-pkgver=1.1
-_pkgver=589aa5dac899
-pkgrel=3
-pkgdesc="Accelerate the ray intersection process by using GPUs"
-arch=('i686' 'x86_64')
-url="http://www.luxrender.net/";
-license=('GPL')
-depends=('freeimage' 'freeglut' 'glew' 'libcl')
-makedepends=('cmake' 'boost' 'mesa' 'opencl-headers')
-source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('7513d71148fa14bc1779b816816580b9')
-
-build() {
-  cd "$srcdir/luxrender-$pkgname-$_pkgver"
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_SKIP_RPATH=ON \
--DLUXRAYS_DISABLE_OPENCL=OFF \
-.
-  make
-}
-
-package() {
-  cd "$srcdir/luxrender-$pkgname-$_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
-}
-
-# vim:set ts=2 sw=2 et:

Copied: luxrays/repos/community-i686/PKGBUILD (from rev 83238, 
luxrays/repos/community-testing-i686/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-01-28 16:49:44 UTC (rev 83257)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky 
+pkgname=luxrays
+pkgver=1.1
+_pkgver=589aa5dac899
+pkgrel=4
+pkgdesc="Accelerate the ray intersection process by using GPUs"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/";
+license=('GPL')
+depends=('freeimage' 'freeglut' 'glew' 'libcl')
+makedepends=('cmake' 'boost' 'mesa' 'opencl-headers')
+source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
+md5sums=('7513d71148fa14bc1779b816816580b9')
+
+build() {
+  cd "$srcdir/luxrender-$pkgname-$_pkgver"
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_SKIP_RPATH=ON \
+-DLUXRAYS_DISABLE_OPENCL=OFF \
+.
+  make
+}
+
+package() {
+  cd "$srcdir/luxrender-$pkgname-$_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
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/PKGBUILD
===
--- community-x86_64/PKGBUILD   2013-01-28 16:49:43 UTC (rev 83256)
+++ community-x86_64/PKGBUILD   2013-01-28 16:49:44 UTC (rev 83257)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky 
-pkgname=luxrays
-pkgver=1.1
-_pkgver=589aa5dac899
-pkgrel=3
-pkgdesc="Accelerate the ray intersection process by using GPUs"
-arch=('i686' 'x86_64')
-url="http://www.luxrender.net/";
-license=('GPL')
-depends=('freeimage' 'freeglut' 'glew' 'libcl')
-makedepends=('cmake' 'boost' 'mesa' 'opencl-headers')
-source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('7513d71148fa14bc1779b816816580b9')
-
-build() {
-  cd "$srcdir/luxrender-$pkgname-$_pkgver"
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_SKIP_RPATH=ON \
--DLUXRAYS_DISABLE_OPENCL=OFF \
-.
-  make
-}
-
-package() {
-  cd "$srcdir/luxrender-$pkgname-$_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
-}
-
-# vim:set ts=2 sw=2 et:

Copied: luxrays/repos/community-x86_64/PKGBUILD (from rev 83238, 
luxrays/repos/community-testing-x86_64/PKGBUILD)
===
--- community-x86_64/PKGBUILD   (rev 0)
+++ community-x86_64/PKGBUILD   2013-01-28 16:49:44 UTC (rev 83257)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky 
+pkgname=luxrays
+pkgver=1.1
+_pkgver=589aa5dac899
+pkgrel=4
+pkgdesc="Accelerate the ray intersection process by us