rpms/gstreamer-plugins-good/F-12 0001-Move-farsight-plugins-from-bad-to-good.patch, 1.1, 1.2 gstreamer-plugins-good.spec, 1.106, 1.107 autoconvert-fix-caps.patch, 1.1, NONE

Bastien Nocera hadess at fedoraproject.org
Thu Oct 22 15:32:30 UTC 2009


Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8607

Modified Files:
	0001-Move-farsight-plugins-from-bad-to-good.patch 
	gstreamer-plugins-good.spec 
Removed Files:
	autoconvert-fix-caps.patch 
Log Message:
* Thu Oct 22 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-5
- Update farsight plugins from -bad
- Drop copy/pasted rtpmanager plugin, it's now in -good


0001-Move-farsight-plugins-from-bad-to-good.patch:
 Makefile.am                           |    1 
 configure.ac                          |    6 
 farsight/Makefile.am                  |    1 
 farsight/autoconvert/Makefile.am      |    9 
 farsight/autoconvert/gstautoconvert.c | 1434 +++++++++++++++++++++++++++++++
 farsight/autoconvert/gstautoconvert.h |   65 +
 farsight/dtmf/Makefile.am             |   17 
 farsight/dtmf/gstdtmf.c               |   30 
 farsight/dtmf/gstdtmfsrc.c            |  935 ++++++++++++++++++++
 farsight/dtmf/gstdtmfsrc.h            |   98 ++
 farsight/dtmf/gstrtpdtmfcommon.h      |   23 
 farsight/dtmf/gstrtpdtmfdepay.c       |  555 ++++++++++++
 farsight/dtmf/gstrtpdtmfdepay.h       |   66 +
 farsight/dtmf/gstrtpdtmfsrc.c         | 1099 ++++++++++++++++++++++++
 farsight/dtmf/gstrtpdtmfsrc.h         |  112 ++
 farsight/liveadder/Makefile.am        |    9 
 farsight/liveadder/liveadder.c        | 1548 ++++++++++++++++++++++++++++++++++
 farsight/liveadder/liveadder.h        |  108 ++
 farsight/rtpmux/Makefile.am           |   11 
 farsight/rtpmux/gstrtpdtmfmux.c       |  326 +++++++
 farsight/rtpmux/gstrtpdtmfmux.h       |   68 +
 farsight/rtpmux/gstrtpmux.c           |  632 +++++++++++++
 farsight/rtpmux/gstrtpmux.h           |   78 +
 farsight/rtpmux/gstrtpmuxer.c         |   48 +
 farsight/valve/Makefile.am            |    9 
 farsight/valve/gstvalve.c             |  311 ++++++
 farsight/valve/gstvalve.h             |   83 +
 27 files changed, 7681 insertions(+), 1 deletion(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 0001-Move-farsight-plugins-from-bad-to-good.patchIndex: 0001-Move-farsight-plugins-from-bad-to-good.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-12/0001-Move-farsight-plugins-from-bad-to-good.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Move-farsight-plugins-from-bad-to-good.patch	22 Jun 2009 16:10:54 -0000	1.1
+++ 0001-Move-farsight-plugins-from-bad-to-good.patch	22 Oct 2009 15:32:30 -0000	1.2
@@ -1,61 +1,37 @@
-From 94f7caadf48775e70bd87fb6390193fe745cc967 Mon Sep 17 00:00:00 2001
+From 3f4951b983a9dfbec87ad57f69ade6829abbbab3 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Mon, 22 Jun 2009 16:09:04 +0100
 Subject: [PATCH] Move farsight plugins from -bad to -good
 
 ---
- Makefile.am                                |    1 +
- configure.ac                               |    7 +
- farsight/Makefile.am                       |    1 +
- farsight/autoconvert/Makefile.am           |    9 +
- farsight/autoconvert/gstautoconvert.c      | 1383 +++++++++++++++
- farsight/autoconvert/gstautoconvert.h      |   63 +
- farsight/dtmf/Makefile.am                  |   17 +
- farsight/dtmf/gstdtmf.c                    |   30 +
- farsight/dtmf/gstdtmfsrc.c                 |  929 ++++++++++
- farsight/dtmf/gstdtmfsrc.h                 |   98 ++
- farsight/dtmf/gstrtpdtmfcommon.h           |   23 +
- farsight/dtmf/gstrtpdtmfdepay.c            |  554 ++++++
- farsight/dtmf/gstrtpdtmfdepay.h            |   66 +
- farsight/dtmf/gstrtpdtmfsrc.c              | 1087 ++++++++++++
- farsight/dtmf/gstrtpdtmfsrc.h              |  112 ++
- farsight/liveadder/Makefile.am             |    9 +
- farsight/liveadder/liveadder.c             | 1549 +++++++++++++++++
- farsight/liveadder/liveadder.h             |  108 ++
- farsight/rtpmanager/.gitignore             |    2 +
- farsight/rtpmanager/Makefile.am            |   51 +
- farsight/rtpmanager/gstrtpbin-marshal.list |    8 +
- farsight/rtpmanager/gstrtpbin.c            | 2582 ++++++++++++++++++++++++++++
- farsight/rtpmanager/gstrtpbin.h            |   88 +
- farsight/rtpmanager/gstrtpclient.c         |  484 ++++++
- farsight/rtpmanager/gstrtpclient.h         |   56 +
- farsight/rtpmanager/gstrtpjitterbuffer.c   | 1973 +++++++++++++++++++++
- farsight/rtpmanager/gstrtpjitterbuffer.h   |   88 +
- farsight/rtpmanager/gstrtpmanager.c        |   65 +
- farsight/rtpmanager/gstrtpptdemux.c        |  492 ++++++
- farsight/rtpmanager/gstrtpptdemux.h        |   62 +
- farsight/rtpmanager/gstrtpsession.c        | 1998 +++++++++++++++++++++
- farsight/rtpmanager/gstrtpsession.h        |   81 +
- farsight/rtpmanager/gstrtpssrcdemux.c      |  722 ++++++++
- farsight/rtpmanager/gstrtpssrcdemux.h      |   62 +
- farsight/rtpmanager/rtpjitterbuffer.c      |  593 +++++++
- farsight/rtpmanager/rtpjitterbuffer.h      |  101 ++
- farsight/rtpmanager/rtpsession.c           | 2551 +++++++++++++++++++++++++++
- farsight/rtpmanager/rtpsession.h           |  303 ++++
- farsight/rtpmanager/rtpsource.c            | 1557 +++++++++++++++++
- farsight/rtpmanager/rtpsource.h            |  223 +++
- farsight/rtpmanager/rtpstats.c             |  176 ++
- farsight/rtpmanager/rtpstats.h             |  195 +++
- farsight/rtpmux/Makefile.am                |   11 +
- farsight/rtpmux/gstrtpdtmfmux.c            |  326 ++++
- farsight/rtpmux/gstrtpdtmfmux.h            |   68 +
- farsight/rtpmux/gstrtpmux.c                |  613 +++++++
- farsight/rtpmux/gstrtpmux.h                |   78 +
- farsight/rtpmux/gstrtpmuxer.c              |   48 +
- farsight/valve/Makefile.am                 |    9 +
- farsight/valve/gstvalve.c                  |  311 ++++
- farsight/valve/gstvalve.h                  |   82 +
- 52 files changed, 22106 insertions(+), 1 deletions(-)
+ Makefile.am                           |    1 +
+ configure.ac                          |    6 +
+ farsight/Makefile.am                  |    1 +
+ farsight/autoconvert/Makefile.am      |    9 +
+ farsight/autoconvert/gstautoconvert.c | 1434 ++++++++++++++++++++++++++++++
+ farsight/autoconvert/gstautoconvert.h |   65 ++
+ farsight/dtmf/Makefile.am             |   17 +
+ farsight/dtmf/gstdtmf.c               |   30 +
+ farsight/dtmf/gstdtmfsrc.c            |  935 ++++++++++++++++++++
+ farsight/dtmf/gstdtmfsrc.h            |   98 +++
+ farsight/dtmf/gstrtpdtmfcommon.h      |   23 +
+ farsight/dtmf/gstrtpdtmfdepay.c       |  555 ++++++++++++
+ farsight/dtmf/gstrtpdtmfdepay.h       |   66 ++
+ farsight/dtmf/gstrtpdtmfsrc.c         | 1099 +++++++++++++++++++++++
+ farsight/dtmf/gstrtpdtmfsrc.h         |  112 +++
+ farsight/liveadder/Makefile.am        |    9 +
+ farsight/liveadder/liveadder.c        | 1548 +++++++++++++++++++++++++++++++++
+ farsight/liveadder/liveadder.h        |  108 +++
+ farsight/rtpmux/Makefile.am           |   11 +
+ farsight/rtpmux/gstrtpdtmfmux.c       |  326 +++++++
+ farsight/rtpmux/gstrtpdtmfmux.h       |   68 ++
+ farsight/rtpmux/gstrtpmux.c           |  632 ++++++++++++++
+ farsight/rtpmux/gstrtpmux.h           |   78 ++
+ farsight/rtpmux/gstrtpmuxer.c         |   48 +
+ farsight/valve/Makefile.am            |    9 +
+ farsight/valve/gstvalve.c             |  311 +++++++
+ farsight/valve/gstvalve.h             |   82 ++
+ 27 files changed, 7681 insertions(+), 0 deletions(-)
  create mode 100644 farsight/Makefile.am
  create mode 100644 farsight/autoconvert/Makefile.am
  create mode 100644 farsight/autoconvert/gstautoconvert.c
@@ -72,30 +48,6 @@ Subject: [PATCH] Move farsight plugins f
  create mode 100644 farsight/liveadder/Makefile.am
  create mode 100644 farsight/liveadder/liveadder.c
  create mode 100644 farsight/liveadder/liveadder.h
- create mode 100644 farsight/rtpmanager/.gitignore
- create mode 100644 farsight/rtpmanager/Makefile.am
- create mode 100644 farsight/rtpmanager/gstrtpbin-marshal.list
- create mode 100644 farsight/rtpmanager/gstrtpbin.c
- create mode 100644 farsight/rtpmanager/gstrtpbin.h
- create mode 100644 farsight/rtpmanager/gstrtpclient.c
- create mode 100644 farsight/rtpmanager/gstrtpclient.h
- create mode 100644 farsight/rtpmanager/gstrtpjitterbuffer.c
- create mode 100644 farsight/rtpmanager/gstrtpjitterbuffer.h
- create mode 100644 farsight/rtpmanager/gstrtpmanager.c
- create mode 100644 farsight/rtpmanager/gstrtpptdemux.c
- create mode 100644 farsight/rtpmanager/gstrtpptdemux.h
- create mode 100644 farsight/rtpmanager/gstrtpsession.c
- create mode 100644 farsight/rtpmanager/gstrtpsession.h
- create mode 100644 farsight/rtpmanager/gstrtpssrcdemux.c
- create mode 100644 farsight/rtpmanager/gstrtpssrcdemux.h
- create mode 100644 farsight/rtpmanager/rtpjitterbuffer.c
- create mode 100644 farsight/rtpmanager/rtpjitterbuffer.h
- create mode 100644 farsight/rtpmanager/rtpsession.c
- create mode 100644 farsight/rtpmanager/rtpsession.h
- create mode 100644 farsight/rtpmanager/rtpsource.c
- create mode 100644 farsight/rtpmanager/rtpsource.h
- create mode 100644 farsight/rtpmanager/rtpstats.c
- create mode 100644 farsight/rtpmanager/rtpstats.h
  create mode 100644 farsight/rtpmux/Makefile.am
  create mode 100644 farsight/rtpmux/gstrtpdtmfmux.c
  create mode 100644 farsight/rtpmux/gstrtpdtmfmux.h
@@ -119,16 +71,15 @@ index 4247a97..997881b 100644
  	docs			\
  	po			\
 diff --git a/configure.ac b/configure.ac
-index fb9bbf8..28c0f31 100644
+index 36b3884..c8e111b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1080,6 +1080,13 @@ sys/osxvideo/Makefile
+@@ -1117,6 +1117,12 @@ sys/osxvideo/Makefile
  sys/v4l2/Makefile
  sys/waveform/Makefile
  sys/ximage/Makefile
 +farsight/Makefile
 +farsight/valve/Makefile
-+farsight/rtpmanager/Makefile
 +farsight/liveadder/Makefile
 +farsight/dtmf/Makefile
 +farsight/rtpmux/Makefile
@@ -138,11 +89,11 @@ index fb9bbf8..28c0f31 100644
  tests/check/Makefile
 diff --git a/farsight/Makefile.am b/farsight/Makefile.am
 new file mode 100644
-index 0000000..00b6dd3
+index 0000000..a5fac23
 --- /dev/null
 +++ b/farsight/Makefile.am
 @@ -0,0 +1 @@
-+SUBDIRS = autoconvert dtmf liveadder rtpmanager rtpmux valve
++SUBDIRS = autoconvert dtmf liveadder rtpmux valve
 diff --git a/farsight/autoconvert/Makefile.am b/farsight/autoconvert/Makefile.am
 new file mode 100644
 index 0000000..22e8a67
@@ -160,10 +111,10 @@ index 0000000..22e8a67
 +
 diff --git a/farsight/autoconvert/gstautoconvert.c b/farsight/autoconvert/gstautoconvert.c
 new file mode 100644
-index 0000000..4311003
+index 0000000..55f4719
 --- /dev/null
 +++ b/farsight/autoconvert/gstautoconvert.c
-@@ -0,0 +1,1383 @@
+@@ -0,0 +1,1434 @@
 +/* GStreamer
 + *
 + *  Copyright 2007-2008 Collabora Ltd
@@ -212,13 +163,6 @@ index 0000000..4311003
 +#define GST_CAT_DEFAULT (autoconvert_debug)
 +
 +/* elementfactory information */
-+static const GstElementDetails gst_auto_convert_details =
-+GST_ELEMENT_DETAILS ("Select convertor based on caps",
-+    "Generic/Bin",
-+    "Selects the right transform element based on the caps",
-+    "Olivier Crete <olivier.crete at collabora.co.uk>");
-+
-+
 +static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
 +    GST_PAD_SINK,
 +    GST_PAD_ALWAYS,
@@ -229,7 +173,6 @@ index 0000000..4311003
 +    GST_PAD_ALWAYS,
 +    GST_STATIC_CAPS_ANY);
 +
-+
 +static GstStaticPadTemplate sink_internal_template =
 +GST_STATIC_PAD_TEMPLATE ("sink_internal",
 +    GST_PAD_SINK,
@@ -252,16 +195,18 @@ index 0000000..4311003
 +enum
[...15537 lines suppressed...]
-@@ -0,0 +1,613 @@
+@@ -0,0 +1,632 @@
 +/* RTP muxer element for GStreamer
 + *
 + * gstrtpmux.c:
@@ -21441,10 +6806,9 @@ index 0000000..82d4b00
 +    GST_STATIC_CAPS ("application/x-rtp")
 +    );
 +
-+static void gst_rtp_mux_finalize (GObject * object);
-+
 +static GstPad *gst_rtp_mux_request_new_pad (GstElement * element,
 +    GstPadTemplate * templ, const gchar * name);
++static void gst_rtp_mux_release_pad (GstElement * element, GstPad * pad);
 +static GstFlowReturn gst_rtp_mux_chain (GstPad * pad, GstBuffer * buffer);
 +static gboolean gst_rtp_mux_setcaps (GstPad * pad, GstCaps * caps);
 +static GstCaps *gst_rtp_mux_getcaps (GstPad * pad);
@@ -21482,7 +6846,6 @@ index 0000000..82d4b00
 +  gobject_class = (GObjectClass *) klass;
 +  gstelement_class = (GstElementClass *) klass;
 +
-+  gobject_class->finalize = gst_rtp_mux_finalize;
 +  gobject_class->get_property = gst_rtp_mux_get_property;
 +  gobject_class->set_property = gst_rtp_mux_set_property;
 +
@@ -21506,6 +6869,7 @@ index 0000000..82d4b00
 +
 +  gstelement_class->request_new_pad =
 +      GST_DEBUG_FUNCPTR (gst_rtp_mux_request_new_pad);
++  gstelement_class->release_pad = GST_DEBUG_FUNCPTR (gst_rtp_mux_release_pad);
 +  gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_rtp_mux_change_state);
 +
 +  klass->chain_func = gst_rtp_mux_chain;
@@ -21567,16 +6931,6 @@ index 0000000..82d4b00
 +  object->seqnum_offset = DEFAULT_SEQNUM_OFFSET;
 +}
 +
-+static void
-+gst_rtp_mux_finalize (GObject * object)
-+{
-+  GstRTPMux *rtp_mux;
-+
-+  rtp_mux = GST_RTP_MUX (object);
-+
-+  G_OBJECT_CLASS (parent_class)->finalize (object);
-+}
-+
 +static GstPad *
 +gst_rtp_mux_create_sinkpad (GstRTPMux * rtp_mux, GstPadTemplate * templ)
 +{
@@ -21604,15 +6958,6 @@ index 0000000..82d4b00
 +}
 +
 +static void
-+free_pad_private (gpointer data, GObject * where_the_object_was)
-+{
-+  GstRTPMuxPadPrivate *padpriv = data;
-+
-+  gst_caps_replace (&padpriv->out_caps, NULL);
-+  g_slice_free (GstRTPMuxPadPrivate, padpriv);
-+}
-+
-+static void
 +gst_rtp_mux_setup_sinkpad (GstRTPMux * rtp_mux, GstPad * sinkpad)
 +{
 +  GstRTPMuxClass *klass;
@@ -21632,7 +6977,6 @@ index 0000000..82d4b00
 +  gst_pad_set_active (sinkpad, TRUE);
 +
 +  gst_pad_set_element_private (sinkpad, padpriv);
-+  g_object_weak_ref (G_OBJECT (sinkpad), free_pad_private, padpriv);
 +
 +  /* dd the pad to the element */
 +  gst_element_add_pad (GST_ELEMENT (rtp_mux), sinkpad);
@@ -21664,6 +7008,24 @@ index 0000000..82d4b00
 +  return newpad;
 +}
 +
