Update to v1.14.1

With some enhancement, including:
1) Compile ffmpeg from source
   To keep it the same with extra/gst-libav

2) Restrict dependency for lib32-gst-plugins-base-libs
   So extra/lib32-fst-plugins-base-libs update won't break this package.
   (Although will break your update)

3) Try my best to merge the PKGBUILD with extra/gst-libav

Signed-off-by: Adam <adam900710@gmail.com>

3 files changed, 42 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4bd657010c43..e2487b0c69d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
 pkgbase = lib32-gst-libav
-	pkgdesc = Gstreamer libav Plugin (32-bit)
-	pkgver = 1.12.1
-	pkgrel = 2
-	url = http://gstreamer.freedesktop.org/
+	pkgdesc = GStreamer Multimedia Framework ffmpeg Plugin (32-bit)
+	pkgver = 1.14.1
+	pkgrel = 1
+	url = https://gstreamer.freedesktop.org/
 	arch = x86_64
 	license = GPL
 	makedepends = python
 	makedepends = autoconf-archive
 	makedepends = git
 	makedepends = valgrind-multilib
-	depends = lib32-gst-plugins-base-libs
+	makedepends = yasm
+	depends = lib32-gst-plugins-base-libs=1.14.1
 	depends = bzip2
-	depends = lib32-ffmpeg
-	depends = gst-libav
-	provides = lib32-gst-ffmpeg=1.12.1-2
-	options = !emptydirs
-	source = git+https://anongit.freedesktop.org/git/gstreamer/gst-libav#commit=717fc7c3bde7d2f6da41ff8299fd4564d802065c
+	provides = lib32-gst-ffmpeg=1.14.1-1
+	source = git+https://anongit.freedesktop.org/git/gstreamer/gst-libav#commit=4c3e87fec718c64282f35ab58492771a77147da6
 	source = gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common
-	source = git://source.ffmpeg.org/ffmpeg
+	source = git+https://git.videolan.org/git/ffmpeg
+	source = git://git.libav.org/gas-preprocessor
+	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..89029ea31ec2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+ffmpeg/
+gas-preprocessor/
+gst-common/
+gst-libav/
+*.pkg.tar
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index a29ab360de83..51fada8897d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,22 @@
 
 _basename=gst-libav
 pkgname="lib32-$_basename"
-pkgver=1.12.1
-pkgrel=2
-pkgdesc="Gstreamer libav Plugin (32-bit)"
-arch=('x86_64')
-license=('GPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('lib32-gst-plugins-base-libs' 'bzip2' 'lib32-ffmpeg' 'gst-libav')
-makedepends=('python' 'autoconf-archive' 'git' 'valgrind-multilib')
-options=(!emptydirs)
+pkgver=1.14.1
+pkgrel=1
+pkgdesc="GStreamer Multimedia Framework ffmpeg Plugin (32-bit)"
+url="https://gstreamer.freedesktop.org/"
+arch=(x86_64)
+license=(GPL)
+depends=('lib32-gst-plugins-base-libs=1.14.1' 'bzip2')
+makedepends=(python autoconf-archive git valgrind-multilib yasm)
 provides=("lib32-gst-ffmpeg=$pkgver-$pkgrel")
-_commit=717fc7c3bde7d2f6da41ff8299fd4564d802065c  # tags/1.12.1^0
+_commit=4c3e87fec718c64282f35ab58492771a77147da6	# tags/1.14.1
 source=("git+https://anongit.freedesktop.org/git/gstreamer/gst-libav#commit=$_commit"
         "gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common"
-        "git://source.ffmpeg.org/ffmpeg")
+        "git+https://git.videolan.org/git/ffmpeg" "git://git.libav.org/gas-preprocessor")
 sha256sums=('SKIP'
             'SKIP'
+            'SKIP'
             'SKIP')
 
 pkgver() {
@@ -31,6 +31,7 @@ prepare() {
   git submodule init
   git config --local submodule.common.url "$srcdir/gst-common"
   git config --local submodule.gst-libs/ext/libav.url "$srcdir/ffmpeg"
+  git config --local submodule.gst-libs/ext/gas-preprocessor.url "$srcdir/gas-preprocessor"
   git submodule update
 
   NOCONFIGURE=1 ./autogen.sh
@@ -43,12 +44,20 @@ build() {
   export CXX='g++ -m32'
   export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib32 \
-    --build=i686-pc-linux-gnu --libdir=/usr/lib32 \
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib32 \
+    --libdir=/usr/lib32 \
+    --build=i686-pc-linux-gnu \
     --with-package-name="GStreamer libav Plugin (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/" \
-    --with-system-libav --with-libav-extra-configure="--enable-runtime-cpudetect" \
-    --enable-experimental --disable-gtk-doc --disable-static
+    --without-system-libav \
+    --with-libav-extra-configure="--enable-runtime-cpudetect" \
+    --enable-experimental \
+    --disable-gtk-doc \
+    --disable-static
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool