Update to version 2.4.0

3 files changed, 30 insertions, 149 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d84d95e0f9a..27c0ef708b9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = openfx-misc
 	pkgdesc = Miscellaneous OpenFX plugins
-	pkgver = 2.3.15
-	pkgrel = 2
+	pkgver = 2.4.0
+	pkgrel = 1
 	url = https://github.com/NatronGitHub/openfx-misc
-	arch = i686
-	arch = pentium4
 	arch = x86_64
 	license = GPL
 	makedepends = openmp
 	depends = libgl
 	optdepends = natron-plugins-git: More presets for the Shadertoy plugin
-	source = openfx-misc-Natron-2.3.15.tar.xz::https://github.com/NatronGitHub/openfx-misc/releases/download/Natron-2.3.15/openfx-misc-Natron-2.3.15.tar.xz
-	source = openfx-misc-2.3.15-DenoiseSharpen.patch
-	sha512sums = 614b12da180ceb4df2ea3a309b434d52eaa4ea6d2bf79ababb00b4b53c637b21c5b96f88ea7e74a2f05a0ef6df4ec1d32484f2c83ee390a193638379c5b868bf
-	sha512sums = e95ee15c7a7215b99d2ab57b8a2b04ff1f504df6993f195a142b4623287ab999c00a9cc767718eb64a072ac4bef16eef1b4646884e9321d3ae652669e9a823cc
+	conflicts = openfx-misc-git
+	source = openfx-misc-Natron-2.4.0.tar.gz::https://github.com/NatronGitHub/openfx-misc/archive/refs/tags/Natron-2.4.0.tar.gz
+	source = openfx-Natron-2.4.0.tar.gz::https://github.com/NatronGitHub/openfx/archive/refs/tags/Natron-2.4.0.tar.gz
+	source = openfx-supportext-bde8d6a2b119ca35e9229d8af18cda2f57114a20.tar.gz::https://github.com/NatronGitHub/openfx-supportext/archive/bde8d6a2b119ca35e9229d8af18cda2f57114a20.tar.gz
+	sha512sums = 81d87f116e18ba15c9609ac18177fe38f338433f95fe22e6e0557671ecddbf89accf4685d8fbe7106350714d22aa157ac78441f15a8dee795bcae54da4e7ab55
+	sha512sums = 0a01ea18970a06eb58b03e16f9027a84f37e53581387a0fbd208be16e2fa71f3e0d314307934348e3a7a0c3bc699c36535fd044f18e89a937e9bfca239037096
+	sha512sums = SKIP
 
 pkgname = openfx-misc
 
diff --git a/PKGBUILD b/PKGBUILD
index 9d0b3e34ad6b..20d20ccd6954 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,36 @@
 # Contributor: Hugo Courtial <hugo [at] courtial [not colon] me>
 # Contributor: Luca Weiss <luca (at) z3ntu (dot) xyz>
 
+_openfx_supportext_commit=bde8d6a2b119ca35e9229d8af18cda2f57114a20
+
 pkgname=openfx-misc
-pkgver=2.3.15
-_pkgname="${pkgname}-Natron-${pkgver}"
-pkgrel=2
-arch=('i686' 'pentium4' 'x86_64')
+pkgver=2.4.0
+pkgrel=1
+arch=('x86_64')
 pkgdesc="Miscellaneous OpenFX plugins"
 url="https://github.com/NatronGitHub/openfx-misc"
 license=('GPL')
 depends=('libgl')
 makedepends=('openmp')
 optdepends=('natron-plugins-git: More presets for the Shadertoy plugin')