++static void
++gst_rtp_mux_release_pad (GstElement * element, GstPad * pad)
++{
++  GstRTPMuxPadPrivate *padpriv;
++
++  GST_OBJECT_LOCK (element);
++  padpriv = gst_pad_get_element_private (pad);
++  gst_pad_set_element_private (pad, NULL);
++  GST_OBJECT_UNLOCK (element);
++
++  gst_element_remove_pad (element, pad);
++
++  if (padpriv) {
++    gst_caps_replace (&padpriv->out_caps, NULL);
++    g_slice_free (GstRTPMuxPadPrivate, padpriv);
++  }
++}
++
 +/* Put our own clock-base on the buffer */
 +static void
 +gst_rtp_mux_readjust_rtp_timestamp (GstRTPMux * rtp_mux, GstPad * pad,
@@ -21671,10 +7033,14 @@ index 0000000..82d4b00
 +{
 +  guint32 ts;
 +  guint32 sink_ts_base = 0;
-+  GstRTPMuxPadPrivate *padpriv = gst_pad_get_element_private (pad);
++  GstRTPMuxPadPrivate *padpriv;
 +
-+  if (padpriv->have_clock_base)
++
++  GST_OBJECT_LOCK (rtp_mux);
++  padpriv = gst_pad_get_element_private (pad);
++  if (padpriv && padpriv->have_clock_base)
 +    sink_ts_base = padpriv->clock_base;
++  GST_OBJECT_UNLOCK (rtp_mux);
 +
 +  ts = gst_rtp_buffer_get_timestamp (buffer) - sink_ts_base + rtp_mux->ts_base;
 +  GST_LOG_OBJECT (rtp_mux, "Re-adjusting RTP ts %u to %u",
@@ -21687,7 +7053,7 @@ index 0000000..82d4b00
 +{
 +  GstRTPMux *rtp_mux;
 +  GstFlowReturn ret;
-+  GstRTPMuxPadPrivate *padpriv = gst_pad_get_element_private (pad);
++  GstRTPMuxPadPrivate *padpriv;
 +
 +  rtp_mux = GST_RTP_MUX (gst_pad_get_parent (pad));
 +
@@ -21702,6 +7068,9 @@ index 0000000..82d4b00
 +  GST_OBJECT_LOCK (rtp_mux);
 +  rtp_mux->seqnum++;
 +  gst_rtp_buffer_set_seq (buffer, rtp_mux->seqnum);
++  padpriv = gst_pad_get_element_private (pad);
++  if (padpriv)
++    gst_buffer_set_caps (buffer, padpriv->out_caps);
 +  GST_OBJECT_UNLOCK (rtp_mux);
 +  gst_rtp_buffer_set_ssrc (buffer, rtp_mux->current_ssrc);
 +  gst_rtp_mux_readjust_rtp_timestamp (rtp_mux, pad, buffer);
@@ -21709,10 +7078,16 @@ index 0000000..82d4b00
 +      GST_BUFFER_SIZE (buffer), rtp_mux->seqnum,
 +      gst_rtp_buffer_get_timestamp (buffer));
 +
-+  gst_buffer_set_caps (buffer, padpriv->out_caps);
++  if (!padpriv) {
++    ret = GST_FLOW_NOT_LINKED;
++    gst_buffer_unref (buffer);
++    goto out;
++  }
 +
 +  ret = gst_pad_push (rtp_mux->srcpad, buffer);
 +
++out:
++
 +  gst_object_unref (rtp_mux);
 +  return ret;
 +}
@@ -21723,7 +7098,7 @@ index 0000000..82d4b00
 +  GstRTPMux *rtp_mux;
 +  GstStructure *structure;
 +  gboolean ret = FALSE;
-+  GstRTPMuxPadPrivate *padpriv = gst_pad_get_element_private (pad);
++  GstRTPMuxPadPrivate *padpriv;
 +
 +  rtp_mux = GST_RTP_MUX (gst_pad_get_parent (pad));
 +
@@ -21732,9 +7107,13 @@ index 0000000..82d4b00
 +  if (!structure)
 +    goto out;
 +
-+  if (gst_structure_get_uint (structure, "clock-base", &padpriv->clock_base)) {
++  GST_OBJECT_LOCK (rtp_mux);
++  padpriv = gst_pad_get_element_private (pad);
++  if (padpriv &&
++      gst_structure_get_uint (structure, "clock-base", &padpriv->clock_base)) {
 +    padpriv->have_clock_base = TRUE;
 +  }
++  GST_OBJECT_UNLOCK (rtp_mux);
 +
 +  caps = gst_caps_copy (caps);
 +
@@ -21746,8 +7125,13 @@ index 0000000..82d4b00
 +      "setting caps %" GST_PTR_FORMAT " on src pad..", caps);
 +  ret = gst_pad_set_caps (rtp_mux->srcpad, caps);
 +
-+  if (ret)
-+    gst_caps_replace (&padpriv->out_caps, caps);
++  if (ret) {
++    GST_OBJECT_LOCK (rtp_mux);
++    padpriv = gst_pad_get_element_private (pad);
++    if (padpriv)
++      gst_caps_replace (&padpriv->out_caps, caps);
++    GST_OBJECT_UNLOCK (rtp_mux);
++  }
 +  gst_caps_unref (caps);
 +
 +out:
@@ -22528,5 +7912,5 @@ index 0000000..cc7cd38
 +G_END_DECLS
 +#endif /* __GST_VALVE_H__ */
 -- 
-1.6.2.2
+1.6.5.rc2
 


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-12/gstreamer-plugins-good.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- gstreamer-plugins-good.spec	19 Oct 2009 14:27:27 -0000	1.106
+++ gstreamer-plugins-good.spec	22 Oct 2009 15:32:30 -0000	1.107
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.16
-Release:  	4%{?dist}
+Release:  	5%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -68,7 +68,6 @@ Obsoletes: gstreamer-plugins-pulse < 0.9
 # farsight plugins
 Patch0: 0001-Move-farsight-plugins-from-bad-to-good.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=575568#c22
-Patch1: autoconvert-fix-caps.patch
 BuildRequires: automake autoconf libtool
 Provides: gstreamer-plugins-farsight = 0.12.12-1
 Obsoletes: gstreamer-plugins-farsight < 0.12.12
@@ -112,7 +111,6 @@ This is a dummy package to make gstreame
 
 # Farsight plugins
 %patch0 -p1 -b .farsight
-%patch1 -p1 -b .autoconvert-caps
 libtoolize -f
 autoreconf
 %patch2 -p1 -b .volume-lowering
@@ -240,6 +238,7 @@ rm -rf $RPM_BUILD_ROOT
 # %{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
 # %{_libdir}/gstreamer-%{majorminor}/libgstaasink.so
 %{_libdir}/gstreamer-%{majorminor}/libgstpulse.so
+%{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so
 
 %ifnarch s390 s390x
 %{_libdir}/gstreamer-%{majorminor}/libgstdv.so
@@ -250,7 +249,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-%{majorminor}/libgstautoconvert.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdtmf.so
 %{_libdir}/gstreamer-%{majorminor}/libgstliveadder.so
-%{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrtpmux.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvalve.so
 
@@ -279,6 +277,10 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Thu Oct 22 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-5
+- Update farsight plugins from -bad
+- Drop copy/pasted rtpmanager plugin, it's now in -good
+
 * Mon Oct 19 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-4
 - Fix pulsesink not advertising the StreamVolume interface
 


--- autoconvert-fix-caps.patch DELETED ---




More information about the fedora-extras-commits mailing list