update

1 files changed, 51 insertions, 115 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d1f8df1e4b6e..c83806c3fdda 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,136 +1,72 @@
-# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <bruno.n.pagani@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# Maintainer Yurii Kolesnykov <yurikoles@gmail.com>
+# Credit: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-good
-pkgname=('gstreamer0.10-good-morituri' 'gstreamer0.10-good-plugins-morituri')
+pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
 pkgver=0.10.31
-pkgrel=1
+pkgrel=12
 arch=('i686' 'x86_64')
 license=('LGPL')
-makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'flac' 'taglib' 'git')
+makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'git' 'cairo' 'libgudev')
 url="http://gstreamer.freedesktop.org/"
-source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-good#commit=e28fd8886f05bb51c147f871f3a1db2fc2b735a9")
-sha256sums=('SKIP')
+options=(!emptydirs)
+source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-good#commit=e28fd8886f05bb51c147f871f3a1db2fc2b735a9"
+        test-rtp-payloading.patch
+        souptest.patch)
+sha256sums=('SKIP'
+            'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29'
+            '3a74492c3d2939efabe7e22211c2350084e0a8cc3af23f553130f1e774c5f1e1')
 
 prepare() {
-    cd gst-plugins-good
+  cd gst-plugins-good
 
-    sed -i '/AC_PATH_XTRA/d' configure.ac
-    sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+  sed -i '/AC_PATH_XTRA/d' configure.ac
+  sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+
+  patch -Np1 -i ../test-rtp-payloading.patch
+  patch -Np1 -i ../souptest.patch
 }
 
 build() {
-    cd gst-plugins-good
-    NOCONFIGURE=1 ./autogen.sh
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-        --disable-static --enable-experimental \
-        --disable-schemas-install \
-        --disable-gtk-doc \
-        --disable-gconftool \
-        --disable-videofilter \
-        --disable-alpha \
-        --disable-apetag \
-        --disable-audiofx \
-        --disable-audioparsers \
-        --disable-auparse \
-        --disable-autodetect \
-        --disable-avi \
-        --disable-cutter \
-        --disable-debugutils \
-        --disable-deinterlace \
-        --disable-effectv \
-        --disable-equalizer \
-        --disable-flv \
-        --disable-id3demux \
-        --disable-icydemux \
-        --disable-interleave \
-        --disable-flx \
-        --disable-goom \
-        --disable-goom2k1 \
-        --disable-imagefreeze \
-        --disable-isomp4 \
-        --disable-law \
-        --enable-level \
-        --disable-matroska \
-        --disable-monoscope \
-        --disable-multifile \
-        --disable-multipart \
-        --disable-replaygain \
-        --disable-rtp \
-        --disable-rtpmanager \
-        --disable-rtsp \
-        --disable-shapewipe \
-        --disable-smpte \
-        --disable-spectrum \
-        --disable-udp \
-        --disable-videobox \
-        --disable-videocrop \
-        --disable-videomixer \
-        --enable-wavenc \
-        --enable-wavparse \
-        --disable-y4m \
-        --disable-directsound \
-        --disable-oss \
-        --disable-oss4 \
-        --disable-sunaudio \
-        --disable-osx_audio \
-        --disable-osx_video \
-        --disable-gst_v4l2 \
-        --disable-x \
-        --disable-xshm \
-        --disable-xvideo \
-        --disable-aalib \
-        --disable-annodex \
-        --disable-cairo \
-        --disable-cairo_gobject \
-        --disable-esd \
-        --disable-esdtest \
-        --enable-flac \
-        --disable-gconf \
-        --disable-gdk_pixbuf \
-        --disable-hal \
-        --disable-jack \
-        --disable-jpeg \
-        --disable-libcaca \
-        --disable-libdv \
-        --disable-libpng \
-        --disable-pulse \
-        --disable-dv1394 \
-        --disable-shout2 \
-        --disable-soup \
-        --disable-speex \
-        --enable-taglib \
-        --disable-wavpack \
-        --disable-zlib \
-        --disable-bz2 \
-        --with-package-name="GStreamer Good Plugins (ArchLinux) – morituri version" \
-        --with-package-origin="https://aur.archlinux.org/"
+  cd gst-plugins-good
+  NOCONFIGURE=1 ./autogen.sh
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-experimental \
+    --disable-schemas-install \
+    --disable-hal \
+    --disable-esd \
+    --disable-gtk-doc \
+    --with-package-name="GStreamer Good Plugins (Archlinux)" \
+    --with-package-origin="http://www.archlinux.org/"
 
-    make
-    sed -e 's/gst sys ext/gst/' -i Makefile
+  make
+  sed -e 's/gst sys ext/gst/' -i Makefile
 }
 
-package_gstreamer0.10-good-morituri() {
-    depends=('gstreamer0.10-base') 
-    pkgdesc="GStreamer Multimedia Framework Good plugin libraries, light version for morituri"
-    conflicts=('gstreamer0.10-good')
-    provides=('gstreamer0.10-good')
-
-    cd gst-plugins-good
+check() {
+  cd gst-plugins-good
+  make check
+}
 
-    make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+package_gstreamer0.10-good() {
+  depends=('gstreamer0.10-base>=0.10.34' 'bzip2')
+  pkgdesc="GStreamer Multimedia Framework Good plugin libraries"
 
-    rm -rf "${pkgdir}/etc/gconf"
+  cd gst-plugins-good
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}/etc/gconf"
 }
 
-package_gstreamer0.10-good-plugins-morituri() {
-    depends=('gstreamer0.10-good' 'flac' 'taglib')
-    pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good), light version for morituri"
-    groups=('gstreamer0.10-plugins')
-    conflicts=('gstreamer0.10-good-plugins')
-    provides=('gstreamer0.10-good-plugins')
+package_gstreamer0.10-good-plugins() {
+  depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'cairo' 'gdk-pixbuf2' 'libgudev')
+  pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)"
+  groups=('gstreamer0.10-plugins')
+  replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse')
+  conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse')
 
-    cd gst-plugins-good
-    make -C sys DESTDIR="${pkgdir}" install
-    make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  cd gst-plugins-good
+  make -C sys DESTDIR="${pkgdir}" install
+  make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  install -m644 gconf/gstreamer-0.10.schemas "${pkgdir}/usr/share/gconf/schemas/gstreamer0.10-good-plugins.schemas"
 }