-source=("${_pkgname}.tar.xz::${url}/releases/download/Natron-${pkgver}/${_pkgname}.tar.xz"
-        "openfx-misc-2.3.15-DenoiseSharpen.patch")
-sha512sums=('614b12da180ceb4df2ea3a309b434d52eaa4ea6d2bf79ababb00b4b53c637b21c5b96f88ea7e74a2f05a0ef6df4ec1d32484f2c83ee390a193638379c5b868bf'
-            'e95ee15c7a7215b99d2ab57b8a2b04ff1f504df6993f195a142b4623287ab999c00a9cc767718eb64a072ac4bef16eef1b4646884e9321d3ae652669e9a823cc')
+conflicts=("${pkgname}-git")
+
+_natron_ver="Natron-${pkgver}"
+_pkgname="${pkgname}-${_natron_ver}"
+_url=${url%/${pkgname}}
+
+source=("${_pkgname}.tar.gz::${url}/archive/refs/tags/${_natron_ver}.tar.gz"
+        "openfx-${_natron_ver}.tar.gz::${_url}/openfx/archive/refs/tags/${_natron_ver}.tar.gz"
+        "openfx-supportext-${_openfx_supportext_commit}.tar.gz::${_url}/openfx-supportext/archive/${_openfx_supportext_commit}.tar.gz")
+sha512sums=('81d87f116e18ba15c9609ac18177fe38f338433f95fe22e6e0557671ecddbf89accf4685d8fbe7106350714d22aa157ac78441f15a8dee795bcae54da4e7ab55'
+            '0a01ea18970a06eb58b03e16f9027a84f37e53581387a0fbd208be16e2fa71f3e0d314307934348e3a7a0c3bc699c36535fd044f18e89a937e9bfca239037096'
+            'SKIP')
 
 prepare() {
-    cd "${srcdir}/${_pkgname}"
-    patch --forward --strip=1 --input="${srcdir}/openfx-misc-2.3.15-DenoiseSharpen.patch"
+  tar -xzf "openfx-${_natron_ver}.tar.gz" --strip 1 \
+      -C   "${_pkgname}/openfx/"
+  tar -xzf "openfx-supportext-${_openfx_supportext_commit}.tar.gz" --strip 1 \
+      -C   "${_pkgname}/SupportExt/"
 }
 
 build() {
diff --git a/openfx-misc-2.3.15-DenoiseSharpen.patch b/openfx-misc-2.3.15-DenoiseSharpen.patch
deleted file mode 100644
index ce44f5bedd2e..000000000000
--- a/openfx-misc-2.3.15-DenoiseSharpen.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-Description: This patch fixes a bug in the DenoiseSharpen plugin that causes Natron to crash under certain conditions.
-
-<https://github.com/NatronGitHub/Natron/issues/300>
-<https://github.com/NatronGitHub/openfx-misc/commit/42fbb836da1e6573d601dc0685309e880cc594c7>
-
-diff --unified --recursive --text openfx-misc-Natron-2.3.15-orig/DenoiseSharpen/DenoiseSharpen.cpp openfx-misc-Natron-2.3.15-new/DenoiseSharpen/DenoiseSharpen.cpp
---- openfx-misc-Natron-2.3.15-orig/DenoiseSharpen/DenoiseSharpen.cpp	2020-06-07 17:29:17.000000000 -0300
-+++ openfx-misc-Natron-2.3.15-new/DenoiseSharpen/DenoiseSharpen.cpp	2020-06-23 01:29:23.146640797 -0300
-@@ -417,9 +417,18 @@
- 
- #if defined(_OPENMP)
- #define abort_test() if ( !omp_get_thread_num() && abort() ) { throwSuiteStatusException(kOfxStatFailed); }
--#define abort_test_loop() if ( abort() ) { if ( !omp_get_thread_num() ) {throwSuiteStatusException(kOfxStatFailed);} \
--                                           else { continue;} \
--}
-+// OpenMP 2.5 specs (https://www.openmp.org/wp-content/uploads/spec25.pdf):
-+// "The for-loop must be a structured block, and in addition, its execution
-+// must not be terminated by a break statement."
-+// So we must use continue instead of break.
-+// Besides, it seems like even throwing an exception from the master thread is risky,
-+// so let's wait till the loop is finished.
-+// Version that throws an exception from the master thread:
-+// #define abort_test_loop() if ( abort() ) { if ( !omp_get_thread_num() ) {throwSuiteStatusException(kOfxStatFailed);} \
-+//                                           else { continue;} \
-+// }
-+// Version that never throws an exception inside a loop:
-+#define abort_test_loop() if ( abort() ) { continue;}
- #else
- #define abort_test() if ( abort() ) { throwSuiteStatusException(kOfxStatFailed); }
- #define abort_test_loop() abort_test()
-@@ -2028,6 +2037,7 @@
-                     fimg_sat[i] = prevsq;
-                 }
-             }
-+            abort_test();
-             // IntegralCols
- #           ifdef _OPENMP
- #           pragma omp parallel for
-@@ -2041,6 +2051,7 @@
-                     fimg_sat[i] = prev;
-                 }
-             }
-+            abort_test();
-             // ApplyThresholdAdaptive
- #           ifdef _OPENMP
- #           pragma omp parallel for
-@@ -2088,9 +2099,9 @@
- #endif // ifdef kUseMultithread
-         }
-         hpass = lpass;
-+        abort_test();
-     } // for(lev)
- 
--    abort_test();
-     // add the last smoothed image to the image
- #ifdef kUseMultithread
-     {
-@@ -2139,8 +2150,8 @@
- #pragma omp parallel for
- #endif
-         for (unsigned int row = 0; row < iheight; ++row) {
--            float* temp = new float[iwidth];
-             abort_test_loop();
-+            float* temp = new float[iwidth];
-             hat_transform (temp, fimg[hpass] + row * iwidth, 1, iwidth, b3, 1 << lev);
-             for (unsigned int col = 0; col < iwidth; ++col) {
-                 unsigned int i = row * iwidth + col;
-@@ -2159,8 +2170,8 @@
- #pragma omp parallel for
- #endif
-         for (unsigned int col = 0; col < iwidth; ++col) {
--            float* temp = new float[iheight];
-             abort_test_loop();
-+            float* temp = new float[iheight];
-             hat_transform (temp, fimg[lpass] + col, iwidth, iheight, b3, 1 << lev);
-             for (unsigned int row = 0; row < iheight; ++row) {
-                 unsigned int i = row * iwidth + col;
-@@ -2559,6 +2570,8 @@
-         }
-     }
- 
-+    abort_test();
-+
-     // denoise
- 
-     if ( (nComponents != 1) && (p.process[0] || p.process[1] || p.process[2]) ) {
-@@ -2567,8 +2580,8 @@
-             if (!( (p.colorModel == eColorModelRGB) || (p.colorModel == eColorModelLinearRGB) ) || p.process[c]) {
-                 assert(fimgcolor[c]);
-                 float* fimg[4] = { fimgcolor[c], fimgtmp[0], fimgtmp[1], (p.adaptiveRadius > 0) ? fimgtmp[2] : NULL};
--                abort_test();
-                 wavelet_denoise(fimg, iwidth, iheight, p.b3, p.noiseLevel[c], p.adaptiveRadius, p.denoise_amount[c], p.sharpen_amount[c], p.sharpen_radius, p.startLevel, (float)c / nComponents, 1.f / nComponents);
-+                abort_test();
-             }
-         }
-     }
-@@ -2576,8 +2589,8 @@
-         assert(fimgalpha);
-         // process alpha
-         float* fimg[4] = { fimgalpha, fimgtmp[0], fimgtmp[1], (p.adaptiveRadius > 0) ? fimgtmp[2] : NULL };
--        abort_test();
-         wavelet_denoise(fimg, iwidth, iheight, p.b3, p.noiseLevel[3], p.adaptiveRadius, p.denoise_amount[3], p.sharpen_amount[3], p.sharpen_radius, p.startLevel, (float)(nComponents - 1) / nComponents, 1.f / nComponents);
-+        abort_test();
-     }
- 
-     // store back into the result
-@@ -3172,6 +3185,8 @@
-         }
-     }
- 
-+    abort_test();
-+
-     // set noise levels
- 
-     if (nComponents != 1) {
-@@ -3181,6 +3196,7 @@
-             float* fimg[4] = { fimgcolor[c], fimgtmp[0], fimgtmp[1], fimgtmp[2] };
-             double sigma_n[4];
-             sigma_mad(fimg, bimgmask, iwidth, iheight, b3, sigma_n, (float)c / nComponents, 1.f / nComponents);
-+            abort_test();
-             for (unsigned f = 0; f < 4; ++f) {
-                 _noiseLevel[c][f]->setValue(sigma_n[f]);
-             }
-@@ -3192,6 +3208,7 @@
-         float* fimg[4] = { fimgalpha, fimgtmp[0], fimgtmp[1], fimgtmp[2] };
-         double sigma_n[4];
-         sigma_mad(fimg, bimgmask, iwidth, iheight, b3, sigma_n, (float)(nComponents - 1) / nComponents, 1.f / nComponents);
-+        abort_test();
-         for (unsigned f = 0; f < 4; ++f) {
-             _noiseLevel[3][f]->setValue(sigma_n[f]);
-         }