changing system

3 files changed, 22 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93d3169a9789..80484d679639 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = natron-portable
 	pkgdesc = Video compositing software similar to Nuke and Adobe After Effects, portable snapshot
-	pkgver = 2.1.5
+	pkgver = 2.1.7
 	pkgrel = 2
 	url = http://natron.fr/
-	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = ffmpeg
@@ -19,18 +18,14 @@ pkgbase = natron-portable
 	md5sums = ca5186feb5a7f336517c015f72d0f8c8
 	md5sums = 60eb9f97a0ddeab5acda48d15894559a
 	md5sums = 475e14142c51d8b545f7cbc4b5426ce2
-	source_i686 = https://bitbucket.org/juanperez89/natron/downloads/Natron-2.1.5-Linux-x86_32bit-portable.tar.xz
-	md5sums_i686 = 3c76260bfe992f8d05d45ffb9a2ab8a5
-	sha1sums_i686 = dc78bea76437dce216fc3f07b592dab038bcd937
-	sha256sums_i686 = 1ff38af24afbe55c4ef70d01d80f724ebc16c6a6a5aff6e5187493b2bfeb9d15
-	sha384sums_i686 = 43855a7bea9a80911073e738981c549cfd5c41a74186b3fb0fc04896a5c3473e1dd2baa91dd21517f94b5a0d257c15d6
-	sha512sums_i686 = 27746d158711ea0dc5b34ed1b65cce7b31695a750475c682cb64b479aaa385423d93c64c7e51dc3b902761b3a4f95e76927cec3578b8c081f419eb5c75c05c06
-	source_x86_64 = https://bitbucket.org/juanperez89/natron/downloads/Natron-2.1.5-Linux-x86_64bit-portable.tar.xz
-	md5sums_x86_64 = df3bca1c6a10d4e9aad49330841491c2
-	sha1sums_x86_64 = a4b44cc53ac49fd124f8c15ea6a320767ab127bf
-	sha256sums_x86_64 = 950c9be33d6b879f8567776b959d4196c058e3e1501f95507fb12b2782a731e4
-	sha384sums_x86_64 = a4290c470fbff74bff318299a0f130fb19c756ddd3f4a8bd55598694597ebe612438eb1ab6d7c2a47f257223d3225d2b
-	sha512sums_x86_64 = 7ba29fb83d841d2207d3aec0013a122457cffa7442ccaea5c941d3a4ce59c22e9f4062f869fec0c606b44e52dc7bfa2e115b4f729db5d72b1837d24ccd04681b
+	source_x86_64 = https://bitbucket.org/juanperez89/natron/downloads/natron-port-2.1.7-2-x86_64.pkg.tar.xz
+	source_x86_64 = natron-port-2.1.7-2-x86_64.pkg.tar.xz.sig
+	sha256sums_x86_64 = d697a3b0557cd2596a04a1ea68002cf1e0b3117939b3a0bd4c039f13aff4b859
+	sha256sums_x86_64 = SKIP
+	sha384sums_x86_64 = 46862f6a9ea43f3e32c41c9c1dd87ac18d36ec11738fc47f12532375ae9462029602b86a18d36fa565922125ef580d8d
+	sha384sums_x86_64 = SKIP
+	sha512sums_x86_64 = 1312b187e0cb7c3b39b50da5e5055a8aebc5569415b5368870909bb58a8efca188e496ad60b6073ee3d50ff3c84a7ef4fd796f6d8dd8ef160990c6fcc87e4eec
+	sha512sums_x86_64 = SKIP
 
 pkgname = natron-portable
 
diff --git a/PKGBUILD b/PKGBUILD
index 5d949bb53826..b01cf9d7d014 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor: Rutger Broekhoff
 # Contributor: gatitofeliz at protonmail dot com
 pkgname=natron-portable
-pkgver=2.1.5
+pkgver=2.1.7
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('x86_64')
 pkgdesc='Video compositing software similar to Nuke and Adobe After Effects, portable snapshot'
 url='http://natron.fr/'
 license=('GPL')
@@ -14,36 +14,19 @@ optdepends=('blender: for 3d opencolor-io support')
 conflicts=('natron')
 
 options=('!strip')
-
+myname=natron-port
 source=("natron.desktop" "x-natron.xml" "natronIcon256_linux.png" "natronProjectIcon_linux.png")
