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

Lukas Jirkovsky stativ at archlinux.org
Sun Feb 15 19:56:49 UTC 2015


    Date: Sunday, February 15, 2015 @ 20:56:48
  Author: stativ
Revision: 127756

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

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

-------------------------------------------+
 /PKGBUILD                                 |   82 ++++++++++++++++++++++++++++
 community-i686/PKGBUILD                   |   71 ------------------------
 community-i686/QTBUG-22829.diff           |   17 -----
 community-i686/luxmark_scenes_path.diff   |   20 ------
 community-x86_64/PKGBUILD                 |   71 ------------------------
 community-x86_64/QTBUG-22829.diff         |   17 -----
 community-x86_64/luxmark_scenes_path.diff |   20 ------
 7 files changed, 82 insertions(+), 216 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-02-15 18:47:27 UTC (rev 127755)
+++ community-i686/PKGBUILD	2015-02-15 19:56:48 UTC (rev 127756)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-pkgname=('luxrays' 'luxmark')
-pkgver=1.3.1
-_pkgver=7459cd8a9583
-pkgrel=5
-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')
-options=('staticlibs')
-source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \
-        luxmark_scenes_path.diff QTBUG-22829.diff)
-md5sums=('859999e5e07550553fb310a7f48530a4'
-         '1fd2a6f32e2822b5e0f147304292a1b9'
-         '6e20ee7ea64c578431d51065d0871abc')
-
-prepare() {
-  cd "$srcdir/luxrender-luxrays-$_pkgver"
-
-  # change the path to luxmark scenes
-  patch -Np1 < "$srcdir/luxmark_scenes_path.diff" || true
-
-  # workaround QTBUG-22829 (moc doesn't work with boost headers)
-  patch -Np1 < "$srcdir/QTBUG-22829.diff" || true
-}
-
-build() {
-  cd "$srcdir/luxrender-luxrays-$_pkgver"
-
-  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/luxmark}
-  install -m755 bin/luxmark "$pkgdir"/usr/bin
-
-  # install scenes (only luxball is working ATM)
-  cp -a samples/luxmark/scenes/luxball  "$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/PKGBUILD (from rev 127755, luxrays/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-02-15 19:56:48 UTC (rev 127756)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+pkgname='luxrays'
+pkgver=1.4
+_pkgver=7c7127ee1fa4
+pkgrel=1
+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=(https://bitbucket.org/luxrender/luxrays/get/${_pkgver}.tar.bz2)
+md5sums=('2dda3316fb2ae9be6e58b5fa3a35de62')
+
+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
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-i686/QTBUG-22829.diff
===================================================================
--- community-i686/QTBUG-22829.diff	2015-02-15 18:47:27 UTC (rev 127755)
+++ community-i686/QTBUG-22829.diff	2015-02-15 19:56:48 UTC (rev 127756)
@@ -1,17 +0,0 @@
-diff -rup luxrender-luxrays-d16b0f132b4a/samples/luxmark/slgdefs.h luxrender-luxrays-d16b0f132b4a.new/samples/luxmark/slgdefs.h
---- luxrender-luxrays-d16b0f132b4a/samples/luxmark/slgdefs.h	2013-10-16 11:16:00.000000000 +0200
-+++ luxrender-luxrays-d16b0f132b4a.new/samples/luxmark/slgdefs.h	2013-10-30 20:29:36.768650444 +0100
-@@ -41,11 +41,13 @@
- #include "luxrays/core/utils.h"
- #include "luxrays/utils/atomic.h"
- 
-+#ifndef Q_MOC_RUN
- #include "slg/slg.h"
- #include "slg/rendersession.h"
- #include "slg/renderconfig.h"
- #include "slg/sdl/scene.h"
- #include "slg/film/film.h"
-+#endif
- 
- #include "mainwindow.h"
- 

Deleted: community-i686/luxmark_scenes_path.diff
===================================================================
--- community-i686/luxmark_scenes_path.diff	2015-02-15 18:47:27 UTC (rev 127755)
+++ community-i686/luxmark_scenes_path.diff	2015-02-15 19:56:48 UTC (rev 127756)
@@ -1,20 +0,0 @@
-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

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-02-15 18:47:27 UTC (rev 127755)
+++ community-x86_64/PKGBUILD	2015-02-15 19:56:48 UTC (rev 127756)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-pkgname=('luxrays' 'luxmark')
-pkgver=1.3.1
-_pkgver=7459cd8a9583
-pkgrel=5
-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')
-options=('staticlibs')
-source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \
-        luxmark_scenes_path.diff QTBUG-22829.diff)
-md5sums=('859999e5e07550553fb310a7f48530a4'
-         '1fd2a6f32e2822b5e0f147304292a1b9'
-         '6e20ee7ea64c578431d51065d0871abc')
-
-prepare() {
-  cd "$srcdir/luxrender-luxrays-$_pkgver"
-
-  # change the path to luxmark scenes
-  patch -Np1 < "$srcdir/luxmark_scenes_path.diff" || true
-
-  # workaround QTBUG-22829 (moc doesn't work with boost headers)
-  patch -Np1 < "$srcdir/QTBUG-22829.diff" || true
-}
-
-build() {
-  cd "$srcdir/luxrender-luxrays-$_pkgver"
-
-  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/luxmark}
-  install -m755 bin/luxmark "$pkgdir"/usr/bin
-
-  # install scenes (only luxball is working ATM)
-  cp -a samples/luxmark/scenes/luxball  "$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-x86_64/PKGBUILD (from rev 127755, luxrays/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-02-15 19:56:48 UTC (rev 127756)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+pkgname='luxrays'
+pkgver=1.4
+_pkgver=7c7127ee1fa4
+pkgrel=1
+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=(https://bitbucket.org/luxrender/luxrays/get/${_pkgver}.tar.bz2)
+md5sums=('2dda3316fb2ae9be6e58b5fa3a35de62')
+
+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
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/QTBUG-22829.diff
===================================================================
--- community-x86_64/QTBUG-22829.diff	2015-02-15 18:47:27 UTC (rev 127755)
+++ community-x86_64/QTBUG-22829.diff	2015-02-15 19:56:48 UTC (rev 127756)
@@ -1,17 +0,0 @@
-diff -rup luxrender-luxrays-d16b0f132b4a/samples/luxmark/slgdefs.h luxrender-luxrays-d16b0f132b4a.new/samples/luxmark/slgdefs.h
---- luxrender-luxrays-d16b0f132b4a/samples/luxmark/slgdefs.h	2013-10-16 11:16:00.000000000 +0200
-+++ luxrender-luxrays-d16b0f132b4a.new/samples/luxmark/slgdefs.h	2013-10-30 20:29:36.768650444 +0100
-@@ -41,11 +41,13 @@
- #include "luxrays/core/utils.h"
- #include "luxrays/utils/atomic.h"
- 
-+#ifndef Q_MOC_RUN
- #include "slg/slg.h"
- #include "slg/rendersession.h"
- #include "slg/renderconfig.h"
- #include "slg/sdl/scene.h"
- #include "slg/film/film.h"
-+#endif
- 
- #include "mainwindow.h"
- 

Deleted: community-x86_64/luxmark_scenes_path.diff
===================================================================
--- community-x86_64/luxmark_scenes_path.diff	2015-02-15 18:47:27 UTC (rev 127755)
+++ community-x86_64/luxmark_scenes_path.diff	2015-02-15 19:56:48 UTC (rev 127756)
@@ -1,20 +0,0 @@
-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



More information about the arch-commits mailing list