Update to version 2.3.15-pre4; git was removed from makedepends

2 files changed, 44 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f6276891a3..793064615fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = openfx-arena
 	pkgdesc = Extra OpenFX plugins for Natron
-	pkgver = 2.3.14
-	pkgrel = 4
+	pkgver = 2.3.15_pre4
+	pkgrel = 1
 	url = https://github.com/NatronGitHub/openfx-arena
 	arch = i686
+	arch = pentium4
 	arch = x86_64
 	license = GPL
-	makedepends = git
 	depends = libcdr
 	depends = libgl
 	depends = libmagick
@@ -16,12 +16,12 @@ pkgbase = openfx-arena
 	depends = ocl-icd
 	depends = opencolorio
 	depends = poppler-glib
-	source = openfx-arena::git+https://github.com/NatronGitHub/openfx-arena#tag=Natron-2.3.14
-	source = git+https://github.com/NatronGitHub/openfx
-	source = git+https://github.com/NatronGitHub/openfx-supportext
-	source = git+https://github.com/NatronGitHub/openfx-io
-	source = git+https://github.com/NatronGitHub/SequenceParsing
-	source = git+https://github.com/NatronGitHub/tinydir
+	source = openfx-arena_ec03d74.tar.gz::https://github.com/NatronGitHub/openfx-arena/tarball/ec03d74
+	source = openfx_c70de42.tar.gz::https://github.com/NatronGitHub/openfx/tarball/c70de42
+	source = openfx-supportext_9fa7ca1.tar.gz::https://github.com/NatronGitHub/openfx-supportext/tarball/9fa7ca1
+	source = openfx-io_a36e8a2.tar.gz::https://github.com/NatronGitHub/openfx-io/tarball/a36e8a2
+	source = SequenceParsing_6441ec7.tar.gz::https://github.com/NatronGitHub/SequenceParsing/tarball/6441ec7
+	source = tinydir_3aae922.tar.gz::https://github.com/NatronGitHub/tinydir/tarball/3aae922
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index fee696f176e..efbf803347b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,28 @@
 # Contributor: Hugo Courtial <hugo [at] courtial [not colon] me>
 # Contributor: Luca Weiss <luca (at) z3ntu (dot) xyz>
 
+_openfx_arena_commit=ec03d74
+_openfx_commit=c70de42
+_openfx_io_commit=a36e8a2
+_openfx_supportext_commit=9fa7ca1
+_SequenceParsing_commit=6441ec7
+_tinydir_commit=3aae922
+
 pkgname=openfx-arena
-pkgver=2.3.14
-pkgrel=4
-arch=("i686" "x86_64")
+pkgver=2.3.15_pre4
+pkgrel=1
+arch=("i686" "pentium4" "x86_64")
 pkgdesc="Extra OpenFX plugins for Natron"
 url="https://github.com/NatronGitHub/openfx-arena"
 license=("GPL")
-makedepends=("git")
 depends=('libcdr' 'libgl' 'libmagick' 'librsvg' 'libxt' 'libzip' \
-	 'ocl-icd' 'opencolorio' 'poppler-glib')
-source=("$pkgname::git+https://github.com/NatronGitHub/openfx-arena#tag=Natron-$pkgver"
-        "git+https://github.com/NatronGitHub/openfx"
-        "git+https://github.com/NatronGitHub/openfx-supportext"
-        "git+https://github.com/NatronGitHub/openfx-io"
-        "git+https://github.com/NatronGitHub/SequenceParsing"
-        "git+https://github.com/NatronGitHub/tinydir")
+         'ocl-icd' 'opencolorio' 'poppler-glib')
+source=("openfx-arena_$_openfx_arena_commit.tar.gz::https://github.com/NatronGitHub/openfx-arena/tarball/$_openfx_arena_commit"
+        "openfx_$_openfx_commit.tar.gz::https://github.com/NatronGitHub/openfx/tarball/$_openfx_commit"
+        "openfx-supportext_$_openfx_supportext_commit.tar.gz::https://github.com/NatronGitHub/openfx-supportext/tarball/$_openfx_supportext_commit"
+        "openfx-io_$_openfx_io_commit.tar.gz::https://github.com/NatronGitHub/openfx-io/tarball/$_openfx_io_commit"
+        "SequenceParsing_$_SequenceParsing_commit.tar.gz::https://github.com/NatronGitHub/SequenceParsing/tarball/$_SequenceParsing_commit"
+        "tinydir_$_tinydir_commit.tar.gz::https://github.com/NatronGitHub/tinydir/tarball/$_tinydir_commit")
 md5sums=('SKIP'
          'SKIP'
          'SKIP'
@@ -25,37 +31,38 @@ md5sums=('SKIP'
          'SKIP'
          'SKIP')
 
+_pkgname="NatronGitHub-$pkgname-$_openfx_arena_commit"
+
 # Check the ImageMagick version
 _IM_VERSION=$(echo `identify -version` | tr -dc '0-9' | cut -c 1)
 
 prepare() {
-  cd "$srcdir/$pkgname"
-  git config submodule.OpenFX.url $srcdir/openfx
-  git config submodule.OpenFX-IO.url $srcdir/openfx-io
-  git config submodule.SupportExt.url $srcdir/openfx-supportext
-  git submodule update
-
-  cd OpenFX-IO
-  git config submodule.openfx.url $srcdir/openfx
-  git config submodule.SupportExt.url $srcdir/openfx-supportext
-  git config submodule.IOSupport/SequenceParsing.url $srcdir/SequenceParsing
-  git submodule update
+  tar -xzf "$srcdir/openfx_$_openfx_commit.tar.gz" --strip 1 \
+      -C   "$srcdir/$_pkgname/OpenFX/"
+  tar -xzf "$srcdir/openfx-io_$_openfx_io_commit.tar.gz" --strip 1 \
+      -C   "$srcdir/$_pkgname/OpenFX-IO/"
+  tar -xzf "$srcdir/openfx-supportext_$_openfx_supportext_commit.tar.gz" --strip 1 \
+      -C   "$srcdir/$_pkgname/SupportExt/"
 
-  cd IOSupport/SequenceParsing
-  git config submodule.tinydir.url $srcdir/tinydir
-  git submodule update
+  tar -xzf "$srcdir/openfx_$_openfx_commit.tar.gz" --strip 1 \
+      -C   "$srcdir/$_pkgname/OpenFX-IO/openfx/"
+  tar -xzf "$srcdir/openfx-supportext_$_openfx_supportext_commit.tar.gz" --strip 1 \
+      -C   "$srcdir/$_pkgname/OpenFX-IO/SupportExt/"
 
-  patch $srcdir/$pkgname/Makefile.master $srcdir/../im7.patch
+  tar -xzf "$srcdir/SequenceParsing_$_SequenceParsing_commit.tar.gz" --strip 1 \
+      -C   "$srcdir/$_pkgname/OpenFX-IO/IOSupport/SequenceParsing/"
+  tar -xzf "$srcdir/tinydir_$_tinydir_commit.tar.gz" --strip 1 \
+      -C   "$srcdir/$_pkgname/OpenFX-IO/IOSupport/SequenceParsing/tinydir/"
 }
 
 build() {
-  cd "$srcdir/$pkgname"
+  cd "$srcdir/$_pkgname"
   make CONFIG=release \
        IM=$_IM_VERSION
 }
 
 package() {
-  cd "$srcdir/$pkgname"
+  cd "$srcdir/$_pkgname"
   mkdir -p "$pkgdir/usr/OFX/Plugins"
   make install PLUGINPATH=$pkgdir/usr/OFX/Plugins \
                CONFIG=release \