diff options
| author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-08-24 16:45:46 -0300 |
|---|---|---|
| committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-08-24 16:45:46 -0300 |
| commit | 63944baf7a43574a3a708fb1778e50cb9ef89cea (patch) | |
| tree | 53f8b7936da46e757bf4389803a55db62a763bc0 | |
| parent | 9ee6eded53763c93151b50cb4c11812a69cb70bb (diff) | |
| download | abslibre-63944baf7a43574a3a708fb1778e50cb9ef89cea.tar.gz abslibre-63944baf7a43574a3a708fb1778e50cb9ef89cea.tar.bz2 abslibre-63944baf7a43574a3a708fb1778e50cb9ef89cea.zip | |
rename luxrender-libre to luxrender-parabola
| -rw-r--r-- | libre/luxrender-parabola/PKGBUILD (renamed from libre/luxrender-libre/PKGBUILD) | 23 | ||||
| -rw-r--r-- | libre/luxrender-parabola/force_python3.diff (renamed from libre/luxrender-libre/force_python3.diff) | 0 |
2 files changed, 15 insertions, 8 deletions
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-parabola/PKGBUILD index e44692544..52c7ca324 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-parabola/PKGBUILD @@ -1,24 +1,25 @@ -# $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 +pkgname=$_pkgname-parabola pkgver=1.3.1 _pkgver=d0b0e20c47cc -pkgrel=8 +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: Python interface (pylux)') -makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') -provides=($_pkgname=$pkgver) -conflicts=($_pkgname) -replaces=($_pkgname) + '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' @@ -28,16 +29,22 @@ 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 } 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 |