diff options
| -rw-r--r-- | libre/luxmark/PKGBUILD | 15 | ||||
| -rw-r--r-- | libre/luxmark/exepath.diff | 15 |
2 files changed, 26 insertions, 4 deletions
diff --git a/libre/luxmark/PKGBUILD b/libre/luxmark/PKGBUILD index eeeb5dfa3..fd256ca0e 100644 --- a/libre/luxmark/PKGBUILD +++ b/libre/luxmark/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163018 2016-02-21 13:02:06Z stativ $ +# $Id: PKGBUILD 177430 2016-05-29 15:32:11Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Maintainer: Márcio Silva <coadde@parabola.nu> pkgname=luxmark pkgver=3.1 _scenever=3.1beta3 _pkgver=21d445746802 -pkgrel=1.parabola1 +pkgrel=2.parabola1 pkgdesc="OpenCL benchmark tool, with opencl-mesa recommendation" arch=('x86_64') # because of embree only x86_64 is supported url="http://www.luxrender.net/" @@ -15,15 +15,22 @@ makedepends=('cmake' 'boost' 'luxrays' 'mesa' 'opencl-headers' 'freeglut') optdepends=('opencl-mesa: OpenCL support for AMD/ATI GPUs') source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/luxmark/get/${_pkgver}.tar.bz2 \ https://bitbucket.org/luxrender/luxmark/downloads/scenes-v${_scenever}.zip \ - system_scenes.diff) + fix_includes.diff::https://bitbucket.org/luxrender/luxmark/commits/b7f5c9475c14b91364835d6a253f43400b7d98cb/raw/ \ + system_scenes.diff exepath.diff) md5sums=('3b0232ee8a6b170927a77be6c0beef46' '03d3d117dfd2f3a7f825e3ea7b68f045' - 'c4a378c08f105a84ef2f792370082cd6') + 'd448bbeac4dc4889b99716438f6f1c58' + 'c4a378c08f105a84ef2f792370082cd6' + '6ba9b9888160cc06e3c3644e21d80e5a') prepare() { cd "$srcdir"/luxrender-luxmark-$_pkgver patch -Np1 < "$srcdir/system_scenes.diff" + # fix includes for luxrays 1.6 + patch -Np1 < "$srcdir/fix_includes.diff" + # fix exepath for the VR mode to work + patch -Np1 < "$srcdir/exepath.diff" } build() { diff --git a/libre/luxmark/exepath.diff b/libre/luxmark/exepath.diff new file mode 100644 index 000000000..bf135fec6 --- /dev/null +++ b/libre/luxmark/exepath.diff @@ -0,0 +1,15 @@ +diff --git a/src/luxmarkapp.cpp b/src/luxmarkapp.cpp +--- a/src/luxmarkapp.cpp ++++ b/src/luxmarkapp.cpp +@@ -90,10 +90,7 @@ + } + exePath = boost::filesystem::path(boost::filesystem::initial_path<boost::filesystem::path>()); + #else +- +- // Look for the directory where Lux executables are +- const boost::filesystem::path luxMarkExe(argv[0]); +- exePath = boost::filesystem::absolute(luxMarkExe).parent_path(); ++ exePath = "/usr/bin"; + #endif + } + |