summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-05-30 15:33:10 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-05-30 15:35:21 -0300
commit2d77dff6f9f061b0c7007192f94f4fd26ae2081d (patch)
treeea2b13b45ee5fa219493ecd88f8221d5153e78d8
parent98483f2026c1005f783ff31999bce8694e7c27c7 (diff)
luxrays-1.6-1.parabola1: updating version
-rw-r--r--libre/luxrays/PKGBUILD21
-rw-r--r--libre/luxrays/force_python3.diff10
2 files changed, 18 insertions, 13 deletions
diff --git a/libre/luxrays/PKGBUILD b/libre/luxrays/PKGBUILD
index ecc4c712b..d64ae36c7 100644
--- a/libre/luxrays/PKGBUILD
+++ b/libre/luxrays/PKGBUILD
@@ -1,29 +1,31 @@
-# $Id: PKGBUILD 175265 2016-05-13 20:59:03Z bpiotrowski $
+# $Id: PKGBUILD 177421 2016-05-29 13:16:13Z stativ $
# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>
# Maintainer: Márcio Silva <coadde@parabola.nu>
pkgname='luxrays'
-pkgver=1.5.1
-_pkgver=8577ff287efb
-pkgrel=2.parabola1
+pkgver=1.6
+_pkgver=61352e6aae3f
+pkgrel=1.parabola1
pkgdesc="Accelerate the ray intersection process by using GPUs, with opencl-mesa recommendation"
arch=('x86_64')
url="http://www.luxrender.net/"
license=('GPL')
depends=('embree' 'libcl' 'libgl' 'openimageio')
-makedepends=('boost' 'cmake' 'freetype2' 'libpng' 'mesa' 'opencl-headers' 'glew' 'freeglut')
+makedepends=('boost' 'cmake' 'freetype2' 'gtk3' 'libpng' 'mesa' 'opencl-headers' 'glew' 'freeglut')
optdepends=('opencl-mesa: OpenCL support for AMD/ATI GPUs' \
'glew: demos (SmallLuxGPU etc.)' \
+ 'gtk3: luxcoreui'
'freeglut: demos (SmallLuxGPU etc.)' \
'boost-libs: demos (SmallLuxGPU etc.)')
options=('staticlibs')
-source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/luxrays/get/${_pkgver}.tar.bz2 \
+source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/luxrays/get/luxrender_v$pkgver.tar.bz2 \
force_python3.diff)
-md5sums=('2d6619e33fb4df237ba239b944e00e68'
- '3bfb5594a709d1ea772866d66904b8fd')
+md5sums=('4c8df34d90dc04b50a180b945041cd92'
+ '36c9823246c2b575415c1709e065727c')
prepare() {
cd "$srcdir"/luxrender-luxrays-$_pkgver
+ # force python3 for boost
patch -Np1 < "$srcdir/force_python3.diff" || true
}
@@ -34,6 +36,9 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_SKIP_RPATH=ON \
-DLUXRAYS_DISABLE_OPENCL=OFF
+ # this sucks, but luxrays doesn't seem to honor CMAKE_*_LINKER_FLAGS
+ # thanks bartus from AUR for the fix
+ for file in `grep lboost_python -l -R ` ;do sed -i 's/$/ -lpython3/' $file ; done
make
}
diff --git a/libre/luxrays/force_python3.diff b/libre/luxrays/force_python3.diff
index bec7ac03c..9dc09b42f 100644
--- a/libre/luxrays/force_python3.diff
+++ b/libre/luxrays/force_python3.diff
@@ -1,12 +1,12 @@
-diff -rup luxrender-luxrays-7c7127ee1fa4/cmake/Dependencies.cmake luxrender-luxrays-7c7127ee1fa4.new/cmake/Dependencies.cmake
---- luxrender-luxrays-7c7127ee1fa4/cmake/Dependencies.cmake 2015-01-20 23:45:32.000000000 +0100
-+++ luxrender-luxrays-7c7127ee1fa4.new/cmake/Dependencies.cmake 2015-02-15 22:19:40.775351414 +0100
+diff -rup luxrender-luxrays-61352e6aae3f.orig/cmake/Dependencies.cmake luxrender-luxrays-61352e6aae3f/cmake/Dependencies.cmake
+--- luxrender-luxrays-61352e6aae3f.orig/cmake/Dependencies.cmake 2016-05-09 22:17:57.000000000 +0200
++++ luxrender-luxrays-61352e6aae3f/cmake/Dependencies.cmake 2016-05-29 09:04:30.913648230 +0200
@@ -58,7 +58,7 @@ set(Boost_MINIMUM_VERSION "1.44.0"
set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.1" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0")
--set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python)
-+set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python3)
+-set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python chrono)
++set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python3 chrono)
find_package(Boost ${Boost_MINIMUM_VERSION} COMPONENTS ${LUXRAYS_BOOST_COMPONENTS})
if (NOT Boost_FOUND)
# Try again with the other type of libs