Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre/abslibre

3 files changed, 20 insertions, 8 deletions

diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index 70aab0884..f564e70c8 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -15,7 +15,7 @@ if [[ ${_pkgver/*./} == 0 ]]; then
 else
   pkgver=$_pkgver.v$_bldver
 fi
-pkgrel=2
+pkgrel=3
 pkgdesc="$_srcname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname package)"
 arch=('any')
 url="http://www.$_pkgname.net/"
@@ -28,14 +28,18 @@ if [[ ${_pkgver/*./} == 0 ]]; then
 else
   source=("http://src.$_pkgname.net/$_srcname/get/v${_pkgver/.*/}${_pkgverM#*.}${_pkgver/*./}.tar.bz2")
 fi
-source+=('http://www.gnu.org/licenses/gpl-2.0.txt')
+source+=('system_config.diff' "$_pkgname.cfg"
+         'http://www.gnu.org/licenses/gpl-2.0.txt')
 sha512sums=('6d59b739d19beb08e2b46c6628354296c7c3a0cf3318c2925eb9891ce909a97829448a211a9fc8ffb696917fa2d85eb6b11318e4b8a08fff2f49f609fa38d525'
+            'd34aeff49c1ca5406b5a3176efc2b31a319109dcb193248aec792f8b12755b6e76fb864394d0d459408135c67033e06d365a516171f56b4f874a7ee0c576fbc3'
+            '9d27216c8fe2457a36e6d23537cb46a6d1eb2981c2413980aa0a06c4017fc6eee9fa008266457f13d4119d77607b5d07c238c2e794e24b1c00f9da4577dcc4c5'
             'aee80b1f9f7f4a8a00dcf6e6ce6c41988dcaedc4de19d9d04460cbfb05d99829ffe8f9d038468eabbfba4d65b38e8dbef5ecf5eb8a1b891d9839cda6c48ee957')
 
 prepare() {
-  sed -i "\|def find_"$_pkgname"_path[(][)]|,+9 d
-          s|find_"$_pkgname"_path[(][)]|'/usr/bin'|
-         " $srcdir/$_pkgname-$_srcname-$_srcver/src/$_pkgname/__init__.py
+  cd "$srcdir"/$_pkgname-$_srcname-$_srcver
+
+  # enables loading of the configuration from a system-wide config file
+  patch -Np1 < "$srcdir/system_config.diff" || true
 }
 
 package() {
@@ -45,11 +49,17 @@ package() {
   b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
   c=$pkgdir/usr/share/licenses/$pkgname
 
+  # install luxblend25 addon
   install -vd $b && cp -va $a $b
+  # install luxblend25 license file
   install -vd $c && install -vm644 $startdir/gpl-2.0.txt $c/GPL-v2.0
 
-  # change the search path in exporter so it finds pylux in its new location
-  sed -i 's|from.*import pylux|import pylux|' $b/$_pkgname/outputs/pure_api.py
+  # install luxrender config file so the luxblend find luxrender automatically
+  install -Dm644 $_pkgname.cfg $b/../$_pkgname.cfg
+
+  # change the search path for pylux* so the pylux* can be found in its new location
+  find "$b/$_pkgname" -name "*.py" \
+    -exec sed -i 's|from.*import pylux|import pylux|' '{}' ';'
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/blender-addon-luxrender/luxrender.cfg b/libre/blender-addon-luxrender/luxrender.cfg
new file mode 100644
index 000000000..8684ba391
--- /dev/null
+++ b/libre/blender-addon-luxrender/luxrender.cfg
@@ -0,0 +1,2 @@
+[defaults]
+install_path = /usr/bin
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index 940a34f3b..925292f40 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -29,7 +29,7 @@ _pkgver=2.73a
 _depver=${_pkgver%[a-z]}
 [[ $_git == no  ]] && pkgver=$_pkgver
 [[ $_git == yes ]] && pkgver=$_pkgver.git1.$_gitcommit
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 epoch=16
 _jpgver=1.5
 _llvmver=3.5