diff options
| -rw-r--r-- | libre/luxrender-libre/PKGBUILD | 20 | ||||
| -rw-r--r-- | libre/luxrender-libre/force_python3.diff | 12 |
2 files changed, 27 insertions, 5 deletions
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index 5d31f1386..86f9c296c 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=luxrender pkgname=$_pkgname-libre pkgver=1.3.1 _pkgver=d0b0e20c47cc -pkgrel=1 +pkgrel=3 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.$_pkgname.net/" @@ -15,17 +15,27 @@ license=('GPL') depends=('boost-libs' 'freeimage' 'openexr' 'mesa-libcl' 'mesa-libgl' 'fftw') optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \ 'python: Python interface (pylux)') -makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') -makedepends+=('libtool-lts') +makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers' \ + 'clang') provides=($_pkgname=$pkgver) conflicts=$_pkgname replaces=$_pkgname -source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2) -md5sums=('cbe749f56a1e1976745f5458100efa8a') +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 + export CC=clang + export CXX=clang++ export CXXFLAGS="$CXXFLAGS -lpthread" cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=OFF \ diff --git a/libre/luxrender-libre/force_python3.diff b/libre/luxrender-libre/force_python3.diff new file mode 100644 index 000000000..1ee61e872 --- /dev/null +++ b/libre/luxrender-libre/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}") |