Update to version 2.4.0

2 files changed, 28 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c46e1b36a0f..644dd7c21aab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,8 @@
 pkgbase = openfx-gmic
 	pkgdesc = OpenFX wrapper for the G'MIC framework
-	pkgver = 2.3.15
+	pkgver = 2.4.0
 	pkgrel = 1
 	url = https://github.com/NatronGitHub/openfx-gmic
-	arch = i686
-	arch = pentium4
 	arch = x86_64
 	license = custom:CeCILL-C
 	license = custom:CeCILLv2
@@ -12,8 +10,11 @@ pkgbase = openfx-gmic
 	depends = fftw
 	depends = libgl
 	depends = libpng
-	source = openfx-gmic-Natron-2.3.15.tar.xz::https://github.com/NatronGitHub/openfx-gmic/releases/download/Natron-2.3.15/openfx-gmic-Natron-2.3.15.tar.xz
-	sha512sums = 6b17753c443d1a7b66055329b9c91818eac6a96b80d23fe3d0c571ab627da333e399dde45bdb4864f5ac17f8b98b8feb43a4398e5ad8f4e2961594eccfbef6ba
+	conflicts = openfx-gmic-git
+	source = openfx-gmic-Natron-2.4.0.tar.gz::https://github.com/NatronGitHub/openfx-gmic/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
+	sha512sums = e2328cf4d0c8bb4442433b9e3c4f21cddaaaf64de88ba1c16b64dbcfd40ba4d21a25a0d6c9a0d4b4e543c5c2c116a5802799c0da5a07f5ccf585176399839c9f
+	sha512sums = 0a01ea18970a06eb58b03e16f9027a84f37e53581387a0fbd208be16e2fa71f3e0d314307934348e3a7a0c3bc699c36535fd044f18e89a937e9bfca239037096
 
 pkgname = openfx-gmic
 
diff --git a/PKGBUILD b/PKGBUILD
index 4b5d69778bc3..1022639955bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,48 @@
 # Maintainer: Tércio Martins <echo dGVyY2lvd2VuZGVsQGdtYWlsLmNvbQo= | base64 -d>
 
 pkgname=openfx-gmic
-pkgver=2.3.15
-_pkgname="${pkgname}-Natron-${pkgver}"
+pkgver=2.4.0
 pkgrel=1
-arch=('i686' 'pentium4' 'x86_64')
+arch=('x86_64')
 pkgdesc="OpenFX wrapper for the G'MIC framework"
 url="https://github.com/NatronGitHub/openfx-gmic"
 license=('custom:CeCILL-C' 'custom:CeCILLv2')
 depends=('fftw' 'libgl' 'libpng')
 makedepends=('openmp')
-source=("${_pkgname}.tar.xz::${url}/releases/download/Natron-${pkgver}/${_pkgname}.tar.xz")
-sha512sums=('6b17753c443d1a7b66055329b9c91818eac6a96b80d23fe3d0c571ab627da333e399dde45bdb4864f5ac17f8b98b8feb43a4398e5ad8f4e2961594eccfbef6ba')
+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")
+sha512sums=('e2328cf4d0c8bb4442433b9e3c4f21cddaaaf64de88ba1c16b64dbcfd40ba4d21a25a0d6c9a0d4b4e543c5c2c116a5802799c0da5a07f5ccf585176399839c9f'
+            '0a01ea18970a06eb58b03e16f9027a84f37e53581387a0fbd208be16e2fa71f3e0d314307934348e3a7a0c3bc699c36535fd044f18e89a937e9bfca239037096')
+
+prepare() {
+  tar -xzf "openfx-${_natron_ver}.tar.gz" --strip 1 \
+      -C   "${_pkgname}/openfx/"
+}
 
 build() {
-  cd "${srcdir}/${_pkgname}"
+  cd ${_pkgname}
   make CONFIG=release \
        OPENMP=1
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}"
+  cd ${_pkgname}
   install -d "${pkgdir}/usr/OFX/Plugins"
   make install PLUGINPATH="${pkgdir}/usr/OFX/Plugins" \
                CONFIG=release
 
   mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
 
-  install -Dm644 "${srcdir}/${_pkgname}/COPYING" \
+  install -Dm644 COPYING \
                  "${pkgdir}/usr/share/licenses/${pkgname}/"
-  install -Dm644 "${srcdir}/${_pkgname}/Licence_CeCILL-C_V1-en.txt" \
+  install -Dm644 Licence_CeCILL-C_V1-en.txt \
                  "${pkgdir}/usr/share/licenses/${pkgname}/"
-  install -Dm644 "${srcdir}/${_pkgname}/Licence_CeCILL_V2-en.txt" \
+  install -Dm644 Licence_CeCILL_V2-en.txt \
                  "${pkgdir}/usr/share/licenses/${pkgname}/"
 }