[Frugalware-darcs] frugalware-current: gst-plugins-bad-0.10.5-1-i686

crazy crazy at frugalware.org
Thu Jun 21 02:14:43 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070621000955-f6986-6d08605f48522b0295be7e84e35fd04ba61d1e14.gz;

[gst-plugins-bad-0.10.5-1-i686
crazy <crazy at frugalware.org>**20070621000955
 * Version bump
 * 9 new plugins ( 5 as subpackages ) ( still 6 on TODO 2 broken for 4 we are missing depends )
 * 3 moved to gst-plugins good
 * FB cleanup
 * depends fixes
] {
hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 5
-pkgver=0.10.4
-pkgrel=3
+pkgver=0.10.5
+pkgrel=1
hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 9
-depends=('gst-plugins-base>=0.10.13' 'libstdc++')
-makedepends=('libgl' 'soundtouch' 'libdrm' 'libxxf86vm' 'directfb' 'gstreamer>=>=0.10.13' 'xvidcore' 'wavpack' 'libmpcdec' \
-	'faac' 'neon>=0.26.1' 'libmusicbrainz' 'cairo' 'bzip2' 'libdca>=0.0.5' 'liboil>=0.3.10' 'libmms' 'faad2' \
-	'libcdaudio' 'alsa-lib' 'jack' 'ladspa_sdk')
+depends=('gst-plugins-base>=0.10.13' 'libstdc++' 'zlib')
+makedepends=('soundtouch' 'directfb' 'gstreamer>=>=0.10.13' 'xvidcore' 'wavpack' 'libmpcdec' 'faac' 'neon>=0.26.1' \
+	'libmusicbrainz' 'cairo' 'bzip2' 'libdca>=0.0.5' 'liboil>=0.3.10' 'libmms' 'faad2' 'libcdaudio' 'alsa-lib' \
+	'jack' 'ladspa_sdk' 'libtimidity' 'wildmidi' 'nas' 'x264' 'libsndfile' 'libsm' 'libice' 'libx11' 'libgl' \
+	'libxcb' 'libxau' 'libxdmcp' 'libxext' 'libxxf86vm' 'libxdamage' 'libxfixes' 'libdrm')
hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 17
-replaces=("$pkgname-swfdec") ## fixme
-source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2 \
-	soundtouch.diff \
-	faad-2.5.patch \
-	libdca.patch)
+replaces=("$pkgname-swfdec")
+source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2 libdca.patch)
hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 20
-sha1sums=('6e73f612cfd72675b1e5b5eb378b9620b62d4946'\
-          '79c1d2e132857665da1615ea044e3be7132bee60'\
-          '1bb5aac5f6bfdecc3ff07dfe3a3bd5f2ce99e405'\
-          'f04b747bc510d6ffd722840a8f0eb621a10c0e95')
+sha1sums=('ad339ad401052e25e2dc2825c87b954857e53800'\
+          '0ba6da39adfc21499544a7904d1db3644fc5463b')
hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 24
-	"$pkgname-sdl" "$pkgname-directfb" "$pkgname-xvid" "$pkgname-opengl" "$pkgname-wavpack" "$pkgname-musepack" \
-	"$pkgname-soundtouch" "$pkgname-musicbrainz" "$pkgname-jack" "$pkgname-cdaudio" "$pkgname-alsa")
+	"$pkgname-sdl" "$pkgname-directfb" "$pkgname-xvid" "$pkgname-opengl" "$pkgname-musepack" \
+	"$pkgname-soundtouch" "$pkgname-musicbrainz" "$pkgname-jack" "$pkgname-cdaudio" "$pkgname-alsa" \
+	"$pkgname-libtimidity" "$pkgname-wildmidi" "$pkgname-nas" "$pkgname-x264" "$pkgname-libsndfile")
hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 28
-          'GStreamer faad plugin (Bad).' 'GStreamer mms plugin (Bad).' \
-          'GStreamer neon plugin (Bad).' 'GStreamer sdl plugin (Bad).' 'GStreamer directfb plugin (Bad).' \
-	  'GStreamer xvid plugin (Bad).' 'GStreamer opengl plugin (Bad).' 'GStreamer wavpack plugin (Bad).' \
-          'GStreamer musepack plugin (Bad).' 'GStreamer soundtouch plugin (Bad).' 'GStreamer musicbrainz plugin (Bad).' \
-	  'GStreamer jack plugin (Bad).' 'GStreamer cdaudio plugin (Bad).' 'GStreamer alsa plugin (Bad).')
+          'GStreamer faad plugin (Bad).' 'GStreamer mms plugin (Bad).' 'GStreamer neon plugin (Bad).' \
+	  'GStreamer sdl plugin (Bad).' 'GStreamer directfb plugin (Bad).' 'GStreamer xvid plugin (Bad).' \
+	  'GStreamer opengl plugin (Bad).' 'GStreamer musepack plugin (Bad).' 'GStreamer soundtouch plugin (Bad).' \
+	  'GStreamer musicbrainz plugin (Bad).' 'GStreamer jack plugin (Bad).' 'GStreamer cdaudio plugin (Bad).' \
+	  'GStreamer alsa plugin (Bad).' 'GStreamer timidity plugin (Bad).' 'GStreamer wildmidi plugin (Bad).' \
+	  'GStreamer nas plugin (Bad).' 'GStreamer x264 plugin (Bad).' 'GStreamer libsndfile plugin (Bad).')
hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 37
-	   "libgl libxxf86vm libdrm $pkgname=$pkgver" "wavpack $pkgname=$pkgver" "libmpcdec $pkgname=$pkgver" \
-	   "soundtouch $pkgname=$pkgver" "libmusicbrainz $pkgname=$pkgver libstdc++" "$pkgname=$pkgver jack" \
-	   "$pkgname=$pkgver libcdaudio" "$pkgname=$pkgver alsa-lib")
+	   "$pkgname=$pkgver libsm libice libx11 libgl libxcb libxau libxdmcp libxext libxxf86vm libxdamage libxfixes libdrm" \
+	   "libmpcdec $pkgname=$pkgver" "soundtouch $pkgname=$pkgver" "libmusicbrainz $pkgname=$pkgver libstdc++" "$pkgname=$pkgver jack" \
+	   "$pkgname=$pkgver libcdaudio" "$pkgname=$pkgver alsa-lib" "$pkgname=$pkgver libtimidity" "$pkgname=$pkgver wildmidi" \
+	   "$pkgname=$pkgver libsm libice nas libxcb libxdmcp" "$pkgname=$pkgver libxcb libxau libxdmcp x264" \
+	   "$pkgname=$pkgver libsndfile")
hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 44
-	   'xmultimedia')
+	   'xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia' 'xmultimedia' 'xmultimedia')
hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 47
-	  'i686 x86_64')
+	  'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64')
hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 53
+	Fsed 'libSoundTouch' 'soundtouch-1.0' configure.ac
hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 70
-	Fsplit $pkgname-sdl usr/lib/gstreamer-0.10/libgstsdlvideosink.*
+	Fsplit $pkgname-sdl usr/lib/gstreamer-0.10/libgstsdl.*
hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 74
-        Fsplit $pkgname-wavpack usr/lib/gstreamer-0.10/libgstwavpack.*
hunk ./source/xmultimedia/gst-plugins-bad/FrugalBuild 80
-	
+	Fsplit $pkgname-libtimidity usr/lib/gstreamer-0.10/libgsttimidity.*
+	Fsplit $pkgname-wildmidi usr/lib/gstreamer-0.10/libgstwildmidi.*
+	Fsplit $pkgname-nas usr/lib/gstreamer-0.10/libgstnassink.*
+	Fsplit $pkgname-x264 usr/lib/gstreamer-0.10/libgstx264.*
+	Fsplit $pkgname-libsndfile  usr/lib/gstreamer-0.10/libgstsndfile.*
hunk ./source/xmultimedia/gst-plugins-bad/faad-2.5.patch 1
-diff -Naurp gst-plugins-bad-0.10.4/configure.ac gst-plugins-bad-0.10.4-faad/configure.ac
---- gst-plugins-bad-0.10.4/configure.ac	2006-12-21 16:10:47.000000000 +0100
-+++ gst-plugins-bad-0.10.4-faad/configure.ac	2006-12-21 21:52:56.000000000 +0100
-@@ -429,7 +429,7 @@ dnl **** Free AAC Decoder (FAAD) ****
- translit(dnm, m, l) AM_CONDITIONAL(USE_FAAD, true)
- GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
-   HAVE_FAAD="yes"
--  GST_CHECK_LIBHEADER(FAAD, faad, faacDecOpen, -lm, faad.h,
-+  GST_CHECK_LIBHEADER(FAAD, faad, NeAACDecOpen, -lm, neaacdec.h,
-     FAAD_LIBS="-lfaad -lm", HAVE_FAAD="no")
-   if test $HAVE_FAAD = "yes"; then
-     AC_MSG_CHECKING([Checking for FAAD >= 2])
-diff -Naurp gst-plugins-bad-0.10.4/ext/faad/gstfaad.c gst-plugins-bad-0.10.4-faad/ext/faad/gstfaad.c
---- gst-plugins-bad-0.10.4/ext/faad/gstfaad.c	2006-10-06 17:49:39.000000000 +0200
-+++ gst-plugins-bad-0.10.4-faad/ext/faad/gstfaad.c	2006-12-21 22:16:25.000000000 +0100
-@@ -38,14 +38,15 @@
-  * but not all, hence this Truly Evil Hack. This hack will need updating if
-  * upstream ever releases something with the new API.
-  */
--#define faacDecInit faacDecInit_no_definition
--#define faacDecInit2 faacDecInit2_no_definition
-+#define NeAACDecInit NeAACDecInit_no_definition
-+#define NeAACDecInit2 NeAACDecInit2_no_definition
- #include "gstfaad.h"
--#undef faacDecInit
--#undef faacDecInit2
-+#undef NeAACDecInit
-+#undef NeAACDecInit2
- 
--extern long faacDecInit (faacDecHandle, guint8 *, guint32, guint32 *, guint8 *);
--extern int8_t faacDecInit2 (faacDecHandle, guint8 *, guint32,
-+extern long NeAACDecInit (NeAACDecHandle, guint8 *, guint32, 
-+    guint32 *, guint8 *);
-+extern int8_t NeAACDecInit2 (NeAACDecHandle, guint8 *, guint32,
-     guint32 *, guint8 *);
- 
- GST_DEBUG_CATEGORY_STATIC (faad_debug);
-@@ -305,7 +306,7 @@ gst_faad_setcaps (GstPad * pad, GstCaps 
-       goto wrong_length;
- 
-     /* someone forgot that char can be unsigned when writing the API */
--    if ((gint8) faacDecInit2 (faad->handle, cdata, csize, &samplerate,
-+    if ((gint8) NeAACDecInit2 (faad->handle, cdata, csize, &samplerate,
-             &channels) < 0)
-       goto init_failed;
- 
-@@ -365,7 +366,7 @@ wrong_length:
-   }
- init_failed:
-   {
--    GST_DEBUG_OBJECT (faad, "faacDecInit2() failed");
-+    GST_DEBUG_OBJECT (faad, "NeAACDecInit2() failed");
-     return FALSE;
-   }
- }
-@@ -993,7 +994,7 @@ gst_faad_src_query (GstPad * pad, GstQue
- 
- 
- static gboolean
--gst_faad_update_caps (GstFaad * faad, faacDecFrameInfo * info)
-+gst_faad_update_caps (GstFaad * faad, NeAACDecFrameInfo * info)
- {
-   GstAudioChannelPosition *pos;
-   gboolean ret;
-@@ -1177,7 +1178,7 @@ gst_faad_chain (GstPad * pad, GstBuffer 
-   guchar *input_data;
-   GstFaad *faad;
-   GstBuffer *outbuf;
--  faacDecFrameInfo info;
-+  NeAACDecFrameInfo info;
-   void *out;
-   gboolean run_loop = TRUE;
-   guint sync_off;
-@@ -1228,17 +1229,17 @@ gst_faad_chain (GstPad * pad, GstBuffer 
-      * appropriate initialisation info... if not, we use our fake_codec_data
-      */
-     if (looks_like_valid_header (input_data, input_size) || !faad->packetised) {
--      if (faacDecInit (faad->handle, input_data, input_size, &rate, &ch) < 0)
-+      if (NeAACDecInit (faad->handle, input_data, input_size, &rate, &ch) < 0)
-         goto init_failed;
- 
--      GST_DEBUG_OBJECT (faad, "faacDecInit() ok: rate=%u,channels=%u", rate,
-+      GST_DEBUG_OBJECT (faad, "NeAACDecInit() ok: rate=%u,channels=%u", rate,
-           ch);
-     } else {
--      if ((gint8) faacDecInit2 (faad->handle, faad->fake_codec_data, 2,
-+      if ((gint8) NeAACDecInit2 (faad->handle, faad->fake_codec_data, 2,
-               &rate, &ch) < 0) {
-         goto init2_failed;
-       }
--      GST_DEBUG_OBJECT (faad, "faacDecInit2() ok: rate=%u,channels=%u", rate,
-+      GST_DEBUG_OBJECT (faad, "NeAACDecInit2() ok: rate=%u,channels=%u", rate,
-           ch);
-     }
- 
-@@ -1271,7 +1272,7 @@ gst_faad_chain (GstPad * pad, GstBuffer 
-       }
-     }
- 
--    out = faacDecDecode (faad->handle, &info, input_data + skip_bytes,
-+    out = NeAACDecDecode (faad->handle, &info, input_data + skip_bytes,
-         input_size - skip_bytes);
- 
-     if (info.error > 0) {
-@@ -1279,30 +1280,30 @@ gst_faad_chain (GstPad * pad, GstBuffer 
-       guint8 ch;
- 
-       GST_DEBUG_OBJECT (faad, "decoding error: %s",
--          faacDecGetErrorMessage (info.error));
-+          NeAACDecGetErrorMessage (info.error));
- 
-       goto out;
- 
-       if (!faad->packetised)
-         goto decode_error;
- 
--      /* decode error? try again using faacDecInit2 
-+      /* decode error? try again using NeAACDecInit2 
-        * fabricated private codec data from sink caps */
-       gst_faad_close_decoder (faad);
-       if (!gst_faad_open_decoder (faad))
-         goto init2_failed;
- 
--      GST_DEBUG_OBJECT (faad, "decoding error, reopening with faacDecInit2()");
--      if ((gint8) faacDecInit2 (faad->handle, faad->fake_codec_data, 2,
-+      GST_DEBUG_OBJECT (faad, "decoding error, reopening with NeAACDecInit2()");
-+      if ((gint8) NeAACDecInit2 (faad->handle, faad->fake_codec_data, 2,
-               &rate, &ch) < 0) {
-         goto init2_failed;
-       }
- 
--      GST_DEBUG_OBJECT (faad, "faacDecInit2(): rate=%d,channels=%d", rate, ch);
-+      GST_DEBUG_OBJECT (faad, "NeAACDecInit2(): rate=%d,channels=%d", rate, ch);
- 
-       /* let's try again */
-       info.error = 0;
--      out = faacDecDecode (faad->handle, &info, input_data + skip_bytes,
-+      out = NeAACDecDecode (faad->handle, &info, input_data + skip_bytes,
-           input_size - skip_bytes);
- 
-       if (info.error) {
-@@ -1311,7 +1312,7 @@ gst_faad_chain (GstPad * pad, GstBuffer 
-           goto decode_error;
-         GST_DEBUG_OBJECT (faad,
-             "Failed to decode buffer: %s, count = %d, trying to resync",
--            faacDecGetErrorMessage (info.error), faad->error_count);
-+            NeAACDecGetErrorMessage (info.error), faad->error_count);
-         continue;
-       }
- 
-@@ -1420,14 +1421,14 @@ init_failed:
- init2_failed:
-   {
-     GST_ELEMENT_ERROR (faad, STREAM, DECODE, (NULL),
--        ("%s() failed", (faad->handle) ? "faacDecInit2" : "faacDecOpen"));
-+        ("%s() failed", (faad->handle) ? "NeAACDecInit2" : "NeAACDecOpen"));
-     ret = GST_FLOW_ERROR;
-     goto out;
-   }
- decode_error:
-   {
-     GST_ELEMENT_ERROR (faad, STREAM, DECODE, (NULL),
--        ("Failed to decode buffer: %s", faacDecGetErrorMessage (info.error)));
-+        ("Failed to decode buffer: %s", NeAACDecGetErrorMessage (info.error)));
-     ret = GST_FLOW_ERROR;
-     goto out;
-   }
-@@ -1436,22 +1437,22 @@ decode_error:
- static gboolean
- gst_faad_open_decoder (GstFaad * faad)
- {
--  faacDecConfiguration *conf;
-+  NeAACDecConfiguration *conf;
- 
--  faad->handle = faacDecOpen ();
-+  faad->handle = NeAACDecOpen ();
- 
-   if (faad->handle == NULL) {
--    GST_WARNING_OBJECT (faad, "faacDecOpen() failed");
-+    GST_WARNING_OBJECT (faad, "NeAACDecOpen() failed");
-     return FALSE;
-   }
- 
--  conf = faacDecGetCurrentConfiguration (faad->handle);
-+  conf = NeAACDecGetCurrentConfiguration (faad->handle);
-   conf->defObjectType = LC;
-   /* conf->dontUpSampleImplicitSBR = 1; */
-   conf->outputFormat = FAAD_FMT_16BIT;
- 
--  if (faacDecSetConfiguration (faad->handle, conf) == 0) {
--    GST_WARNING_OBJECT (faad, "faacDecSetConfiguration() failed");
-+  if (NeAACDecSetConfiguration (faad->handle, conf) == 0) {
-+    GST_WARNING_OBJECT (faad, "NeAACDecSetConfiguration() failed");
-     return FALSE;
-   }
- 
-@@ -1462,7 +1463,7 @@ static void
- gst_faad_close_decoder (GstFaad * faad)
- {
-   if (faad->handle) {
--    faacDecClose (faad->handle);
-+    NeAACDecClose (faad->handle);
-     faad->handle = NULL;
-   }
- }
-diff -Naurp gst-plugins-bad-0.10.4/ext/faad/gstfaad.h gst-plugins-bad-0.10.4-faad/ext/faad/gstfaad.h
---- gst-plugins-bad-0.10.4/ext/faad/gstfaad.h	2006-05-31 21:26:24.000000000 +0200
-+++ gst-plugins-bad-0.10.4-faad/ext/faad/gstfaad.h	2006-12-21 22:18:42.000000000 +0100
-@@ -20,8 +20,10 @@
- #ifndef __GST_FAAD_H__
- #define __GST_FAAD_H__
- 
-+
-+
- #include <gst/gst.h>
--#include <faad.h>
-+#include <neaacdec.h>
- 
- G_BEGIN_DECLS
- 
-@@ -51,7 +53,7 @@ typedef struct _GstFaad {
-   GstBuffer *tempbuf;    /* used to keep input leftovers          */
- 
-   /* FAAD object */
--  faacDecHandle handle;
-+  NeAACDecHandle handle;
-   gboolean init;
- 
-   /* FAAD channel setup */
rmfile ./source/xmultimedia/gst-plugins-bad/faad-2.5.patch
hunk ./source/xmultimedia/gst-plugins-bad/libdca.patch 1
---- gst-plugins-bad-0.10.4/configure.ac	2006-12-21 16:10:47.000000000 +0100
-+++ gst-plugins-bad-0.10.4-p/configure.ac	2007-06-12 14:03:37.000000000 +0200
-@@ -339,9 +339,9 @@
+diff -Naur gst-plugins-bad-0.10.5/configure.ac gst-plugins-bad-0.10.5-p/configure.ac
+--- gst-plugins-bad-0.10.5/configure.ac	2007-06-19 10:43:43.000000000 +0200
++++ gst-plugins-bad-0.10.5-p/configure.ac	2007-06-19 23:48:24.000000000 +0200
+@@ -387,9 +387,9 @@
hunk ./source/xmultimedia/gst-plugins-bad/libdca.patch 8
--GST_CHECK_FEATURE(DTS, [dts library], dtsdec, [
--  GST_CHECK_LIBHEADER(DTS, dts_pic, dts_init, -lm, dts.h,
+-AG_GST_CHECK_FEATURE(DTS, [dts library], dtsdec, [
+-  AG_GST_CHECK_LIBHEADER(DTS, dts_pic, dts_init, -lm, dts.h,
hunk ./source/xmultimedia/gst-plugins-bad/libdca.patch 11
-+GST_CHECK_FEATURE(DTS, [dca library], dcadec, [
-+  GST_CHECK_LIBHEADER(DTS, dca, dca_init, -lm, dca.h,
++AG_GST_CHECK_FEATURE(DTS, [dca library], dcadec, [
++  AG_GST_CHECK_LIBHEADER(DTS, dca, dca_init, -lm, dca.h,
hunk ./source/xmultimedia/gst-plugins-bad/soundtouch.diff 1
---- gst-plugins-bad-0.10.3/configure.ac	2006-05-04 17:18:42.000000000 +0200
-+++ gst-plugins-bad-0.10.3-p/configure.ac	2006-05-07 11:48:57.000000000 +0200
-@@ -509,7 +509,7 @@
- dnl *** soundtouch ***
- translit(dnm, m, l) AM_CONDITIONAL(USE_SOUNDTOUCH, true)
- GST_CHECK_FEATURE(SOUNDTOUCH, [soundtouch plug-in], soundtouch, [
--  PKG_CHECK_MODULES(SOUNDTOUCH, libSoundTouch, HAVE_SOUNDTOUCH=yes, [
-+  PKG_CHECK_MODULES(SOUNDTOUCH,  soundtouch-1.0, HAVE_SOUNDTOUCH=yes, [
-     HAVE_SOUNDTOUCH=no
-      AC_MSG_RESULT(no)])
-   AC_SUBST(SOUNDTOUCH_CFLAGS)
rmfile ./source/xmultimedia/gst-plugins-bad/soundtouch.diff
}


More information about the Frugalware-darcs mailing list