-source_i686=("https://bitbucket.org/juanperez89/natron/downloads/Natron-2.1.5-Linux-x86_32bit-portable.tar.xz")
-source_x86_64=("https://bitbucket.org/juanperez89/natron/downloads/Natron-2.1.5-Linux-x86_64bit-portable.tar.xz")
+source_x86_64=("https://bitbucket.org/juanperez89/natron/downloads/natron-port-2.1.7-2-x86_64.pkg.tar.xz"
+               "${myname}-${pkgver}-${pkgrel}-${arch}.pkg.tar.xz.sig")
 md5sums=('5c65b106c295abe0b5346eff18a06767' 'ca5186feb5a7f336517c015f72d0f8c8' '60eb9f97a0ddeab5acda48d15894559a' '475e14142c51d8b545f7cbc4b5426ce2')
-md5sums_i686=('3c76260bfe992f8d05d45ffb9a2ab8a5')
-md5sums_x86_64=('df3bca1c6a10d4e9aad49330841491c2')
-sha256sums_i686=('1ff38af24afbe55c4ef70d01d80f724ebc16c6a6a5aff6e5187493b2bfeb9d15')
-sha256sums_x86_64=('950c9be33d6b879f8567776b959d4196c058e3e1501f95507fb12b2782a731e4')
-sha384sums_i686=('43855a7bea9a80911073e738981c549cfd5c41a74186b3fb0fc04896a5c3473e1dd2baa91dd21517f94b5a0d257c15d6')
-sha384sums_x86_64=('a4290c470fbff74bff318299a0f130fb19c756ddd3f4a8bd55598694597ebe612438eb1ab6d7c2a47f257223d3225d2b')
-sha512sums_i686=('27746d158711ea0dc5b34ed1b65cce7b31695a750475c682cb64b479aaa385423d93c64c7e51dc3b902761b3a4f95e76927cec3578b8c081f419eb5c75c05c06')
-sha512sums_x86_64=('7ba29fb83d841d2207d3aec0013a122457cffa7442ccaea5c941d3a4ce59c22e9f4062f869fec0c606b44e52dc7bfa2e115b4f729db5d72b1837d24ccd04681b')
-sha1sums_i686=('dc78bea76437dce216fc3f07b592dab038bcd937')
-sha1sums_x86_64=('a4b44cc53ac49fd124f8c15ea6a320767ab127bf')
+sha256sums_x86_64=('d697a3b0557cd2596a04a1ea68002cf1e0b3117939b3a0bd4c039f13aff4b859'
+                    'SKIP')
+sha384sums_x86_64=('46862f6a9ea43f3e32c41c9c1dd87ac18d36ec11738fc47f12532375ae9462029602b86a18d36fa565922125ef580d8d'
+                    'SKIP')
+sha512sums_x86_64=('1312b187e0cb7c3b39b50da5e5055a8aebc5569415b5368870909bb58a8efca188e496ad60b6073ee3d50ff3c84a7ef4fd796f6d8dd8ef160990c6fcc87e4eec'
+                    'SKIP')
+validgpgkeys=('DB68D18158C19A535A538524507F8DFE0C99485B')
 
 package() {
-	if [ "$CARCH" = "x86_64" ]; then
-		_source_arch="x86_64bit"
-	else
-		_source_arch="x86_32bit"
-	fi
-
-	install -d "$pkgdir"/opt
-	cp -R "$srcdir"/Natron-$pkgver-Linux-$_source_arch "$pkgdir"/opt/natron
-
-	install -d "$pkgdir"/usr/bin
-	ln -s ../../opt/natron/Natron "$pkgdir"/usr/bin/natron
-        install -D "$srcdir"/natronIcon256_linux.png "$pkgdir"/usr/share/pixmaps/natronIcon256_linux.png
-        install -D "$srcdir"/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
+tar xJvf ${srcdir}/${myname}-${pkgver}-${pkgrel}-${arch}.pkg.tar.xz -C ${pkgdir}/
 }
diff --git a/natron-port-2.1.7-2-x86_64.pkg.tar.xz.sig b/natron-port-2.1.7-2-x86_64.pkg.tar.xz.sig
new file mode 100644
index 000000000000..22a9a8dc8aee
--- /dev/null
+++ b/natron-port-2.1.7-2-x86_64.pkg.tar.xz.sig