[arch-commits] Commit in luxblend25/trunk (PKGBUILD luxrender_path.diff)

[Lukas Jirkovsky]

    Date: Friday, November 15, 2013 @ 11:11:28
  Author: stativ
Revision: 101037

luxblend25: set the default install path to /usr/bin

Added:
  luxblend25/trunk/luxrender_path.diff
Modified:
  luxblend25/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   14 ++++++++++++--
 luxrender_path.diff |   19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-15 10:08:32 UTC (rev 101036)
+++ PKGBUILD	2013-11-15 10:11:28 UTC (rev 101037)
@@ -10,9 +10,19 @@
 url="http://www.luxrender.net/"
 license=('GPL')
 depends=('blender' 'luxrender')
-source=(https://bitbucket.org/luxrender/luxblend25/get/$_pkgver.tar.bz2)
-md5sums=('389991810953df26f1d849db1c65a129')
+source=(https://bitbucket.org/luxrender/luxblend25/get/$_pkgver.tar.bz2 \
+        luxrender_path.diff)
+md5sums=('389991810953df26f1d849db1c65a129'
+         'cea2a59336c28b84258e795f66301918')
 
+prepare() {
+  cd "$srcdir/luxrender-luxblend25-$_pkgver"
+
+  # set the default path to luxrender instalation, so the users doesn't have
+  # to do that everytime they enable luxrender
+  patch -Np1 < "$srcdir/luxrender_path.diff" || true
+}
+
 package() {
   install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons
   cp -a "$srcdir"/luxrender-luxblend25-$_pkgver/src/luxrender \

Added: luxrender_path.diff
===================================================================
--- luxrender_path.diff	                        (rev 0)
+++ luxrender_path.diff	2013-11-15 10:11:28 UTC (rev 101037)
@@ -0,0 +1,19 @@
+diff -rup luxrender-luxblend25-ad6536b0dda8/src/luxrender/__init__.py luxrender-luxblend25-ad6536b0dda8.new/src/luxrender/__init__.py
+--- luxrender-luxblend25-ad6536b0dda8/src/luxrender/__init__.py	2013-11-04 22:30:25.000000000 +0100
++++ luxrender-luxblend25-ad6536b0dda8.new/src/luxrender/__init__.py	2013-11-15 11:06:42.435244653 +0100
+@@ -50,14 +50,7 @@ else:
+ 	from nodeitems_utils import NodeCategory, NodeItem, NodeItemCustom
+ 	
+ 	def find_luxrender_path():
+-		from os import getenv
+-		from extensions_framework import util as efutil
+-		return getenv(
+-			# Use the env var path, if set ...
+-			'LUXRENDER_ROOT',
+-			# .. or load the last path from CFG file
+-			efutil.find_config_value('luxrender', 'defaults', 'install_path', '')
+-		)
++		return "/usr/bin"
+ 		
+ 	class LuxRenderAddonPreferences(AddonPreferences):
+ 		# this must match the addon name