diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-31 01:12:24 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-31 01:12:24 -0700 |
| commit | b2a6f1b28b7fa31088cab9a90b0f5ab97948534d (patch) | |
| tree | afa7b467e44b704b69c66862852a8c3118b8e308 /community/luxrays | |
| parent | 7c151ac5589d3dbef5972f69a62b847ecf565bfa (diff) | |
Thu Oct 31 01:09:50 PDT 2013
Diffstat (limited to 'community/luxrays')
| -rw-r--r-- | community/luxrays/PKGBUILD | 23 | ||||
| -rw-r--r-- | community/luxrays/QTBUG-22829.diff | 17 |
2 files changed, 33 insertions, 7 deletions
diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index 9d3769717..fd6f427da 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 94030 2013-07-13 12:33:25Z svenstaro $ +# $Id: PKGBUILD 99666 2013-10-30 21:24:19Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=('luxrays' 'luxmark') -pkgver=1.2.1 -_pkgver=475fbf15f0ca +pkgver=1.3 +_pkgver=d16b0f132b4a pkgrel=1 pkgdesc="Accelerate the ray intersection process by using GPUs" arch=('i686' 'x86_64') @@ -10,19 +10,28 @@ url="http://www.luxrender.net/" license=('GPL') depends=('freeimage' 'libcl' 'libgl') makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut' 'qt4') +options=('staticlibs') source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \ http://www.luxrender.net/release/luxmark/room_scene_v2.1.zip \ - luxmark_scenes_path.diff) -md5sums=('ac98e9a42ecc20d97d4c12dcdf17e315' + luxmark_scenes_path.diff QTBUG-22829.diff) +md5sums=('1bece7823fe1f9e177fec4efdf637ca5' 'ae917f025e32e20b1d20ebf8d22204cb' - '1fd2a6f32e2822b5e0f147304292a1b9') + '1fd2a6f32e2822b5e0f147304292a1b9' + '6e20ee7ea64c578431d51065d0871abc') -build() { +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 \ diff --git a/community/luxrays/QTBUG-22829.diff b/community/luxrays/QTBUG-22829.diff new file mode 100644 index 000000000..5625856bf --- /dev/null +++ b/community/luxrays/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" + |