- Include cog plugin

.cvsignore

@@ -1 +1 @@
-gst-plugins-bad-free-0.10.17.tar.bz2
+gst-plugins-bad-free-0.10.18.tar.bz2

0001-examples-Use-gtk-functions-instead-of-libX11-functio.patch

@@ -1,34 +0,0 @@
-From a04c2db34042ba8f98ac2596cc8224f091fd7e8d Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Sun, 14 Feb 2010 13:43:04 +0100
-Subject: [PATCH] examples: Use gtk functions instead of libX11 functions in camerabin
-
-Gets around the need to link to libX11 directly and provides the same
-functionality.
-To boost, it's more portable, too!
----
- tests/examples/camerabin/gst-camera.c |    6 ++----
- 1 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/tests/examples/camerabin/gst-camera.c b/tests/examples/camerabin/gst-camera.c
-index 43934a8..71d217f 100644
---- a/tests/examples/camerabin/gst-camera.c
-+++ b/tests/examples/camerabin/gst-camera.c
-@@ -836,12 +836,10 @@ gboolean
- on_drawingareaView_configure_event (GtkWidget * widget,
-     GdkEventConfigure * event, gpointer data)
- {
--  Display *display = GDK_WINDOW_XDISPLAY (GDK_WINDOW (widget->window));
--
--  XMoveResizeWindow (display, GDK_WINDOW_XID (GDK_WINDOW (widget->window)),
-+  gdk_window_move_resize (widget->window,
-       widget->allocation.x, widget->allocation.y,
-       widget->allocation.width, widget->allocation.height);
--  XSync (display, False);
-+  gdk_display_sync (gtk_widget_get_display (widget));
- 
-   return TRUE;
- }
--- 
-1.6.6
-

branch

@@ -0,0 +1 @@
+F-13

gst-p-bad-cleanup.sh

@@ -9,20 +9,23 @@
 # Bastien Nocera <bnocera@redhat.com> - 2010
 #
 
-SOURCE="gst-plugins-bad-0.10.17.tar.bz2"
+SOURCE="$1"
 NEW_SOURCE=`echo $SOURCE | sed 's/bad-/bad-free-/'`
 DIRECTORY=`echo $SOURCE | sed 's/\.tar\.bz2//'`
 
 ALLOWED="
 aacparse
 adpcmdec
+adpcmenc
 aiff
 aiffparse
 amrparse
+audioparsers
 autoconvert
 bayer
 camerabin
 cdxaparse
+dataurisrc
 dccp
 debugutils
 dtmf
@@ -32,6 +35,7 @@ frei0r
 h264parse
 hdvparse
 id3tag
+jpegformat
 legacyresample
 librfb
 liveadder
@@ -49,7 +53,6 @@ rtpmux
 scaletempo
 sdp
 selector
-shapewipe
 speed
 stereo
 subenc

gstreamer-plugins-bad-free.spec

@@ -1,24 +1,23 @@
 %define majorminor   0.10
 %define gstreamer    gstreamer
 
-%define gst_minver   0.10.22.1
+%define gst_minver   0.10.27
-%define gstpb_minver 0.10.22.1
+%define gstpb_minver 0.10.27
 
 Summary: GStreamer streaming media framework "bad" plug-ins
 Name: gstreamer-plugins-bad-free
-Version: 0.10.17
+Version: 0.10.18
-Release: 7%{?dist}
+Release: 2%{?dist}
 # The freeze and nfs plugins are LGPLv2 (only)
 License: LGPLv2+ and LGPLv2
 Group: Applications/Multimedia
 URL: http://gstreamer.freedesktop.org/
 # The source is:
-# http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.bz2
+# http://gstreamer.freedesktop.org/src/gst-plugins-bad/pre/gst-plugins-bad-%{version}.tar.bz2
 # modified with gst-p-bad-cleanup.sh from SOURCE1
 Source: gst-plugins-bad-free-%{version}.tar.bz2
 Source1: gst-p-bad-cleanup.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: 0001-examples-Use-gtk-functions-instead-of-libX11-functio.patch
 
 Requires: %{gstreamer} >= %{gst_minver}
 BuildRequires: %{gstreamer}-devel >= %{gst_minver}
@@ -30,41 +29,40 @@ BuildRequires: PyXML
 BuildRequires: libXt-devel
 BuildRequireS: gtk-doc
 
-BuildRequires: liboil-devel
-BuildRequires: gsm-devel
-BuildRequires: libmpcdec-devel
-BuildRequires: SDL-devel
-BuildRequires: soundtouch-devel
-Buildrequires: wavpack-devel
 BuildRequires: bzip2-devel
-BuildRequires: mesa-libGLU-devel
+BuildRequires: celt-devel
-BuildRequires: libcdaudio-devel
+BuildRequires: dirac-devel
-BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: exempi-devel
-BuildRequires: nas-devel
-BuildRequires: wildmidi-devel
-BuildRequires: libsndfile-devel
-BuildRequires: libmodplug-devel
-BuildRequires: libtimidity-devel
 BuildRequires: gmyth-devel >= 0.4
+BuildRequires: gsm-devel
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: jasper-devel
+BuildRequires: ladspa-devel
+BuildRequires: libass-devel
+BuildRequires: libcdaudio-devel
 BuildRequires: libdc1394-devel
+BuildRequires: libdvdnav-devel
 BuildRequires: libexif-devel
 BuildRequires: libiptcdata-devel
-BuildRequires: exempi-devel
-BuildRequires: dirac-devel 
-BuildRequires: libofa-devel
-BuildRequires: libdvdnav-devel
-BuildRequires: jasper-devel
-BuildRequires: openssl-devel
-BuildRequires: celt-devel
-BuildRequires: libass-devel
 BuildRequires: libkate-devel
-BuildRequires: slv2-devel
+BuildRequires: libmodplug-devel
+BuildRequires: libmpcdec-devel
+BuildRequires: libofa-devel
+BuildRequires: liboil-devel
 BuildRequires: librsvg2-devel
-BuildRequires: zbar-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libtimidity-devel
+BuildRequires: mesa-libGLU-devel
+BuildRequires: nas-devel
+BuildRequires: openssl-devel
+BuildRequires: orc-devel
 BuildRequires: schroedinger-devel
-BuildRequires: ladspa-devel
+BuildRequires: SDL-devel
-# https://bugzilla.gnome.org/show_bug.cgi?id=601108
+BuildRequires: slv2-devel
-BuildRequires: libglade2-devel
+BuildRequires: soundtouch-devel
+Buildrequires: wavpack-devel
+BuildRequires: wildmidi-devel
+BuildRequires: zbar-devel
 
 Obsoletes: gstreamer-plugins-flumpegdemux < 0.10.15-9
 Provides: gstreamer-plugins-flumpegdemux = %{version}-%{release}
@@ -86,7 +84,8 @@ well enough, or the code is not of good enough quality.
 Summary: Extra GStreamer "bad" plugins (less often used "bad" plugins)
 Group: Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
-Obsoletes: gstreamer-plugings-bad-extras < %{version}-%{release}
+Obsoletes: gstreamer-plugins-bad-extras < %{version}-%{release}
+Provides: gstreamer-plugins-bad-extras = %{version}-%{release}
 
 %description extras
 GStreamer is a streaming media framework, based on graphs of elements which
@@ -105,7 +104,8 @@ Summary: Development files for the GStreamer media framework "bad" plug-ins
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: gstreamer-plugins-base-devel
-Obsoletes: gstreamer-plugings-bad-devel < %{version}-%{release}
+Obsoletes: gstreamer-plugins-bad-devel < %{version}-%{release}
+Provides: gstreamer-plugins-bad-devel = %{version}-%{release}
 
 %description devel
 GStreamer is a streaming media framework, based on graphs of elements which
@@ -119,7 +119,8 @@ aren't tested well enough, or the code is not of good enough quality.
 Summary: Development documentation for the GStreamer "bad" plug-ins
 Group: Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
-Obsoletes: gstreamer-plugings-bad-devel-docs < %{version}-%{release}
+Obsoletes: gstreamer-plugins-bad-devel-docs < %{version}-%{release}
+Provides: gstreamer-plugins-bad-devel-docs = %{version}-%{release}
 
 %description devel-docs
 GStreamer is a streaming media framework, based on graphs of elements which
@@ -131,7 +132,6 @@ 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 .gtk-funcs
 
 %build
 %configure \
@@ -175,14 +175,17 @@ aren't tested well enough, or the code is not of good enough quality.
 %{_libdir}/libgstphotography-%{majorminor}.so.*
 %{_libdir}/libgstsignalprocessor-%{majorminor}.so.*
 # Plugins without external dependencies
-%{_libdir}/gstreamer-%{majorminor}/libgstaacparse.so
+
 %{_libdir}/gstreamer-%{majorminor}/libgstadpcmdec.so
+%{_libdir}/gstreamer-%{majorminor}/libgstadpcmenc.so
+%{_libdir}/gstreamer-%{majorminor}/libgstaudioparsersbad.so
 %{_libdir}/gstreamer-%{majorminor}/libgstaiff.so
-%{_libdir}/gstreamer-%{majorminor}/libgstamrparse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstautoconvert.so
 %{_libdir}/gstreamer-%{majorminor}/libgstbayer.so
 %{_libdir}/gstreamer-%{majorminor}/libgstcamerabin.so
 %{_libdir}/gstreamer-%{majorminor}/libgstcdxaparse.so
+%{_libdir}/gstreamer-%{majorminor}/libgstcog.so
+%{_libdir}/gstreamer-%{majorminor}/libgstdataurisrc.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdccp.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdtmf.so
 %{_libdir}/gstreamer-%{majorminor}/libgstfestival.so
@@ -191,6 +194,7 @@ aren't tested well enough, or the code is not of good enough quality.
 %{_libdir}/gstreamer-%{majorminor}/libgsth264parse.so
 %{_libdir}/gstreamer-%{majorminor}/libgsthdvparse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstid3tag.so
+%{_libdir}/gstreamer-%{majorminor}/libgstjpegformat.so
 %{_libdir}/gstreamer-%{majorminor}/libgstlegacyresample.so
 %{_libdir}/gstreamer-%{majorminor}/libgstliveadder.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrfbsrc.so
@@ -208,7 +212,6 @@ aren't tested well enough, or the code is not of good enough quality.
 %{_libdir}/gstreamer-%{majorminor}/libgstrawparse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstscaletempoplugin.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsdpelem.so
-%{_libdir}/gstreamer-%{majorminor}/libgstshapewipe.so
 %{_libdir}/gstreamer-%{majorminor}/libgstspeed.so
 %{_libdir}/gstreamer-%{majorminor}/libgststereo.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsubenc.so
@@ -272,11 +275,32 @@ aren't tested well enough, or the code is not of good enough quality.
 %{_includedir}/gstreamer-%{majorminor}/gst/signalprocessor
 %{_includedir}/gstreamer-%{majorminor}/gst/video
 
+# pkg-config files
+%{_libdir}/pkgconfig/gstreamer-plugins-bad-%{majorminor}.pc
+
 %files devel-docs
 %defattr(-,root,root,-)
 %doc %{_datadir}/gtk-doc/html/gst-plugins-bad-plugins-%{majorminor}
 
 %changelog
+* Thu Apr 15 2010 Benjamin Otte <otte@redhat.com> 0.10.18-2
+- Include cog plugin
+
+* Mon Mar 08 2010 Benjamin Otte <otte@redhat.com> 0.10.18-1
+- Update to 0.10.18
+
+* Thu Mar 04 2010 Benjamin Otte <otte@redhat.com> 0.10.17.4-1
+- Update pre-release
+
+* Mon Mar 01 2010 Benjamin Otte <otte@redhat.com> 0.10.17.3-2
+- Fix Obsoletes and add Provides for extras/devel/docs
+
+* Thu Feb 25 2010 Benjamin Otte <otte@redhat.com> 0.10.17.3-1
+- Update to pre-release
+
+* Fri Feb 19 2010 Benjamin Otte <otte@redhat.com> 0.10.17.2-1
+- Update to prerelease
+
 * Sun Feb 14 2010 Benjamin Otte <otte@redhat.com> 0.10.17-7
 - Fix compilation problems with DSO linking (#565015)
 

sources

@@ -1 +1 @@
-1b2785fb78a177612276615c5dc15406  gst-plugins-bad-free-0.10.17.tar.bz2
+d0db574627644527e473874f474f73ba  gst-plugins-bad-free-0.10.18.tar.bz2