Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

7 files changed, 186 insertions, 62 deletions

diff --git a/libre/lirc-parabola/PKGBUILD b/libre/lirc-parabola/PKGBUILD
index c57af293c..044393d2c 100644
--- a/libre/lirc-parabola/PKGBUILD
+++ b/libre/lirc-parabola/PKGBUILD
@@ -15,7 +15,7 @@ if [[ -n "${_kernelname}" ]]; then
   pkgname=$_pkgname
 else
   pkgbase=$_pkgname
-  pkgname=("$_pkgname" lirc-parabola-utils)
+  pkgname=("$_pkgname" lirc-utils-parabola)
 fi
 
 _pkgver=0.9.1a
@@ -90,8 +90,8 @@ _package_lirc() {
   [[ -z "$_kernelname" ]] || provides=("lirc-parabola=${pkgver}")
   install=kmod.install
 
-  replaces+=("lirc${_kernelname}")
-  conflicts+=("lirc${_kernelname}")
+  replaces+=("lirc${_kernelname}" "lirc-libre${_kernelname}")
+  conflicts+=("lirc${_kernelname}" "lirc-libre${_kernelname}")
   provides+=("lirc${_kernelname}=${pkgver}")
 
   cd "${srcdir}/lirc-${_pkgver}/drivers"
@@ -110,15 +110,15 @@ else
   eval "package_${_pkgname}() { _package_lirc; }"
 fi
 
-package_lirc-parabola-utils() {
+package_lirc-utils-parabola() {
   pkgdesc="Linux Infrared Remote Control utilities"
   depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman')
   optdepends=('python2: pronto2lirc utility')
   options=('strip')
   backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf')
 
-  replaces=('lirc-utils')
-  conflicts=('lirc-utils')
+  replaces=('lirc-utils' 'lirc-libre-utils')
+  conflicts=('lirc-utils' 'lirc-libre-utils')
   provides=("lirc-utils=$pkgver")
   install=kmod.install
 
diff --git a/libre/luxrays-parabola/PKGBUILD b/libre/luxrays-parabola/PKGBUILD
new file mode 100644
index 000000000..8edc9ff17
--- /dev/null
+++ b/libre/luxrays-parabola/PKGBUILD
@@ -0,0 +1,81 @@
+# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Maintainer: Márcio Silva <ecoadde@parabola.nu>
+_pkgname=('luxrays' 'luxmark')
+#pkgname=('luxrays-parabola' 'luxmark-parabola')
+pkgname=('luxrays-parabola')
+pkgver=1.3.1
+_pkgver=7459cd8a9583
+pkgrel=5
+pkgdesc="Accelerate the ray intersection process by using CPUs"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.luxrender.net/"
+license=('GPL')
+#depends=('freeimage' 'libcl' 'libgl')
+depends=('freeimage' 'libgl')
+#makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut' 'qt4')
+makedepends=('cmake' 'boost' 'mesa' '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=ON \
+    -DBUILD_LUXMARK=ON \
+    .
+  make
+}
+
+package_luxrays-parabola() {
+  provides=("${_pkgname[0]}=${pkgver}")
+  conflicts=("${_pkgname[0]}")
+  replaces=("${_pkgname[0]}")
+  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-parabola() {
+  pkgdesc="OpenCL benchmark tool"
+  depends+=("${depends[@]}" 'boost-libs' 'qt4')
+  provides=("${_pkgname[1]}=${pkgver}")
+  conflicts=("${_pkgname[1]}")
+  replaces=("${_pkgname[1]}")
+
+  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:
diff --git a/libre/luxrays-parabola/QTBUG-22829.diff b/libre/luxrays-parabola/QTBUG-22829.diff
new file mode 100644
index 000000000..5625856bf
--- /dev/null
+++ b/libre/luxrays-parabola/QTBUG-22829.diff
@@ -0,0 +1,17 @@
+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"
+ 
diff --git a/libre/luxrays-parabola/luxmark_scenes_path.diff b/libre/luxrays-parabola/luxmark_scenes_path.diff
new file mode 100644
index 000000000..80f909a05
--- /dev/null
+++ b/libre/luxrays-parabola/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
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
deleted file mode 100644
index e44692544..000000000
--- a/libre/luxrender-libre/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 111294 2014-05-16 08:45:03Z stativ $
-# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor (Arch): flixie <69one@gmx.net>
-# Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org>
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-_pkgname=luxrender
-pkgname=$_pkgname-libre
-pkgver=1.3.1
-_pkgver=d0b0e20c47cc
-pkgrel=8
-pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree nvidia-utils, amdstream and intel-opencl-sdk recommendation"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.$_pkgname.net/"
-license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'libpng' 'libcl' 'libgl' 'fftw')
-optdepends=('blender-addon-luxrender: Blender exporter' 'qt4: Qt GUI' \
-            'python: Python interface (pylux)')
-makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
-provides=($_pkgname=$pkgver)
-conflicts=($_pkgname)
-replaces=($_pkgname)
-source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2 \
-        force_python3.diff)
-md5sums=('cbe749f56a1e1976745f5458100efa8a'
-         '42692e65eabc5828693e2682e94b7c64')
-
-prepare() {
-  cd "$srcdir"/$_pkgname-lux-$_pkgver
-
-  patch -Np1 < "$srcdir/force_python3.diff" || true
-}
-
-build() {
-  cd "$srcdir"/$_pkgname-lux-$_pkgver
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLUXRAYS_DISABLE_OPENCL=OFF \
-    -DPYTHON_CUSTOM=ON \
-    -DPYTHON_LIBRARIES=/usr/lib/libpython3.4m.so \
-    -DPYTHON_INCLUDE_PATH=/usr/include/python3.4m/ \
-    .
-  make
-}
-
-package() {
-  cd "$srcdir"/$_pkgname-lux-$_pkgver
-  make DESTDIR="$pkgdir" install
-
-  # fix library path on 64bit
-  [[ $CARCH == x86_64 ]] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
-
-  #install pylux
-  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.4/pylux.so
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/luxrender-parabola/PKGBUILD b/libre/luxrender-parabola/PKGBUILD
new file mode 100644
index 000000000..a59a58c35
--- /dev/null
+++ b/libre/luxrender-parabola/PKGBUILD
@@ -0,0 +1,62 @@
+# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Contributor (Arch): flixie <69one@gmx.net>
+# Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+_pkgname=luxrender
+pkgname=$_pkgname-parabola
+pkgver=1.3.1
+_pkgver=d0b0e20c47cc
+pkgrel=10
+pkgdesc='Rendering system for physically correct, unbiased image synthesis, without nonfree nvidia-utils, amdstream and intel-opencl-sdk recommendation'
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.$_pkgname.net/"
+license=('GPL')
+depends=('boost-libs' 'freeimage' 'openexr' 'libpng' 'libcl' 'libgl' 'fftw')
+optdepends=('blender-addon-luxrender: Blender exporter' 'qt4: Qt GUI'
+            'python: pylux Python interface')
+# luxrender is constantly broken to various GCC bugs, the latest one being FS#40596
+#makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
+makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname" "$_pkgname-libre")
+replaces=("$_pkgname" "$_pkgname-libre")
+source=("https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2"
+        "force_python3.diff")
+md5sums=('cbe749f56a1e1976745f5458100efa8a'
+         '42692e65eabc5828693e2682e94b7c64')
+
+prepare() {
+  cd $srcdir/$_pkgname-lux-$_pkgver
+
+  patch -Np1 < $srcdir/force_python3.diff || true
+  # workaround QTBUG-22829
+  find . -type f -exec sed -i 's|^#include .*boost/.*|#ifndef Q_MOC_RUN\n&\n#endif|' '{}' ';'
+}
+
+build() {
+  cd $srcdir/$_pkgname-lux-$_pkgver
+
+  export CC=clang
+  export CXX=clang++
+
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLUXRAYS_DISABLE_OPENCL=OFF \
+    -DPYTHON_CUSTOM=ON \
+    -DPYTHON_LIBRARIES=/usr/lib/libpython3.4m.so \
+    -DPYTHON_INCLUDE_PATH=/usr/include/python3.4m/ \
+    -DCMAKE_EXE_LINKER_FLAGS=-lpthread
+  make
+}
+
+package() {
+  cd $srcdir/$_pkgname-lux-$_pkgver
+  make DESTDIR=$pkgdir install
+
+  # fix library path on 64bit
+  [[ $CARCH == x86_64 ]] && mv $pkgdir/usr/lib64 $pkgdir/usr/lib
+
+  #install pylux
+  install -D -m644 pylux.so $pkgdir/usr/lib/python3.4/pylux.so
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/luxrender-libre/force_python3.diff b/libre/luxrender-parabola/force_python3.diff
index 1ee61e872..1ee61e872 100644
--- a/libre/luxrender-libre/force_python3.diff
+++ b/libre/luxrender-parabola/force_python3.diff