From 63944baf7a43574a3a708fb1778e50cb9ef89cea Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Sun, 24 Aug 2014 16:45:46 -0300 Subject: rename luxrender-libre to luxrender-parabola --- libre/luxrender-libre/PKGBUILD | 56 ------------------------- libre/luxrender-libre/force_python3.diff | 12 ------ libre/luxrender-parabola/PKGBUILD | 63 +++++++++++++++++++++++++++++ libre/luxrender-parabola/force_python3.diff | 12 ++++++ 4 files changed, 75 insertions(+), 68 deletions(-) delete mode 100644 libre/luxrender-libre/PKGBUILD delete mode 100644 libre/luxrender-libre/force_python3.diff create mode 100644 libre/luxrender-parabola/PKGBUILD create mode 100644 libre/luxrender-parabola/force_python3.diff 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 -# Contributor (Arch): flixie <69one@gmx.net> -# Contributor (Arch): Imanol Celaya -# Maintainer: Márcio Silva -_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-libre/force_python3.diff b/libre/luxrender-libre/force_python3.diff deleted file mode 100644 index 1ee61e872..000000000 --- a/libre/luxrender-libre/force_python3.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake ---- luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake 2013-11-04 22:25:45.000000000 +0100 -+++ luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake 2013-12-05 19:43:23.414625854 +0100 -@@ -156,7 +156,7 @@ IF(MSVC AND BOOST_python_LIBRARYDIR) - SET(BOOST_LIBRARYDIR "${BOOST_python_LIBRARYDIR}") - ENDIF(MSVC AND BOOST_python_LIBRARYDIR) - --FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python REQUIRED) -+FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python3 REQUIRED) - - IF(MSVC AND BOOST_python_LIBRARYDIR) - SET(BOOST_LIBRARYDIR "${_boost_libdir}") diff --git a/libre/luxrender-parabola/PKGBUILD b/libre/luxrender-parabola/PKGBUILD new file mode 100644 index 000000000..52c7ca324 --- /dev/null +++ b/libre/luxrender-parabola/PKGBUILD @@ -0,0 +1,63 @@ +# Maintainer (Arch): Lukas Jirkovsky +# Contributor (Arch): flixie <69one@gmx.net> +# Contributor (Arch): Imanol Celaya +# Maintainer: Márcio Silva +_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-parabola/force_python3.diff b/libre/luxrender-parabola/force_python3.diff new file mode 100644 index 000000000..1ee61e872 --- /dev/null +++ b/libre/luxrender-parabola/force_python3.diff @@ -0,0 +1,12 @@ +diff -rup luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake +--- luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake 2013-11-04 22:25:45.000000000 +0100 ++++ luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake 2013-12-05 19:43:23.414625854 +0100 +@@ -156,7 +156,7 @@ IF(MSVC AND BOOST_python_LIBRARYDIR) + SET(BOOST_LIBRARYDIR "${BOOST_python_LIBRARYDIR}") + ENDIF(MSVC AND BOOST_python_LIBRARYDIR) + +-FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python REQUIRED) ++FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python3 REQUIRED) + + IF(MSVC AND BOOST_python_LIBRARYDIR) + SET(BOOST_LIBRARYDIR "${_boost_libdir}") -- cgit v1.2.3-54-g00ecf