Date: Saturday, May 16, 2015 @ 12:21:07 Author: stativ Revision: 133574
archrelease: copy trunk to community-x86_64 Added: luxmark/repos/community-x86_64/PKGBUILD (from rev 133573, luxmark/trunk/PKGBUILD) luxmark/repos/community-x86_64/system_scenes.diff (from rev 133573, luxmark/trunk/system_scenes.diff) Deleted: luxmark/repos/community-x86_64/PKGBUILD luxmark/repos/community-x86_64/system_scenes.diff --------------------+ PKGBUILD | 94 +++++++++++++++++++++++++-------------------------- system_scenes.diff | 42 +++++++++++----------- 2 files changed, 68 insertions(+), 68 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-05-16 10:21:01 UTC (rev 133573) +++ PKGBUILD 2015-05-16 10:21:07 UTC (rev 133574) @@ -1,47 +0,0 @@ -# $Id$ -# Maintainer: Lukas Jirkovsky <l.jirkov...@gmail.com> -pkgname=luxmark -pkgver=3.0 -_scenever=3.0beta2 -_pkgver=985b948aa5c7 -pkgrel=1 -pkgdesc="OpenCL benchmark tool" -arch=('x86_64') # because of embree only x86_64 is supported -url="http://www.luxrender.net/" -license=('GPL3') -depends=('boost-libs' 'freetype2' 'glew' 'libcl' 'libgl' 'libpng' 'openimageio' 'qt4') -makedepends=('cmake' 'boost' 'luxrays' 'mesa' 'opencl-headers' 'embree' 'freeglut') -optdepends=('opencl-nvidia: OpenCL support for nVidia GPUs' \ - 'amdapp-sdk: OpenCL support for AMD GPUs' \ - 'intel-opencl-runtime: OpenCL support for Intel CPUs') -source=(https://bitbucket.org/luxrender/luxmark/get/${_pkgver}.tar.bz2 \ - https://bitbucket.org/luxrender/luxmark/downloads/scenes-v${_scenever}.zip \ - system_scenes.diff) -md5sums=('8bf391a882c00c290372a9d67fea87af' - '504724fde889d0e46a8b971636a0703b' - '0635afe0dc5dc3e4e58f25190808942e') - -prepare() { - cd "$srcdir"/luxrender-luxmark-$_pkgver - - patch -Np1 < "$srcdir/system_scenes.diff" -} - -build() { - cd "$srcdir/luxrender-luxmark-$_pkgver" - - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON \ - . - make -} - -package() { - cd "$srcdir/luxrender-luxmark-$_pkgver" - install -D -m755 bin/luxmark "$pkgdir"/usr/bin/luxmark - - install -d "$pkgdir/usr/share/luxmark" - cp -a "$srcdir/scenes" "$pkgdir/usr/share/luxmark" -} - -# vim:set ts=2 sw=2 et: Copied: luxmark/repos/community-x86_64/PKGBUILD (from rev 133573, luxmark/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-05-16 10:21:07 UTC (rev 133574) @@ -0,0 +1,47 @@ +# $Id$ +# Maintainer: Lukas Jirkovsky <l.jirkov...@gmail.com> +pkgname=luxmark +pkgver=3.0 +_scenever=3.0beta2 +_pkgver=985b948aa5c7 +pkgrel=2 +pkgdesc="OpenCL benchmark tool" +arch=('x86_64') # because of embree only x86_64 is supported +url="http://www.luxrender.net/" +license=('GPL3') +depends=('boost-libs' 'freetype2' 'freeglut' 'glew' 'libcl' 'libgl' 'libpng' 'openimageio' 'qt4') +makedepends=('cmake' 'boost' 'luxrays' 'mesa' 'opencl-headers' 'embree' 'freeglut') +optdepends=('opencl-nvidia: OpenCL support for nVidia GPUs' \ + 'amdapp-sdk: OpenCL support for AMD GPUs' \ + 'intel-opencl-runtime: OpenCL support for Intel CPUs') +source=(https://bitbucket.org/luxrender/luxmark/get/${_pkgver}.tar.bz2 \ + https://bitbucket.org/luxrender/luxmark/downloads/scenes-v${_scenever}.zip \ + system_scenes.diff) +md5sums=('8bf391a882c00c290372a9d67fea87af' + '504724fde889d0e46a8b971636a0703b' + '0635afe0dc5dc3e4e58f25190808942e') + +prepare() { + cd "$srcdir"/luxrender-luxmark-$_pkgver + + patch -Np1 < "$srcdir/system_scenes.diff" +} + +build() { + cd "$srcdir/luxrender-luxmark-$_pkgver" + + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + . + make +} + +package() { + cd "$srcdir/luxrender-luxmark-$_pkgver" + install -D -m755 bin/luxmark "$pkgdir"/usr/bin/luxmark + + install -d "$pkgdir/usr/share/luxmark" + cp -a "$srcdir/scenes" "$pkgdir/usr/share/luxmark" +} + +# vim:set ts=2 sw=2 et: Deleted: system_scenes.diff =================================================================== --- system_scenes.diff 2015-05-16 10:21:01 UTC (rev 133573) +++ system_scenes.diff 2015-05-16 10:21:07 UTC (rev 133574) @@ -1,21 +0,0 @@ -diff -rup luxrender-luxmark-985b948aa5c7/src/main.cpp luxrender-luxmark-985b948aa5c7.new/src/main.cpp ---- luxrender-luxmark-985b948aa5c7/src/main.cpp 2015-02-25 10:46:48.000000000 +0100 -+++ luxrender-luxmark-985b948aa5c7.new/src/main.cpp 2015-03-12 23:01:53.971856726 +0100 -@@ -125,16 +125,7 @@ int main(int argc, char **argv) { - return EXIT_SUCCESS; - else { - app.Init(mode, scnName, singleRun); -- -- // If current directory doesn't have the "scenes" directory, move -- // to where the executable is -- if (!boost::filesystem::exists("./scenes")) { -- // Look for the directory where LuxMark executable is installed -- boost::filesystem::path exePath(boost::filesystem::initial_path<boost::filesystem::path>()); -- exePath = boost::filesystem::system_complete(boost::filesystem::path(argv[0])).parent_path(); -- // Set the current directory to where the binary is -- boost::filesystem::current_path(exePath); -- } -+ boost::filesystem::current_path("/usr/share/luxmark"); - - // Force C locale - setlocale(LC_NUMERIC, "C"); Copied: luxmark/repos/community-x86_64/system_scenes.diff (from rev 133573, luxmark/trunk/system_scenes.diff) =================================================================== --- system_scenes.diff (rev 0) +++ system_scenes.diff 2015-05-16 10:21:07 UTC (rev 133574) @@ -0,0 +1,21 @@ +diff -rup luxrender-luxmark-985b948aa5c7/src/main.cpp luxrender-luxmark-985b948aa5c7.new/src/main.cpp +--- luxrender-luxmark-985b948aa5c7/src/main.cpp 2015-02-25 10:46:48.000000000 +0100 ++++ luxrender-luxmark-985b948aa5c7.new/src/main.cpp 2015-03-12 23:01:53.971856726 +0100 +@@ -125,16 +125,7 @@ int main(int argc, char **argv) { + return EXIT_SUCCESS; + else { + app.Init(mode, scnName, singleRun); +- +- // If current directory doesn't have the "scenes" directory, move +- // to where the executable is +- if (!boost::filesystem::exists("./scenes")) { +- // Look for the directory where LuxMark executable is installed +- boost::filesystem::path exePath(boost::filesystem::initial_path<boost::filesystem::path>()); +- exePath = boost::filesystem::system_complete(boost::filesystem::path(argv[0])).parent_path(); +- // Set the current directory to where the binary is +- boost::filesystem::current_path(exePath); +- } ++ boost::filesystem::current_path("/usr/share/luxmark"); + + // Force C locale + setlocale(LC_NUMERIC, "C");