[arch-commits] Commit in gstreamer0.10-bad/repos (3 files)

[Jan de Groot]

    Date: Thursday, May 1, 2008 @ 15:07:19
  Author: jgc
Revision: 1181

Fix conflict

Modified:
  gstreamer0.10-bad/repos/extra-i686/	(properties)
  gstreamer0.10-bad/repos/extra-i686/PKGBUILD
Deleted:
  gstreamer0.10-bad/repos/extra-i686/configure-external.patch

--------------------------+
 PKGBUILD                 |   12 +++++-------
 configure-external.patch |   18 ------------------
 2 files changed, 5 insertions(+), 25 deletions(-)


Property changes on: gstreamer0.10-bad/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gstreamer0.10-bad/trunk:1
   + /gstreamer0.10-bad/trunk:1-1180

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-05-01 19:04:15 UTC (rev 1180)
+++ extra-i686/PKGBUILD	2008-05-01 19:07:19 UTC (rev 1181)
@@ -2,23 +2,21 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gstreamer0.10-bad
-pkgver=0.10.6
-pkgrel=2
+pkgver=0.10.7
+pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)"
 arch=(i686 x86_64)
 license=('LGPL' 'GPL')
-depends=('gcc-libs>=4.3.0' 'gstreamer0.10-base>=0.10.18-2')
+depends=('gcc-libs>=4.3.0' 'gstreamer0.10-base>=0.10.19')
 makedepends=('pkgconfig')
 url="http://gstreamer.freedesktop.org/"
 options=(!libtool)
 _relname=gst-plugins-bad
-source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2
-	configure-external.patch)
-md5sums=('fb47838aa0ccef52683cea5d89364053' '5a18e22749fec5b6f32a382e9b58d1da')
+source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2)
+md5sums=('9a511c9e9a0510ca4e212ce1d67e2cba')
 
 build() {
   cd ${startdir}/src/${_relname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/configure-external.patch || return 1
   autoconf || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental --disable-external \

Deleted: extra-i686/configure-external.patch
===================================================================
--- extra-i686/configure-external.patch	2008-05-01 19:04:15 UTC (rev 1180)
+++ extra-i686/configure-external.patch	2008-05-01 19:07:19 UTC (rev 1181)
@@ -1,18 +0,0 @@
---- configure.ac.orig	2008-03-30 11:03:53.000000000 +0000
-+++ configure.ac	2008-03-30 11:04:22.000000000 +0000
-@@ -936,6 +936,7 @@
- AM_CONDITIONAL(USE_AMRWB, false)
- AM_CONDITIONAL(USE_BZ2, false)
- AM_CONDITIONAL(USE_CDAUDIO, false)
-+AM_CONDITIONAL(USE_DC1394, false)
- AM_CONDITIONAL(USE_DIRECTFB, false)
- AM_CONDITIONAL(USE_DTS, false)
- AM_CONDITIONAL(USE_DIVX, false)
-@@ -947,6 +948,7 @@
- AM_CONDITIONAL(USE_JACK, false)
- AM_CONDITIONAL(USE_LADSPA, false)
- AM_CONDITIONAL(USE_LIBMMS, false)
-+AM_CONDITIONAL(USE_METADATA, false)
- AM_CONDITIONAL(USE_MPEG2ENC, false)
- AM_CONDITIONAL(USE_MUSEPACK, false)
- AM_CONDITIONAL(USE_MUSICBRAINZ, false)