[arch-commits] Commit in gstreamer0.10-good/trunk (2 files)

[Jan de Groot]

    Date: Friday, November 6, 2009 @ 19:37:16
  Author: jgc
Revision: 58321

upgpkg: gstreamer0.10-good 0.10.16-2
    Fix dependency on libsoup-gnome, install gconf schemas

Added:
  gstreamer0.10-good/trunk/gstreamer0.10-good-plugins.install
Modified:
  gstreamer0.10-good/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   17 +++++++++++------
 gstreamer0.10-good-plugins.install |   19 +++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-11-07 00:36:34 UTC (rev 58320)
+++ PKGBUILD	2009-11-07 00:37:16 UTC (rev 58321)
@@ -4,12 +4,12 @@
 pkgbase=gstreamer0.10-good
 pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
 pkgver=0.10.16
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL')
-makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394>=0.5.3-3' 'hal>=0.5.13' 'libiec61883>=1.2.0' 'aalib>=1.4rc5-5' 'libshout>=2.2.2' 'libdv>=1.0.0' 'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.26.2' 'wavpack>=4.50.1' 'taglib>=1.5' 'libsoup>=2.26.3' 'libv4l>=0.6.0' 'libcaca>=0.99.beta16' 'bzip2')
+makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.25' 'libavc1394>=0.5.3-3' 'hal>=0.5.13' 'libiec61883>=1.2.0' 'aalib>=1.4rc5-5' 'libshout>=2.2.2' 'libdv>=1.0.0' 'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.28.0' 'wavpack>=4.50.1' 'taglib>=1.5' 'libsoup-gnome>=2.28.0' 'libv4l>=0.6.0' 'libcaca>=0.99.beta16' 'bzip2')
 url="http://gstreamer.freedesktop.org/"
-options=(!libtool)
+options=(!libtool !emptydirs)
 source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2)
 md5sums=('f0af97464bb6e060a99df39bb21b7a42')
 
@@ -17,6 +17,7 @@
   cd "${srcdir}/gst-plugins-good-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
+    --disable-schemas-install \
     --with-package-name="GStreamer Good Plugins (Archlinux)" \
     --with-package-origin="http://www.archlinux.org/" || return 1
 
@@ -25,21 +26,25 @@
 }
 
 package_gstreamer0.10-good() {
-  depends=('gstreamer0.10-base>=0.10.24' 'bzip2')
+  depends=('gstreamer0.10-base>=0.10.25' 'bzip2')
   pkgdesc="GStreamer Multimedia Framework Good plugin libraries"
 
   cd "${srcdir}/gst-plugins-good-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
+  rm -rf "${pkgdir}/etc/gconf"
 }
 
 package_gstreamer0.10-good-plugins() {
-  depends=("gstreamer0.10-good=${pkgver}" 'libavc1394>=0.5.3-3' 'hal>=0.5.13' 'libiec61883>=1.2.0' 'aalib>=1.4rc5-5' 'libshout>=2.2.2' 'libdv>=1.0.0' 'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.26.2' 'wavpack>=4.50.1' 'taglib>=1.5' 'libsoup>=2.26.3' 'libv4l>=0.6.0' 'libcaca>=0.99.beta16')
+  depends=("gstreamer0.10-good=${pkgver}" 'libavc1394>=0.5.3-3' 'hal>=0.5.13' 'libiec61883>=1.2.0' 'aalib>=1.4rc5-5' 'libshout>=2.2.2' 'libdv>=1.0.0' 'esound>=0.2.41' 'flac>=1.2.1' 'gconf>=2.28.0' 'wavpack>=4.50.1' 'taglib>=1.5' 'libsoup-gnome>=2.28.0' 'libv4l>=0.6.0' 'libcaca>=0.99.beta16')
   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-hal' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup')
   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-hal' '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')
+  install=gstreamer0.10-good-plugins.install
 
   cd "${srcdir}/gst-plugins-good-${pkgver}"
   make -C sys DESTDIR="${pkgdir}" install || return 1
   make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
+  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" || return 1
 }

Added: gstreamer0.10-good-plugins.install
===================================================================
--- gstreamer0.10-good-plugins.install	                        (rev 0)
+++ gstreamer0.10-good-plugins.install	2009-11-07 00:37:16 UTC (rev 58321)
@@ -0,0 +1,19 @@
+pkgname=gstreamer0.10-good-plugins
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    pre_remove $1
+  fi
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}