summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-06-30 08:24:49 +0200
committerbartus2020-06-30 08:24:49 +0200
commitddf955c23e8932f69c53de277aa13e7b59d5187d (patch)
treeb21e868005a07499cb3ba0f6275257b3c05f4c5b
parentd1b3531968820379ac4a43034e4f8233dcc2e59e (diff)
downloadaur-ddf955c23e8932f69c53de277aa13e7b59d5187d.tar.gz
Update denoiser.patch
* drop execution bit check in __init__.py * rename binary to `oidnDenoise`
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--denoise.patch37
3 files changed, 35 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 60e1f66a6e9..1ff056c6435 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = blender-plugin-luxcorerender-git
pkgdesc = LuxCoreRender exporter plugin for Blender
- pkgver = 2.4.beta1.r0.gd37c660
+ pkgver = 2.4.beta1.r1.g504867b
pkgrel = 1
url = https://luxcorerender.org/
arch = any
@@ -11,7 +11,7 @@ pkgbase = blender-plugin-luxcorerender-git
source = luxcorerender::git+https://github.com/LuxCoreRender/BlendLuxCore.git
source = denoise.patch
sha256sums = SKIP
- sha256sums = 63103ec3bf77c502a54f6f74cad020a448c9641be90202944c46bda0a1ff8bfe
+ sha256sums = 5f73821fc8c38c0bfe9f09d5b3e5ed4c7263c3b92b03526ce0746cd34bc9e5ce
pkgname = blender-plugin-luxcorerender-git
depends = blender>=2.80
diff --git a/PKGBUILD b/PKGBUILD
index 2ab0703dd45..953055583f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
_name="luxcorerender"
pkgname=blender-plugin-${_name}-git
-pkgver=2.4.beta1.r0.gd37c660
+pkgver=2.4.beta1.r1.g504867b
pkgrel=1
pkgdesc="LuxCoreRender exporter plugin for Blender"
arch=('any')
@@ -17,7 +17,7 @@ provides=(blender-plugin-luxcorerender)
source=("${_name}::git+https://github.com/LuxCoreRender/BlendLuxCore.git${_fragment}"
"denoise.patch")
sha256sums=('SKIP'
- '63103ec3bf77c502a54f6f74cad020a448c9641be90202944c46bda0a1ff8bfe')
+ '5f73821fc8c38c0bfe9f09d5b3e5ed4c7263c3b92b03526ce0746cd34bc9e5ce')
prepare() {
git -C "${_name}" apply -v "${srcdir}/denoise.patch"
diff --git a/denoise.patch b/denoise.patch
index 4c74a4a1690..53dcf0c4f82 100644
--- a/denoise.patch
+++ b/denoise.patch
@@ -1,7 +1,32 @@
-diff -Naur BlendLuxCore-blendluxcore_v2.2/draw/viewport.py BlendLuxCore-blendluxcore_v2.2-patch/draw/viewport.py
---- BlendLuxCore-blendluxcore_v2.2/draw/viewport.py 2019-09-30 12:40:01.000000000 +0200
-+++ BlendLuxCore-blendluxcore_v2.2-patch/draw/viewport.py 2019-11-28 08:19:28.433741235 +0100
-@@ -8,6 +8,7 @@
+diff --git a/__init__.py b/__init__.py
+index 1570b8a..7f0a2a1 100644
+--- a/__init__.py
++++ b/__init__.py
+@@ -2,6 +2,7 @@ import bpy
+ import addon_utils
+ import platform
+ import os
++from shutil import which
+
+
+ _, luxblend_is_enabled = addon_utils.check("luxrender")
+@@ -43,10 +44,7 @@ if platform.system() in {"Linux", "Darwin"}:
+
+ # Make sure denoiser is executable
+ current_dir = os.path.dirname(os.path.realpath(__file__))
+- denoiser_path = os.path.join(current_dir, "bin", "denoise")
+- if not os.access(denoiser_path, os.X_OK):
+- print("Making LuxCore denoiser executable")
+- os.chmod(denoiser_path, 0o755)
++ denoiser_path = which('oidnDenoise')
+
+ try:
+ from .bin import pyluxcore
+diff --git a/draw/viewport.py b/draw/viewport.py
+index a28cf9f..f7fd34c 100644
+--- a/draw/viewport.py
++++ b/draw/viewport.py
+@@ -8,6 +8,7 @@ import tempfile
from ..bin import pyluxcore
from .. import utils
from ..utils import pfm
@@ -9,13 +34,13 @@ diff -Naur BlendLuxCore-blendluxcore_v2.2/draw/viewport.py BlendLuxCore-blendlux
NULL = 0
-@@ -72,8 +73,7 @@
+@@ -72,8 +73,7 @@ class FrameBuffer(object):
self._albedo_file_path = self._make_denoiser_filepath("albedo")
self._normal_file_path = self._make_denoiser_filepath("normal")
self._denoised_file_path = self._make_denoiser_filepath("denoised")
- current_dir = os.path.dirname(os.path.realpath(__file__))
- self._denoiser_path = os.path.join(os.path.dirname(current_dir), "bin", "denoise")
-+ self._denoiser_path = which('denoise')
++ self._denoiser_path = which('oidnDenoise')
if platform.system() == "Windows":
self._denoiser_path += ".exe"
self._denoiser_process = None