Date: Monday, February 16, 2015 @ 10:43:37
Author: stativ
Revision: 127780
archrelease: copy trunk to community-any
Added:
luxblend25/repos/community-any/PKGBUILD
(from rev 127779, luxblend25/trunk/PKGBUILD)
luxblend25/repos/community-any/luxrender.cfg
(from rev 127779, luxblend25/trunk/luxrender.cfg)
luxblend25/repos/community-any/system_config.diff
(from rev 127779, luxblend25/trunk/system_config.diff)
Deleted:
luxblend25/repos/community-any/PKGBUILD
luxblend25/repos/community-any/luxrender_path.diff
---------------------+
PKGBUILD | 74 +++++++++++++++++++++++++++-----------------------
luxrender.cfg | 3 ++
luxrender_path.diff | 19 ------------
system_config.diff | 12 ++++++++
4 files changed, 55 insertions(+), 53 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-02-16 09:43:31 UTC (rev 127779)
+++ PKGBUILD 2015-02-16 09:43:37 UTC (rev 127780)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Lukas Jirkovsky <l.jirkov...@gmail.com>
-pkgname=luxblend25
-pkgver=1.3.1
-_pkgver=ad6536b0dda8
-_blender=2.72
-pkgrel=4
-pkgdesc="A LuxRender exporter for Blender."
-arch=('any')
-url="http://www.luxrender.net/";
-license=('GPL')
-depends=('blender' 'luxrender')
-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 \
- "$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"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: luxblend25/repos/community-any/PKGBUILD (from rev 127779,
luxblend25/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-02-16 09:43:37 UTC (rev 127780)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkov...@gmail.com>
+pkgname=luxblend25
+pkgver=1.4
+_pkgver=a249c861c2f3
+_blender=2.73
+pkgrel=1
+pkgdesc="A LuxRender exporter for Blender."
+arch=('any')
+url="http://www.luxrender.net/";
+license=('GPL')
+depends=('blender' 'luxrender')
+source=(https://bitbucket.org/luxrender/luxblend25/get/$_pkgver.tar.bz2 \
+ system_config.diff luxrender.cfg)
+md5sums=('a9ca48c9d091df8dd55ba1b90d377ac2'
+ 'f42e7bc5476b144cca60bf3e6363158a'
+ 'ec6b7028e48f73650d9315d47cd14f1d')
+
+prepare() {
+ cd "$srcdir"/luxrender-luxblend25-$_pkgver
+
+ # enables loading of the configuration from a system-wide config file
+ patch -Np1 < "$srcdir/system_config.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
+
+ # install luxrender config file so the luxblend find luxrender automatically
+ install -D -m644 luxrender.cfg \
+ "$pkgdir"/usr/share/blender/$_blender/scripts/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:
Copied: luxblend25/repos/community-any/luxrender.cfg (from rev 127779,
luxblend25/trunk/luxrender.cfg)
===================================================================
--- luxrender.cfg (rev 0)
+++ luxrender.cfg 2015-02-16 09:43:37 UTC (rev 127780)
@@ -0,0 +1,3 @@
+[defaults]
+install_path = /usr/bin
+
Deleted: luxrender_path.diff
===================================================================
--- luxrender_path.diff 2015-02-16 09:43:31 UTC (rev 127779)
+++ luxrender_path.diff 2015-02-16 09:43:37 UTC (rev 127780)
@@ -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
Copied: luxblend25/repos/community-any/system_config.diff (from rev 127779,
luxblend25/trunk/system_config.diff)
===================================================================
--- system_config.diff (rev 0)
+++ system_config.diff 2015-02-16 09:43:37 UTC (rev 127780)
@@ -0,0 +1,12 @@
+diff -rup
luxrender-luxblend25-a249c861c2f3/src/luxrender/extensions_framework/util.py
luxrender-luxblend25-a249c861c2f3.new/src/luxrender/extensions_framework/util.py
+---
luxrender-luxblend25-a249c861c2f3/src/luxrender/extensions_framework/util.py
2015-01-27 20:48:23.000000000 +0100
++++
luxrender-luxblend25-a249c861c2f3.new/src/luxrender/extensions_framework/util.py
2015-02-16 10:35:51.456810705 +0100
+@@ -99,7 +99,7 @@ def find_config_value(module, section, k
+ fc = []
+
+ for p in config_paths:
+- if os.path.exists(p) and os.path.isdir(p) and os.access(p, os.W_OK):
++ if os.path.exists(p) and os.path.isdir(p):
+ fc.append('/'.join([p, '%s.cfg' % module]))
+
+ if len(fc) < 1:
