version bump

2 files changed, 39 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7b989b67f46..26c606567a08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,26 @@
 pkgbase = lib32-gst-libav
 	pkgdesc = Gstreamer libav Plugin (32-bit)
-	pkgver = 1.8.3
+	pkgver = 1.12.1
 	pkgrel = 1
 	url = http://gstreamer.freedesktop.org/
 	arch = x86_64
 	license = GPL
 	makedepends = python
+	makedepends = autoconf-archive
+	makedepends = git
+	makedepends = valgrind-multilib
 	depends = lib32-gst-plugins-base-libs
 	depends = bzip2
 	depends = lib32-ffmpeg
 	depends = gst-libav
-	provides = lib32-gst-ffmpeg=1.8.3-1
+	provides = lib32-gst-ffmpeg=1.12.1-1
 	options = !emptydirs
-	source = http://gstreamer.freedesktop.org//src/gst-libav/gst-libav-1.8.3.tar.xz
-	sha256sums = 9006a05990089f7155ee0e848042f6bb24e52ab1d0a59ff8d1b5d7e33001a495
+	source = git+https://anongit.freedesktop.org/git/gstreamer/gst-libav#commit=717fc7c3bde7d2f6da41ff8299fd4564d802065c
+	source = gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common
+	source = git://source.ffmpeg.org/ffmpeg
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = lib32-gst-libav
 
diff --git a/PKGBUILD b/PKGBUILD
index 41b64f3d4631..8705d9cafa06 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,36 +2,53 @@
 
 _basename=gst-libav
 pkgname="lib32-$_basename"
-pkgver=1.8.3
+pkgver=1.12.1
 pkgrel=1
 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')
+makedepends=('python' 'autoconf-archive' 'git' 'valgrind-multilib')
 options=(!emptydirs)
 provides=("lib32-gst-ffmpeg=$pkgver-$pkgrel")
-source=(${url}/src/$_basename/$_basename-$pkgver.tar.xz)
-sha256sums=('9006a05990089f7155ee0e848042f6bb24e52ab1d0a59ff8d1b5d7e33001a495')
+_commit=717fc7c3bde7d2f6da41ff8299fd4564d802065c  # tags/1.12.1^0
+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")
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP')
+
+pkgver() {
+  cd $_basename
+  git describe --tags | sed 's/-/+/g'
+}
 
 prepare() {
-  cd $_basename-$pkgver
+  cd $_basename
+
+  git submodule init
+  git config --local submodule.common.url "$srcdir/gst-common"
+  git config --local submodule.gst-libs/ext/libav.url "$srcdir/ffmpeg"
+  git submodule update
+
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $_basename-$pkgver
+  cd $_basename
 
   export CC='gcc -m32'
   export CXX='g++ -m32'
   export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib32 \
     --build=i686-pc-linux-gnu --libdir=/usr/lib32 \
-    --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \
     --with-package-name="GStreamer libav Plugin (Arch Linux)" \
     --with-package-origin="http://www.archlinux.org/" \
-    --with-system-libav
+    --with-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
@@ -40,13 +57,11 @@ build() {
 }
 
 check() {
-  cd $_basename-$pkgver
+  cd $_basename
   make check
 }
 
 package() {
-  cd $_basename-$pkgver
+  cd $_basename
   make DESTDIR="${pkgdir}" install
-
-  rm -r "$pkgdir"/usr/share
 }