[arch-commits] Commit in luxmark/repos/community-x86_64 (6 files)
Laurent Carlier
lcarlier at archlinux.org
Sat Dec 3 07:36:40 UTC 2016
Date: Saturday, December 3, 2016 @ 07:36:39
Author: lcarlier
Revision: 197790
archrelease: copy trunk to community-x86_64
Added:
luxmark/repos/community-x86_64/PKGBUILD
(from rev 197789, luxmark/trunk/PKGBUILD)
luxmark/repos/community-x86_64/exepath.diff
(from rev 197789, luxmark/trunk/exepath.diff)
luxmark/repos/community-x86_64/system_scenes.diff
(from rev 197789, luxmark/trunk/system_scenes.diff)
Deleted:
luxmark/repos/community-x86_64/PKGBUILD
luxmark/repos/community-x86_64/exepath.diff
luxmark/repos/community-x86_64/system_scenes.diff
--------------------+
PKGBUILD | 107 +++++++++++++++++++++++++--------------------------
exepath.diff | 30 +++++++-------
system_scenes.diff | 42 ++++++++++----------
3 files changed, 89 insertions(+), 90 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-12-03 07:36:34 UTC (rev 197789)
+++ PKGBUILD 2016-12-03 07:36:39 UTC (rev 197790)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-pkgname=luxmark
-pkgver=3.1
-_scenever=3.1beta3
-_pkgver=21d445746802
-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' 'embree' 'freetype2' 'freeglut' 'glew' 'libcl' 'libgl' 'libpng' 'openimageio' 'qt4')
-makedepends=('cmake' 'boost' 'luxrays' 'mesa' 'opencl-headers' '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=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/luxmark/get/${_pkgver}.tar.bz2 \
- https://bitbucket.org/luxrender/luxmark/downloads/scenes-v${_scenever}.zip \
- fix_includes.diff::https://bitbucket.org/luxrender/luxmark/commits/b7f5c9475c14b91364835d6a253f43400b7d98cb/raw/ \
- system_scenes.diff exepath.diff)
-md5sums=('3b0232ee8a6b170927a77be6c0beef46'
- '03d3d117dfd2f3a7f825e3ea7b68f045'
- '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() {
- 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 197789, luxmark/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-12-03 07:36:39 UTC (rev 197790)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+pkgname=luxmark
+pkgver=3.1
+_scenever=3.1beta3
+_pkgver=21d445746802
+pkgrel=3
+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' 'embree' 'freetype2' 'freeglut' 'glew' 'opencl-icd-loader' 'libgl' 'libpng' 'openimageio' 'qt4')
+makedepends=('cmake' 'boost' 'luxrays' 'mesa' 'opencl-headers' 'freeglut')
+optdepends=('amdapp-sdk: OpenCL support for AMD GPUs' \
+ 'intel-opencl-runtime: OpenCL support for Intel CPUs')
+source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/luxmark/get/${_pkgver}.tar.bz2 \
+ https://bitbucket.org/luxrender/luxmark/downloads/scenes-v${_scenever}.zip \
+ fix_includes.diff::https://bitbucket.org/luxrender/luxmark/commits/b7f5c9475c14b91364835d6a253f43400b7d98cb/raw/ \
+ system_scenes.diff exepath.diff)
+md5sums=('3b0232ee8a6b170927a77be6c0beef46'
+ '03d3d117dfd2f3a7f825e3ea7b68f045'
+ '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() {
+ 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: exepath.diff
===================================================================
--- exepath.diff 2016-12-03 07:36:34 UTC (rev 197789)
+++ exepath.diff 2016-12-03 07:36:39 UTC (rev 197790)
@@ -1,15 +0,0 @@
-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
- }
-
Copied: luxmark/repos/community-x86_64/exepath.diff (from rev 197789, luxmark/trunk/exepath.diff)
===================================================================
--- exepath.diff (rev 0)
+++ exepath.diff 2016-12-03 07:36:39 UTC (rev 197790)
@@ -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
+ }
+
Deleted: system_scenes.diff
===================================================================
--- system_scenes.diff 2016-12-03 07:36:34 UTC (rev 197789)
+++ system_scenes.diff 2016-12-03 07:36:39 UTC (rev 197790)
@@ -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, singleRunExtInfo);
--
-- // 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 197789, luxmark/trunk/system_scenes.diff)
===================================================================
--- system_scenes.diff (rev 0)
+++ system_scenes.diff 2016-12-03 07:36:39 UTC (rev 197790)
@@ -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, singleRunExtInfo);
+-
+- // 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");
More information about the arch-commits
mailing list