[arch-commits] Commit in luxrays/trunk (PKGBUILD)

[Lukas Jirkovsky]

    Date: Sunday, February 15, 2015 @ 11:26:41
  Author: stativ
Revision: 127739

luxrays: update to 1.4. Luxmark has been removed, as the upstream provides it in a separate repository.

Modified:
  luxrays/trunk/PKGBUILD

----------+
 PKGBUILD |   57 ++++++++++++---------------------------------------------
 1 file changed, 12 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-15 05:52:31 UTC (rev 127738)
+++ PKGBUILD	2015-02-15 10:26:41 UTC (rev 127739)
@@ -1,51 +1,35 @@
 # $Id$
 # Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-pkgname=('luxrays' 'luxmark')
-pkgver=1.3.1
-_pkgver=7459cd8a9583
-pkgrel=5
+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=('freeimage' 'libcl' 'libgl')
-makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut' 'qt4')
+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')
+            '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 \
-        luxmark_scenes_path.diff QTBUG-22829.diff)
-md5sums=('859999e5e07550553fb310a7f48530a4'
-         '1fd2a6f32e2822b5e0f147304292a1b9'
-         '6e20ee7ea64c578431d51065d0871abc')
+source=(https://bitbucket.org/luxrender/luxrays/get/${_pkgver}.tar.bz2)
+md5sums=('2dda3316fb2ae9be6e58b5fa3a35de62')
 
-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.)')
-
+package() {
   cd "$srcdir/luxrender-luxrays-$_pkgver"
 
   install -d -m755 "$pkgdir"/usr/{bin,include,lib}
@@ -52,23 +36,6 @@
   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: