summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-07-02 07:14:28 +0200
committerbartus2020-07-02 07:16:42 +0200
commit77a7f0871cea7776cad7ca216a3d50582f3fd04e (patch)
treeda4ccab64a5514c493a04a7e9ee34028641c0f48
parent2fe1a8e2fe70ac15d0a1ffa46f99f1ae2d084735 (diff)
downloadaur-77a7f0871cea7776cad7ca216a3d50582f3fd04e.tar.gz
Drop denoise.patch [merged upstream]
https://github.com/LuxCoreRender/BlendLuxCore/pull/497 fix #3
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--denoise.patch46
3 files changed, 4 insertions, 58 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 63972a0ec89..d77b50167d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = blender-plugin-luxcorerender-git
pkgdesc = LuxCoreRender exporter plugin for Blender
- pkgver = 2.4.beta1.r2.g4532c9d
+ pkgver = 2.4.beta1.r9.g0e3aec2
pkgrel = 1
url = https://luxcorerender.org/
arch = any
@@ -12,9 +12,7 @@ pkgbase = blender-plugin-luxcorerender-git
provides = blender-plugin-luxcorerender
conflicts = blender-plugin-luxcorerender
source = luxcorerender::git+https://github.com/LuxCoreRender/BlendLuxCore.git
- source = denoise.patch
sha256sums = SKIP
- sha256sums = 5f73821fc8c38c0bfe9f09d5b3e5ed4c7263c3b92b03526ce0746cd34bc9e5ce
pkgname = blender-plugin-luxcorerender-git
depends = python-certifi
diff --git a/PKGBUILD b/PKGBUILD
index 1ab272d0f61..50559b5eb3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
_name="luxcorerender"
pkgname=blender-plugin-${_name}-git
-pkgver=2.4.beta1.r2.g4532c9d
+pkgver=2.4.beta1.r9.g0e3aec2
pkgrel=1
pkgdesc="LuxCoreRender exporter plugin for Blender"
arch=('any')
@@ -15,14 +15,8 @@ depends=(python-certifi python-requests python-numpy)
makedepends=(git)
conflicts=(blender-plugin-luxcorerender)
provides=(blender-plugin-luxcorerender)
-source=("${_name}::git+https://github.com/LuxCoreRender/BlendLuxCore.git${_fragment}"
- "denoise.patch")
-sha256sums=('SKIP'
- '5f73821fc8c38c0bfe9f09d5b3e5ed4c7263c3b92b03526ce0746cd34bc9e5ce')
-
-prepare() {
- git -C "${_name}" apply -v "${srcdir}/denoise.patch"
-}
+source=("${_name}::git+https://github.com/LuxCoreRender/BlendLuxCore.git${_fragment}")
+sha256sums=('SKIP')
pkgver() {
git -C "${_name}" describe --long --tags --match blendluxcore_v* | sed 's/^blendluxcore_v//;s/beta/.beta/;s/\([^-]*-g\)/r\1/;s/-/./g'
diff --git a/denoise.patch b/denoise.patch
deleted file mode 100644
index 53dcf0c4f82..00000000000
--- a/denoise.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
-+from shutil import which
-
- NULL = 0
-
-@@ -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('oidnDenoise')
- if platform.system() == "Windows":
- self._denoiser_path += ".exe"
- self._denoiser_process = None