[arch-commits] Commit in luxmark/trunk (PKGBUILD exepath.diff)

[Lukas Jirkovsky]

    Date: Sunday, May 29, 2016 @ 17:32:11
  Author: stativ
Revision: 177430

luxmark: add fix for the exePath for luxVR

Added:
  luxmark/trunk/exepath.diff
Modified:
  luxmark/trunk/PKGBUILD

--------------+
 PKGBUILD     |    7 +++++--
 exepath.diff |   15 +++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-29 13:55:26 UTC (rev 177429)
+++ PKGBUILD	2016-05-29 15:32:11 UTC (rev 177430)
@@ -17,11 +17,12 @@
 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)
+        system_scenes.diff exepath.diff)
 md5sums=('3b0232ee8a6b170927a77be6c0beef46'
          '03d3d117dfd2f3a7f825e3ea7b68f045'
          'd448bbeac4dc4889b99716438f6f1c58'
-         'c4a378c08f105a84ef2f792370082cd6')
+         'c4a378c08f105a84ef2f792370082cd6'
+         '6ba9b9888160cc06e3c3644e21d80e5a')
 
 prepare() {
   cd "$srcdir"/luxrender-luxmark-$_pkgver
@@ -29,6 +30,8 @@
   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() {

Added: exepath.diff
===================================================================
--- exepath.diff	                        (rev 0)
+++ exepath.diff	2016-05-29 15:32:11 UTC (rev 177430)
@@ -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
+ }
+