[svn] r5503 - trunk/rpms/gstreamer-plugins-bad
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Wed Jun 13 16:31:29 CEST 2007
Author: dag
Date: 2007-06-13 16:31:27 +0200 (Wed, 13 Jun 2007)
New Revision: 5503
Added:
trunk/rpms/gstreamer-plugins-bad/gst-plugins-bad-0.10.3-faad2.patch
trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec
Log:
Updates
Added: trunk/rpms/gstreamer-plugins-bad/gst-plugins-bad-0.10.3-faad2.patch
===================================================================
--- trunk/rpms/gstreamer-plugins-bad/gst-plugins-bad-0.10.3-faad2.patch (rev 0)
+++ trunk/rpms/gstreamer-plugins-bad/gst-plugins-bad-0.10.3-faad2.patch 2007-06-13 14:31:27 UTC (rev 5503)
@@ -0,0 +1,266 @@
+diff -Naupr gst-plugins-bad-0.10.3.orig/configure gst-plugins-bad-0.10.3/configure
+--- gst-plugins-bad-0.10.3.orig/configure 2006-05-04 17:20:18.000000000 +0200
++++ gst-plugins-bad-0.10.3/configure 2006-05-04 17:20:18.000000000 +0200
+@@ -30382,9 +30382,9 @@ if test x$USE_FAAD = xyes; then
+
+ HAVE_FAAD="yes"
+
+- echo "$as_me:$LINENO: checking for faacDecOpen in -lfaad" >&5
+-echo $ECHO_N "checking for faacDecOpen in -lfaad... $ECHO_C" >&6
+-if test "${ac_cv_lib_faad_faacDecOpen+set}" = set; then
++ echo "$as_me:$LINENO: checking for NeAACDecOpen in -lfaad" >&5
++echo $ECHO_N "checking for NeAACDecOpen in -lfaad... $ECHO_C" >&6
++if test "${ac_cv_lib_faad_NeAACDecOpen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -30402,11 +30402,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char faacDecOpen ();
++char NeAACDecOpen ();
+ int
+ main ()
+ {
+-faacDecOpen ();
++NeAACDecOpen ();
+ ;
+ return 0;
+ }
+@@ -30432,20 +30432,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_lib_faad_faacDecOpen=yes
++ ac_cv_lib_faad_NeAACDecOpen=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_faad_faacDecOpen=no
++ac_cv_lib_faad_NeAACDecOpen=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_faad_faacDecOpen" >&5
+-echo "${ECHO_T}$ac_cv_lib_faad_faacDecOpen" >&6
+-if test $ac_cv_lib_faad_faacDecOpen = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_faad_NeAACDecOpen" >&5
++echo "${ECHO_T}$ac_cv_lib_faad_NeAACDecOpen" >&6
++if test $ac_cv_lib_faad_NeAACDecOpen = yes; then
+ HAVE_FAAD=yes
+ else
+ HAVE_FAAD=no
+diff -Naupr gst-plugins-bad-0.10.3.orig/configure.ac gst-plugins-bad-0.10.3/configure.ac
+--- gst-plugins-bad-0.10.3.orig/configure.ac 2006-05-04 17:18:42.000000000 +0200
++++ gst-plugins-bad-0.10.3/configure.ac 2006-05-04 17:18:42.000000000 +0200
+@@ -397,7 +397,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, faad.h,
+ FAAD_LIBS="-lfaad -lm", HAVE_FAAD="no")
+ if test $HAVE_FAAD = "yes"; then
+ AC_MSG_CHECKING([Checking for FAAD >= 2])
+diff -Naupr gst-plugins-bad-0.10.3.orig/ext/faad/gstfaad.c gst-plugins-bad-0.10.3/ext/faad/gstfaad.c
+--- gst-plugins-bad-0.10.3.orig/ext/faad/gstfaad.c 2006-05-03 13:10:12.000000000 +0200
++++ gst-plugins-bad-0.10.3/ext/faad/gstfaad.c 2007-01-09 12:36:05.000000000 +0100
+@@ -38,14 +38,14 @@
+ * 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);
+@@ -275,10 +275,10 @@ gst_faad_setcaps (GstPad * pad, GstCaps
+ buf = GST_BUFFER (gst_value_get_mini_object (value));
+
+ /* someone forgot that char can be unsigned when writing the API */
+- if ((gint8) faacDecInit2 (faad->handle,
++ if ((gint8) NeAACDecInit2 (faad->handle,
+ GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf), &samplerate,
+ &channels) < 0) {
+- GST_DEBUG ("faacDecInit2() failed");
++ GST_DEBUG ("NeAACDecInit2() failed");
+ return FALSE;
+ }
+
+@@ -666,11 +666,11 @@ gst_faad_srcconnect (GstPad * pad, const
+ }
+
+ if (fmt != -1) {
+- faacDecConfiguration *conf;
++ NeAACDecConfiguration *conf;
+
+- conf = faacDecGetCurrentConfiguration (faad->handle);
++ conf = NeAACDecGetCurrentConfiguration (faad->handle);
+ conf->outputFormat = fmt;
+- if (faacDecSetConfiguration (faad->handle, conf) == 0)
++ if (NeAACDecSetConfiguration (faad->handle, conf) == 0)
+ return GST_PAD_LINK_REFUSED;
+
+ // FIXME: handle return value, how?
+@@ -949,7 +949,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,
+ GstCaps ** p_caps)
+ {
+ GstAudioChannelPosition *pos;
+@@ -1086,7 +1086,7 @@ gst_faad_chain (GstPad * pad, GstBuffer
+ GstFaad *faad;
+ GstBuffer *outbuf;
+ GstCaps *caps = NULL;
+- faacDecFrameInfo info;
++ NeAACDecFrameInfo info;
+ void *out;
+ gboolean run_loop = TRUE;
+ guint sync_off;
+@@ -1136,17 +1136,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);
+ }
+
+@@ -1179,7 +1179,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) {
+@@ -1189,23 +1189,23 @@ gst_faad_chain (GstPad * pad, GstBuffer
+ 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 +1311,7 @@ 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;
+ }
+@@ -1319,7 +1319,7 @@ init2_failed:
+ 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;
+ }
+@@ -1328,22 +1328,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;
+ }
+
+@@ -1353,7 +1353,7 @@ gst_faad_open_decoder (GstFaad * faad)
+ static void
+ gst_faad_close_decoder (GstFaad * faad)
+ {
+- faacDecClose (faad->handle);
++ NeAACDecClose (faad->handle);
+ faad->handle = NULL;
+ }
+
+diff -Naupr gst-plugins-bad-0.10.3.orig/ext/faad/gstfaad.h gst-plugins-bad-0.10.3/ext/faad/gstfaad.h
+--- gst-plugins-bad-0.10.3.orig/ext/faad/gstfaad.h 2006-05-02 18:16:31.000000000 +0200
++++ gst-plugins-bad-0.10.3/ext/faad/gstfaad.h 2007-01-09 12:36:34.000000000 +0100
+@@ -51,7 +51,7 @@ typedef struct _GstFaad {
+ GstBuffer *tempbuf; /* used to keep input leftovers */
+
+ /* FAAD object */
+- faacDecHandle handle;
++ NeAACDecHandle handle;
+ gboolean init;
+
+ /* FAAD channel setup */
Added: trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec
===================================================================
--- trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec (rev 0)
+++ trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec 2007-06-13 14:31:27 UTC (rev 5503)
@@ -0,0 +1,178 @@
+# $Id$
+# Authority: matthias
+# ExclusiveDist: fc5 fc6 el5 fc7
+
+%define desktop_vendor rpmforge
+
+%define majorminor 0.10
+%define gstreamer gstreamer
+
+%define gst_minver 0.10.2
+%define gstpb_minver 0.10.2
+
+Summary: GStreamer streaming media framework "bad" plug-ins
+Name: gstreamer-plugins-bad
+Version: 0.10.3
+Release: 4
+License: LGPL
+Group: Applications/Multimedia
+URL: http://gstreamer.freedesktop.org/
+
+Source: http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.bz2
+Patch0: gst-plugins-bad-0.10.3-faad2.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: %{gstreamer} >= %{gst_minver}
+BuildRequires: %{gstreamer}-devel >= %{gst_minver}
+BuildRequires: %{gstreamer}-plugins-base-devel >= %{gstpb_minver}
+
+BuildRequires: gcc-c++
+BuildRequires: gettext-devel
+BuildRequires: gtk-doc
+BuildRequires: PyXML
+Buildrequires: libXt-devel
+
+BuildRequires: liboil-devel
+BuildRequires: directfb-devel
+BuildRequires: libdca-devel
+BuildRequires: faac-devel
+BuildRequires: faad2-devel
+BuildRequires: gsm-devel
+BuildRequires: libmpcdec-devel
+BuildRequires: SDL-devel
+BuildRequires: soundtouch-devel
+BuildRequires: swfdec-devel
+#Buildrequires: wavpack-devel
+BuildRequires: xvidcore-devel
+BuildRequires: bzip2-devel
+BuildRequires: mesa-libGLU-devel
+BuildRequires: neon-devel
+BuildRequires: libmms-devel
+BuildRequires: libmusicbrainz-devel
+
+Obsoletes: %{name}-devel <= %{version}-%{release}
+Provides: %{name}-devel = %{version}-%{release}
+
+%description
+GStreamer is a streaming media framework, based on graphs of elements which
+operate on media data.
+
+This package contains plug-ins that have licensing issues, aren't tested
+well enough, or the code is not of good enough quality.
+
+%prep
+%setup -q -n gst-plugins-bad-%{version}
+%patch0 -p1 -b .faad2
+
+### Use correct soundtouch pkgconfig package name
+%{__perl} -pi.orig -e 's|libSoundTouch|soundtouch-1.0|g' configure
+
+%build
+%configure \
+ --disable-gtk-doc \
+ --disable-static \
+ --enable-debug \
+ --with-package-name="gst-plugins-bad %{desktop_vendor} rpm" \
+ --with-package-origin="http://www.rpmforge.net/"
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+%find_lang gst-plugins-bad-%{majorminor}
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files -f gst-plugins-bad-%{majorminor}.lang
+%defattr(-, root, root, 0755)
+%doc AUTHORS COPYING README REQUIREMENTS
+
+# Plugins without external dependencies
+%{_libdir}/gstreamer-%{majorminor}/libgstcdxaparse.so
+%{_libdir}/gstreamer-%{majorminor}/libgstfreeze.so
+%{_libdir}/gstreamer-%{majorminor}/libgstmodplug.so
+%{_libdir}/gstreamer-%{majorminor}/libgstqtdemux.so
+%{_libdir}/gstreamer-%{majorminor}/libgstspeed.so
+%{_libdir}/gstreamer-%{majorminor}/libgsttrm.so
+%{_libdir}/gstreamer-%{majorminor}/libgsttta.so
+%{_libdir}/gstreamer-%{majorminor}/libgstxingheader.so
+
+# Plugins with external dependencies
+%{_libdir}/gstreamer-%{majorminor}/libgstbz2.so
+%{_libdir}/gstreamer-%{majorminor}/libgstdfbvideosink.so
+%{_libdir}/gstreamer-%{majorminor}/libgstdtsdec.so
+%{_libdir}/gstreamer-%{majorminor}/libgstfaac.so
+%{_libdir}/gstreamer-%{majorminor}/libgstfaad.so
+%{_libdir}/gstreamer-%{majorminor}/libgstglimagesink.so
+%{_libdir}/gstreamer-%{majorminor}/libgstgsm.so
+%{_libdir}/gstreamer-%{majorminor}/libgstmms.so
+%{_libdir}/gstreamer-%{majorminor}/libgstmusepack.so
+%{_libdir}/gstreamer-%{majorminor}/libgstneonhttpsrc.so
+%{_libdir}/gstreamer-%{majorminor}/libgstpitch.so
+%{_libdir}/gstreamer-%{majorminor}/libgstsdlvideosink.so
+%{_libdir}/gstreamer-%{majorminor}/libgstswfdec.so
+%{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux2.so
+#%{_libdir}/gstreamer-%{majorminor}/libgstwavpack.so
+%{_libdir}/gstreamer-%{majorminor}/libgstxvid.so
+
+#exclude %{_libdir}/*.la
+%exclude %{_libdir}/gstreamer-%{majorminor}/*.la
+
+%changelog
+* Tue Jun 12 2007 Dag Wieers <dag at wieers.com> - 0.10.3-4
+- Remove (empty) devel package.
+- Rebuild against swfdec 0.4.3 on EL5.
+
+* Tue Jan 9 2007 Matthias Saou <http://freshrpms.net/> 0.10.3-3
+- Update faad2 patch to also update the plugin sources, not just configure.
+
+* Mon Dec 18 2006 Matthias Saou <http://freshrpms.net/> 0.10.3-2
+- Try to rebuild against new wavpack 4.40 from Extras : Fails.
+- Try to update to 0.10.3.2 pre-release : Fails, it needs a more recent gst.
+- Try to include patch to update wavpack plugin source from 0.10.3.2
+ pre-release : Fails to find wavpack/md5.h.
+- Give up and disable wavpack support for now, sorry! Patches welcome.
+- Include patch to fix faad2 2.5 detection.
+- Add soundtouch support.
+
+* Thu Jun 1 2006 Matthias Saou <http://freshrpms.net/> 0.10.3-1
+- Update to 0.10.3.
+- Add new translations.
+- Add libgstmodplug.so, libgstvideo4linux2.so and libgstxingheader.so.
+- Add new libmusicbrainz support.
+
+* Thu Mar 23 2006 Matthias Saou <http://freshrpms.net/> 0.10.1-2
+- Add libmms support, thanks to Daniel S. Rogers.
+
+* Wed Feb 22 2006 Matthias Saou <http://freshrpms.net/> 0.10.1-1
+- Update to 0.10.1.
+- Add libgstcdxaparse.so and libgstfreeze.so.
+- Enable libgstbz2.so, libgstglimagesink.so and libgstneonhttpsrc.so.
+
+* Wed Jan 25 2006 Matthias Saou <http://freshrpms.net/> 0.10.0.1-1
+- Update to 0.10.0.1, add new plugins.
+- Spec file cleanup and rebuild for FC5.
+
+* Mon Dec 05 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.10.0-0.gst.1
+- new release
+
+* Thu Dec 01 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.7-0.gst.1
+- new release with 0.10 major/minor
+
+* Sat Nov 12 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+- new release
+- remove tta patch
+- don't check for languages, no translations yet
+- added gtk-doc
+
+* Wed Oct 26 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.4-0.gst.1
+- new release
+- added speed plugin
+
+* Mon Oct 03 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.3-0.gst.1
+- new release
+
Property changes on: trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad-0.10.3.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
More information about the svn-commits
mailing list