[arch-commits] CVS update of extra/multimedia-plugins/gstreamer0.10-faad (3 files)

Mon Mar 17 22:56:35 UTC 2008

Date: Monday, March 17, 2008 @ 18:56:35
  Author: jgc
    Path: /home/cvs-extra/extra/multimedia-plugins/gstreamer0.10-faad

Modified: PKGBUILD (1.7 -> 1.8) badconf (1.3 -> 1.4)
 Removed: faad-2.5.patch (1.1)

upgpkg: gstreamer0.10-faad 0.10.6-1


----------------+
 PKGBUILD       |   10 ++++----
 badconf        |    2 -
 faad-2.5.patch |   63 -------------------------------------------------------
 3 files changed, 6 insertions(+), 69 deletions(-)


Index: extra/multimedia-plugins/gstreamer0.10-faad/PKGBUILD
diff -u extra/multimedia-plugins/gstreamer0.10-faad/PKGBUILD:1.7 extra/multimedia-plugins/gstreamer0.10-faad/PKGBUILD:1.8

--- extra/multimedia-plugins/gstreamer0.10-faad/PKGBUILD:1.7	Sat Jun 30 05:44:07 2007
+++ extra/multimedia-plugins/gstreamer0.10-faad/PKGBUILD	Mon Mar 17 18:56:35 2008
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD,v 1.7 2007/06/30 09:44:07 jgc Exp $
+# $Id: PKGBUILD,v 1.8 2008/03/17 22:56:35 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gstreamer0.10-faad
-pkgver=0.10.5
+pkgver=0.10.6
 pkgrel=1
 pkgdesc="GStreamer FAAD plugin"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=("gstreamer0.10-bad>=${pkgver}" 'faad2>=2.5-3')
+depends=("gstreamer0.10-bad>=${pkgver}" 'faad2>=2.6')
 makedepends=('pkgconfig')
 url="http://gstreamer.freedesktop.org/"
 groups=('gstreamer0.10-plugins')
 _relname=gst-plugins-bad
 source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2
         badconf)
-md5sums=('395f3ed705928e77e5620cccf11a8cff'
-         'e0cebf1d6da30d851d4fc6d40b42e0e6')
+md5sums=('fb47838aa0ccef52683cea5d89364053'
+	 '247d6fde78f24551e2e1406e616b108d')
 
 build() {
   cd ${startdir}/src/${_relname}-${pkgver}
Index: extra/multimedia-plugins/gstreamer0.10-faad/badconf
diff -u extra/multimedia-plugins/gstreamer0.10-faad/badconf:1.3 extra/multimedia-plugins/gstreamer0.10-faad/badconf:1.4
--- extra/multimedia-plugins/gstreamer0.10-faad/badconf:1.3	Sat Jun 30 05:44:07 2007
+++ extra/multimedia-plugins/gstreamer0.10-faad/badconf	Mon Mar 17 18:56:35 2008
@@ -1,5 +1,5 @@
 # String with all external plugins
-ext_plugins="alsa amrwb bz2 cdaudio directfb divx dts faac faad gsm ivorbis jack ladspa libmms mpeg2enc musepack musicbrainz mythtv neon sdl sndfile soundtoch spc swfdec theoradec timidity x264 xvid"
+ext_plugins="alsa amrwb bz2 cdaudio directfb divx dts faac faad gsm ivorbis jack ladspa libmms mpeg2enc musepack musicbrainz mythtv neon sdl sndfile soundtoch spc swfdec theoradec timidity x264 xvid metadata soup"
 
 # Make sure plugin paths are correct
 plugdirs=${plugins/alsa/alsaspdif/}
Index: extra/multimedia-plugins/gstreamer0.10-faad/faad-2.5.patch
diff -u extra/multimedia-plugins/gstreamer0.10-faad/faad-2.5.patch:1.1 extra/multimedia-plugins/gstreamer0.10-faad/faad-2.5.patch:removed
--- extra/multimedia-plugins/gstreamer0.10-faad/faad-2.5.patch:1.1	Sun Apr  8 17:15:11 2007
+++ extra/multimedia-plugins/gstreamer0.10-faad/faad-2.5.patch	Mon Mar 17 18:56:35 2008
@@ -1,63 +0,0 @@
---- ext/faad/gstfaad.c	2006/10/06 15:49:39	1.58
-+++ ext/faad/gstfaad.c	2007/02/11 11:59:49	1.60
-@@ -30,19 +30,33 @@
-  * with types changed to match glib types, since those are defined for us.
-  * However, upstream FAAD is distributed with a broken header file that defined
-  * these wrongly (in a way which was broken on 64 bit systems).
-+ *
-  * Upstream CVS still has the bug, but has also renamed all the public symbols
-- * for Better Corporate Branding (or whatever), so we're screwed there.
-+ * for Better Corporate Branding (or whatever), so we need to take that
-+ * (FAAD_IS_NEAAC) into account as well.
-  *
-  * We must call them using these definitions. Most distributions now have the
-  * corrected header file (they distribute a patch along with the source), 
-- * but not all, hence this Truly Evil Hack. This hack will need updating if
-- * upstream ever releases something with the new API.
-+ * but not all, hence this Truly Evil Hack.
-+ *
-+ * Note: The prototypes don't need to be defined conditionaly, as the cpp will
-+ * do that for us.
-  */
-+#ifdef FAAD_IS_NEAAC
-+#define NeAACDecInit NeAACDecInit_no_definition
-+#define NeAACDecInit2 NeAACDecInit2_no_definition
-+#else
- #define faacDecInit faacDecInit_no_definition
- #define faacDecInit2 faacDecInit2_no_definition
-+#endif
- #include "gstfaad.h"
-+#ifdef FAAD_IS_NEAAC
-+#undef NeAACDecInit
-+#undef NeAACDecInit2
-+#else
- #undef faacDecInit
- #undef faacDecInit2
-+#endif
- 
- extern long faacDecInit (faacDecHandle, guint8 *, guint32, guint32 *, guint8 *);
- extern int8_t faacDecInit2 (faacDecHandle, guint8 *, guint32,
---- configure.ac	2007/02/08 15:00:00	1.727
-+++ configure.ac	2007/02/11 11:35:47	1.729
-@@ -539,6 +539,13 @@
-   HAVE_FAAD="yes"
-   GST_CHECK_LIBHEADER(FAAD, faad, faacDecOpen, -lm, faad.h,
-     FAAD_LIBS="-lfaad -lm", HAVE_FAAD="no")
-+  if test $HAVE_FAAD = "no"; then
-+    GST_CHECK_LIBHEADER(FAAD, faad, NeAACDecOpen, -lm, neaacdec.h,
-+      [ FAAD_LIBS="-lfaad -lm"
-+	  	AC_DEFINE(FAAD_IS_NEAAC, 1, [Define if AAC is using new api prefix])
-+	  ],
-+	  HAVE_FAAD="no",)
-+  fi
-   if test $HAVE_FAAD = "yes"; then
-     AC_MSG_CHECKING([Checking for FAAD >= 2])
-     AC_TRY_RUN([
-@@ -569,6 +576,7 @@
-   fi
-   AS_SCRUB_INCLUDE(FAAD_CFLAGS)
-   AC_SUBST(FAAD_LIBS)
-+  AC_SUBST(FAAD_IS_NEAAC)
- ])
- 
- dnl *** gsm ***


