Re-upload. Update to v2.3.15

4 files changed, 40 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 047277b25eec..d10481f030a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,19 @@
 pkgbase = natron-bin
-	pkgdesc = Video compositing software similar to Nuke and Adobe After Effects
-	pkgver = 2.0.5
-	pkgrel = 2
-	url = http://natron.fr/
-	arch = i686
+	pkgdesc = Node-graph video compositor
+	pkgver = 2.3.15
+	pkgrel = 1
+	url = https://natrongithub.github.io/
 	arch = x86_64
-	license = GPL
-	depends = ffmpeg
-	depends = p7zip
-	optdepends = blender: for 3d opencolor-io support
+	license = GPL2
+	provides = natron
 	conflicts = natron
-	conflicts = natron-rc
-	conflicts = natron-bin-dev
 	options = !strip
-	source = natron.desktop
-	source = x-natron.xml
-	md5sums = 5c65b106c295abe0b5346eff18a06767
-	md5sums = ca5186feb5a7f336517c015f72d0f8c8
-	source_i686 = http://downloads.natron.fr/Linux/releases/32bit/files/Natron-2.0.5-Linux-x86_32bit-portable.tar.xz
-	md5sums_i686 = 154966f2f9ffee18f90d5d11ce8f698e
-	source_x86_64 = http://downloads.natron.fr/Linux/releases/64bit/files/Natron-2.0.5-Linux-x86_64bit-portable.tar.xz
-	md5sums_x86_64 = 5df8f464d54552644243e3602dba35e5
+	source = https://github.com/NatronGitHub/Natron/releases/download/v2.3.15/Natron-2.3.15-Linux-64-no-installer.tar.xz
+	source = Natron-2.3.15.desktop::https://github.com/NatronGitHub/Natron/raw/v2.3.15/Gui/Resources/Applications/fr.natron.Natron.desktop
+	source = Natron-2.3.15.xml::https://github.com/NatronGitHub/Natron/raw/v2.3.15/Gui/Resources/Mime/x-natron.xml
+	sha256sums = 3d5dd363382dfaae52b6868ec5a2a4baa7bba1226a8c0f76201e1849d9fb8cb9
+	sha256sums = a8704ec3f23b9b3e9d32b2506a193345000d68af5bcbdbf23dd419f83042e6bc
+	sha256sums = 73d7432d43aab21aeb7d9acce35ee69ac33657a634b4ce65bf8ee0ea1cec7df4
 
 pkgname = natron-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 783858e6d77c..fda2589f0816 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,33 @@
-# Maintainer:  Marcin (CTRL) Wieczorek <marcin@marcin.co>
-# Contributor: Thomas Scheiblhuber <thomas@scheiblhuber.de>
-# Contributor: Joonas Henriksson
-# Contributor: Rutger Broekhoff
+# Maintainer: Caltlgin Stsodaat <contact@fossdaily.xyz>
 
-pkgname=natron-bin
-pkgver=2.0.5
-pkgrel=2
-arch=('i686' 'x86_64')
-pkgdesc='Video compositing software similar to Nuke and Adobe After Effects'
-url='http://natron.fr/'
-license=('GPL')
-depends=('ffmpeg' 'p7zip')
-optdepends=('blender: for 3d opencolor-io support')
-conflicts=('natron' 'natron-rc' 'natron-bin-dev')
+_pkgname='Natron'
+pkgname="${_pkgname,,}-bin"
+pkgver=2.3.15
+pkgrel=1
+pkgdesc='Node-graph video compositor'
+arch=('x86_64')
+url='https://natrongithub.github.io/'
+github_url="https://github.com/${_pkgname}GitHub/${_pkgname}"
+license=('GPL2')
 options=('!strip')
