From 5281e4b89dbde5ee96c21c1e45ec708d1af937a8 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Tue, 31 May 2016 13:37:46 -0300 Subject: libre/blender-addon-luxrender: update pkg --- libre/blender-addon-luxrender/PKGBUILD | 17 +- libre/blender-addon-luxrender/pyluxcore_path.diff | 187 ++++++++++++++++++++++ 2 files changed, 198 insertions(+), 6 deletions(-) create mode 100644 libre/blender-addon-luxrender/pyluxcore_path.diff diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index 3d36463fb..f7179bc27 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -1,13 +1,13 @@ # Maintainer: Márcio Silva _pkgname=luxrender -_pkgver=1.5.1 +_pkgver=1.6.0 _pkgverM=${_pkgver%.*} _bldname=blender _bldver=2.77 _bldep=17 _srcname=${_pkgname::3}${_bldname::5}25 -_srcver=63e44ef60fb4 +_srcver=885740dce55a pkgname=$_bldname-addon-$_pkgname if [[ ${_pkgver/*./} == 0 ]]; then @@ -19,7 +19,7 @@ else fi pkgrel=1 pkgdesc="$_srcname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname package)" -arch=('any') +arch=('x86_64') url="http://www.$_pkgname.net/" license=('GPL2') conflicts=("$_srcname") @@ -29,10 +29,11 @@ if [[ ${_pkgver/*./} == 0 ]]; then else source=("$pkgname-$pkgver.tar.bz2::https://bitbucket.org/$_pkgname/$_srcname/get/v${_pkgver/.*/}${_pkgverM#*.}${_pkgver/*./}.tar.bz2") fi -source+=('system_config.diff' "$_pkgname.cfg" +source+=('system_config.diff' 'pyluxcore_path.diff' "$_pkgname.cfg" 'http://www.gnu.org/licenses/gpl-2.0.txt') -sha512sums=('5d78c880a37418fada0b45c875e14aaf0114f5e9e41ae7900a4acb527d7c12e67a5afbc55d825c8b8244e5de6beb5d15ddb9bb5717a235c824d1f0f5b5c65f0c' +sha512sums=('b56bb8c14bb7cf03f7c0d2d13002acb42635cbe39acba192379cf1d1a9be650d505fb11417f205e149114e94e52eca05efe3d4ebc37cfbec32b113880f38309b' 'd34aeff49c1ca5406b5a3176efc2b31a319109dcb193248aec792f8b12755b6e76fb864394d0d459408135c67033e06d365a516171f56b4f874a7ee0c576fbc3' + '56a10bc8ea27db1acaf866f8f79b969aeaa014e91511751b6cd3897cf52f275d0f9e2605be4dc3fa7b74c5f1d02aa2a8a85cbcc15d728ef335116435ba43eeef' '9d27216c8fe2457a36e6d23537cb46a6d1eb2981c2413980aa0a06c4017fc6eee9fa008266457f13d4119d77607b5d07c238c2e794e24b1c00f9da4577dcc4c5' 'aee80b1f9f7f4a8a00dcf6e6ce6c41988dcaedc4de19d9d04460cbfb05d99829ffe8f9d038468eabbfba4d65b38e8dbef5ecf5eb8a1b891d9839cda6c48ee957') @@ -40,7 +41,11 @@ prepare() { cd "$srcdir"/$_pkgname-$_srcname-$_srcver # enables loading of the configuration from a system-wide config file - patch -Np1 < "$srcdir/system_config.diff" || true + patch -Np1 < "$srcdir/system_config.diff" + # 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|' '{}' ';' + patch -Np1 < "$srcdir/pyluxcore_path.diff" } package() { diff --git a/libre/blender-addon-luxrender/pyluxcore_path.diff b/libre/blender-addon-luxrender/pyluxcore_path.diff new file mode 100644 index 000000000..221553eab --- /dev/null +++ b/libre/blender-addon-luxrender/pyluxcore_path.diff @@ -0,0 +1,187 @@ +diff --git a/src/luxrender/core/__init__.py b/src/luxrender/core/__init__.py +--- a/src/luxrender/core/__init__.py ++++ b/src/luxrender/core/__init__.py +@@ -1212,7 +1212,7 @@ + """ + Convert AOVs to Blender images + """ +- from ..outputs.luxcore_api import pyluxcore ++ import pyluxcore + + # Structure: {channelType: [pyluxcoreType, is HDR, arrayDepth, optional matching Blender pass]} + attributes = { +@@ -1459,7 +1459,7 @@ + LuxLog('ERROR: LuxCore rendering requires pyluxcore') + self.report({'ERROR'}, 'LuxCore rendering requires pyluxcore') + return +- from ..outputs.luxcore_api import pyluxcore ++ import pyluxcore + + try: + scene.luxcore_rendering_controls.pause_render = False +@@ -1841,7 +1841,7 @@ + if not PYLUXCORE_AVAILABLE: + LuxLog('ERROR: LuxCore preview rendering requires pyluxcore') + return +- from ..outputs.luxcore_api import pyluxcore ++ import pyluxcore + from ..export.luxcore.materialpreview import MaterialPreviewExporter + + try: +diff --git a/src/luxrender/export/luxcore/__init__.py b/src/luxrender/export/luxcore/__init__.py +--- a/src/luxrender/export/luxcore/__init__.py ++++ b/src/luxrender/export/luxcore/__init__.py +@@ -28,7 +28,7 @@ + import bpy, time, os + + from ...outputs import LuxManager, LuxLog +-from ...outputs.luxcore_api import pyluxcore ++import pyluxcore + from ...outputs.luxcore_api import ToValidLuxCoreName + + from ...extensions_framework import util as efutil +diff --git a/src/luxrender/export/luxcore/camera.py b/src/luxrender/export/luxcore/camera.py +--- a/src/luxrender/export/luxcore/camera.py ++++ b/src/luxrender/export/luxcore/camera.py +@@ -28,7 +28,8 @@ + import bpy, math, mathutils + from mathutils import Vector + +-from ...outputs.luxcore_api import pyluxcore, set_prop_cam ++import pyluxcore ++from ...outputs.luxcore_api import set_prop_cam + from ...export import get_worldscale + from ...export import object_anim_matrices + from ...export import fix_matrix_order +diff --git a/src/luxrender/export/luxcore/config.py b/src/luxrender/export/luxcore/config.py +--- a/src/luxrender/export/luxcore/config.py ++++ b/src/luxrender/export/luxcore/config.py +@@ -27,7 +27,7 @@ + + import os + +-from ...outputs.luxcore_api import pyluxcore ++import pyluxcore + from ...extensions_framework import util as efutil + from ...export import get_output_filename + from .utils import is_lightgroup_opencl_compatible +diff --git a/src/luxrender/export/luxcore/duplis.py b/src/luxrender/export/luxcore/duplis.py +--- a/src/luxrender/export/luxcore/duplis.py ++++ b/src/luxrender/export/luxcore/duplis.py +@@ -26,7 +26,7 @@ + # + + import math, mathutils, time +-from ...outputs.luxcore_api import pyluxcore ++import pyluxcore + from ...outputs.luxcore_api import ToValidLuxCoreName + from ...export import matrix_to_list, is_obj_visible + +diff --git a/src/luxrender/export/luxcore/lights.py b/src/luxrender/export/luxcore/lights.py +--- a/src/luxrender/export/luxcore/lights.py ++++ b/src/luxrender/export/luxcore/lights.py +@@ -27,7 +27,7 @@ + + import bpy, mathutils, math, os + +-from ...outputs.luxcore_api import pyluxcore ++import pyluxcore + from ...outputs.luxcore_api import ToValidLuxCoreName + from ...export import is_obj_visible + from ...export import get_worldscale +diff --git a/src/luxrender/export/luxcore/materialpreview.py b/src/luxrender/export/luxcore/materialpreview.py +--- a/src/luxrender/export/luxcore/materialpreview.py ++++ b/src/luxrender/export/luxcore/materialpreview.py +@@ -27,7 +27,7 @@ + + from mathutils import Matrix + +-from ...outputs.luxcore_api import pyluxcore ++import pyluxcore + from ...export import matrix_to_list + + from . import LuxCoreExporter +diff --git a/src/luxrender/export/luxcore/materials.py b/src/luxrender/export/luxcore/materials.py +--- a/src/luxrender/export/luxcore/materials.py ++++ b/src/luxrender/export/luxcore/materials.py +@@ -27,7 +27,7 @@ + + import bpy + +-from ...outputs.luxcore_api import pyluxcore ++import pyluxcore + from ...outputs.luxcore_api import ToValidLuxCoreName + from ...export.materials import get_texture_from_scene + from ...export import get_expanded_file_name +diff --git a/src/luxrender/export/luxcore/meshes.py b/src/luxrender/export/luxcore/meshes.py +--- a/src/luxrender/export/luxcore/meshes.py ++++ b/src/luxrender/export/luxcore/meshes.py +@@ -29,7 +29,7 @@ + + import bpy + +-from ...outputs.luxcore_api import pyluxcore ++import pyluxcore + from ...outputs.luxcore_api import ToValidLuxCoreName + + +diff --git a/src/luxrender/export/luxcore/objects.py b/src/luxrender/export/luxcore/objects.py +--- a/src/luxrender/export/luxcore/objects.py ++++ b/src/luxrender/export/luxcore/objects.py +@@ -28,7 +28,7 @@ + import os + + from ...extensions_framework import util as efutil +-from ...outputs.luxcore_api import pyluxcore ++import pyluxcore + from ...outputs.luxcore_api import ToValidLuxCoreName + from ...export import is_obj_visible + from ...export import object_anim_matrices +diff --git a/src/luxrender/export/luxcore/textures.py b/src/luxrender/export/luxcore/textures.py +--- a/src/luxrender/export/luxcore/textures.py ++++ b/src/luxrender/export/luxcore/textures.py +@@ -28,7 +28,7 @@ + import bpy, math, mathutils, os, tempfile + + from ...extensions_framework import util as efutil +-from ...outputs.luxcore_api import pyluxcore ++import pyluxcore + from ...outputs.luxcore_api import ToValidLuxCoreName + from ...export import matrix_to_list + from ...export import get_expanded_file_name +diff --git a/src/luxrender/export/luxcore/utils.py b/src/luxrender/export/luxcore/utils.py +--- a/src/luxrender/export/luxcore/utils.py ++++ b/src/luxrender/export/luxcore/utils.py +@@ -27,7 +27,7 @@ + + from math import pi + +-from ...outputs.luxcore_api import pyluxcore ++import pyluxcore + from ...outputs.luxcore_api import ToValidLuxCoreName + from ...export.materials import get_texture_from_scene + from ...export import get_worldscale +diff --git a/src/luxrender/export/luxcore/volumes.py b/src/luxrender/export/luxcore/volumes.py +--- a/src/luxrender/export/luxcore/volumes.py ++++ b/src/luxrender/export/luxcore/volumes.py +@@ -27,7 +27,7 @@ + + import math + +-from ...outputs.luxcore_api import pyluxcore ++import pyluxcore + from ...properties import find_node_in_volume + + from .utils import convert_texture_channel, generate_volume_name +diff --git a/src/luxrender/operators/__init__.py b/src/luxrender/operators/__init__.py +--- a/src/luxrender/operators/__init__.py ++++ b/src/luxrender/operators/__init__.py +@@ -279,7 +279,7 @@ + devs.remove(0) + + # Create the new list +- from ..outputs.luxcore_api import pyluxcore ++ import pyluxcore + + deviceList = pyluxcore.GetOpenCLDeviceList() + for dev in deviceList: -- cgit v1.2.3