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

[Lukas Jirkovsky]

    Date: Sunday, February 15, 2015 @ 22:17:50
  Author: stativ
Revision: 127762

luxblend25: prepare for 1.4 update.

Added:
  luxblend25/trunk/luxrender.cfg
Modified:
  luxblend25/trunk/PKGBUILD
Deleted:
  luxblend25/trunk/luxrender_path.diff

---------------------+
 PKGBUILD            |   32 +++++++++++++++-----------------
 luxrender.cfg       |    3 +++
 luxrender_path.diff |   19 -------------------
 3 files changed, 18 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-15 20:37:01 UTC (rev 127761)
+++ PKGBUILD	2015-02-15 21:17:50 UTC (rev 127762)
@@ -1,10 +1,10 @@
 # $Id$
 # Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
 pkgname=luxblend25
-pkgver=1.3.1
-_pkgver=ad6536b0dda8
-_blender=2.72
-pkgrel=4
+pkgver=1.4
+_pkgver=a249c861c2f3
+_blender=2.73
+pkgrel=1
 pkgdesc="A LuxRender exporter for Blender."
 arch=('any')
 url="http://www.luxrender.net/"
@@ -11,24 +11,22 @@
 license=('GPL')
 depends=('blender' 'luxrender')
 source=(https://bitbucket.org/luxrender/luxblend25/get/$_pkgver.tar.bz2 \
-        luxrender_path.diff)
-md5sums=('389991810953df26f1d849db1c65a129'
-         'cea2a59336c28b84258e795f66301918')
+        luxrender.cfg)
+md5sums=('a9ca48c9d091df8dd55ba1b90d377ac2'
+         'ec6b7028e48f73650d9315d47cd14f1d')
 
-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 \
     "$pkgdir"/usr/share/blender/$_blender/scripts/addons
-  # change the search path in exporter so it finds pylux in its new location
-  sed -i 's|from.*import pylux|import pylux|' "$pkgdir/usr/share/blender/$_blender/scripts/addons/luxrender/outputs/pure_api.py"
+
+  # install luxrender config file so the luxblend find luxrender automatically
+  install -D -m644 luxrender.cfg \
+    "$pkgdir"/usr/share/blender/$_blender/config/luxrender.cfg
+
+  # change the search path for pylux* so the pylux* can be found in its new location
+  find "$pkgdir/usr/share/blender/$_blender/scripts/addons/luxrender" -name "*.py" \
+    -exec sed -i 's|from.*import pylux|import pylux|' '{}' ';'
 }
 
 # vim:set ts=2 sw=2 et:

Added: luxrender.cfg
===================================================================
--- luxrender.cfg	                        (rev 0)
+++ luxrender.cfg	2015-02-15 21:17:50 UTC (rev 127762)
@@ -0,0 +1,3 @@
+[defaults]
+install_path = /usr/bin
+

Deleted: luxrender_path.diff
===================================================================
--- luxrender_path.diff	2015-02-15 20:37:01 UTC (rev 127761)
+++ luxrender_path.diff	2015-02-15 21:17:50 UTC (rev 127762)
@@ -1,19 +0,0 @@
-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