-source=("natron.desktop" "x-natron.xml")
-source_i686=("http://downloads.natron.fr/Linux/releases/32bit/files/Natron-${pkgver}-Linux-x86_32bit-portable.tar.xz")
-source_x86_64=("http://downloads.natron.fr/Linux/releases/64bit/files/Natron-${pkgver}-Linux-x86_64bit-portable.tar.xz")
-
-md5sums=('5c65b106c295abe0b5346eff18a06767'
-         'ca5186feb5a7f336517c015f72d0f8c8')
-md5sums_i686=('154966f2f9ffee18f90d5d11ce8f698e')
-md5sums_x86_64=('5df8f464d54552644243e3602dba35e5')
+provides=("${_pkgname,,}")
+conflicts=("${_pkgname,,}")
+source=("${github_url}/releases/download/v${pkgver}/${_pkgname}-${pkgver}-Linux-64-no-installer.tar.xz"
+        "${_pkgname}-${pkgver}.desktop::${github_url}/raw/v${pkgver}/Gui/Resources/Applications/fr.${_pkgname,,}.${_pkgname}.desktop"
+        "${_pkgname}-${pkgver}.xml::${github_url}/raw/v${pkgver}/Gui/Resources/Mime/x-${_pkgname,,}.xml")
+sha256sums=('3d5dd363382dfaae52b6868ec5a2a4baa7bba1226a8c0f76201e1849d9fb8cb9'
+            'a8704ec3f23b9b3e9d32b2506a193345000d68af5bcbdbf23dd419f83042e6bc'
+            '73d7432d43aab21aeb7d9acce35ee69ac33657a634b4ce65bf8ee0ea1cec7df4')
 
 package() {
-	if [ "${CARCH}" = "x86_64" ]; then
-		_source_arch="64"
-	else
-		_source_arch="32"
-	fi
-
-	install -d "${pkgdir}/usr/share"
-	cp -R "${srcdir}/Natron-${pkgver}-Linux-x86_${_source_arch}bit" "${pkgdir}/usr/share/natron"
-
-	install -d "${pkgdir}/usr/bin"
-	ln -s "/usr/share/natron/Natron" "${pkgdir}/usr/bin/natron"
-    install -D "${pkgdir}/usr/share/natron/Resources/pixmaps/natronIcon256_linux.png" "${pkgdir}/usr/share/pixmaps/natronIcon256_linux.png"
-    install -D "${pkgdir}/usr/share/natron/Resources/pixmaps/natronProjectIcon_linux.png" "${pkgdir}/usr/share/pixmaps/natronProjectIcon_linux.png"
-    install -Dm644 "${srcdir}/natron.desktop" "${pkgdir}/usr/share/applications/natron.desktop"
-    install -D "${srcdir}/x-natron.xml" "${pkgdir}/usr/share/mime/packages/x-natron.xml"
+  install -Dm644 "${_pkgname}-${pkgver}.desktop" "${pkgdir}/usr/share/applications/fr.${_pkgname,,}.${_pkgname}.desktop"
+  install -Dm644 "${_pkgname}-${pkgver}.xml" "${pkgdir}/usr/share/mime/application/x-${_pkgname,,}.xml"
+  install -d "${pkgdir}/"{"opt/${_pkgname}",'usr/bin'}
+  cd "${_pkgname}-${pkgver}-Linux-64-no-installer"
+  install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/256x256/apps" "Resources/pixmaps/${_pkgname,,}Icon256_linux.png"
+  install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/256x256/mimetypes" "Resources/pixmaps/${_pkgname,,}ProjectIcon_linux.png"
+  mv -f ./* "${pkgdir}/opt/${_pkgname}"
+  ln -s "/opt/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/natron.desktop b/natron.desktop
deleted file mode 100755
index fc756aa9d671..000000000000
--- a/natron.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Name=Natron
-MimeType=application/x-natron
-Exec=natron %U
-GenericName=Compositing software
-Comment=Node-graph based compositing software
-Icon=natronIcon256_linux
-Categories=Graphics;2DGraphics;RasterGraphics;
-
diff --git a/x-natron.xml b/x-natron.xml
deleted file mode 100644
index 2f6a2fc45726..000000000000
--- a/x-natron.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-    <mime-type type="application/x-natron">
-        <comment>Natron Project File</comment>
-        <icon name="natronProjectIcon_linux"/>
-        <glob-deleteall/>
-        <glob pattern="*.ntp"/>
-    </mime-type>
-</mime-info>