rpms/gstreamer-plugins-base/F-9 gstpb-0.10.20-ogg-skeleton.patch, 1.1, 1.2 gstreamer-plugins-base.spec, 1.53, 1.54

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11306

Modified Files:
	gstpb-0.10.20-ogg-skeleton.patch gstreamer-plugins-base.spec 
Log Message:
* Tue Oct 28 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.19-4
- Fix patch to apply


gstpb-0.10.20-ogg-skeleton.patch:

Index: gstpb-0.10.20-ogg-skeleton.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-9/gstpb-0.10.20-ogg-skeleton.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gstpb-0.10.20-ogg-skeleton.patch	28 Oct 2008 18:36:34 -0000	1.1
+++ gstpb-0.10.20-ogg-skeleton.patch	28 Oct 2008 18:55:53 -0000	1.2
@@ -1,11 +1,6 @@
-Index: ext/ogg/gstoggdemux.c
-===================================================================
-RCS file: /cvs/gstreamer/gst-plugins-base/ext/ogg/gstoggdemux.c,v
-retrieving revision 1.195
-diff -u -r1.195 gstoggdemux.c
---- ext/ogg/gstoggdemux.c	7 Aug 2008 15:58:50 -0000	1.195
-+++ ext/ogg/gstoggdemux.c	9 Aug 2008 11:55:54 -0000
-@@ -1746,6 +1746,9 @@
+--- gst-plugins-base-0.10.19/ext/ogg/gstoggdemux.c.ogg-skel	2007-12-03 10:58:14.000000000 +0000
++++ gst-plugins-base-0.10.19/ext/ogg/gstoggdemux.c	2008-10-28 18:49:35.000000000 +0000
+@@ -1737,6 +1737,9 @@ gst_ogg_demux_deactivate_current_chain (
    for (i = 0; i < chain->streams->len; i++) {
      GstOggPad *pad = g_array_index (chain->streams, GstOggPad *, i);
  
@@ -15,14 +10,13 @@
      gst_pad_push_event (GST_PAD_CAST (pad), gst_event_new_eos ());
  
      GST_DEBUG_OBJECT (ogg, "removing pad %" GST_PTR_FORMAT, pad);
-@@ -1786,6 +1789,10 @@
-       GstOggPad *pad;
+@@ -1785,6 +1788,9 @@ gst_ogg_demux_activate_chain (GstOggDemu
+     pad = g_array_index (chain->streams, GstOggPad *, i);
+     GST_DEBUG_OBJECT (ogg, "adding pad %" GST_PTR_FORMAT, pad);
  
-       pad = g_array_index (chain->streams, GstOggPad *, i);
-+
-+      if (pad->is_skeleton)
-+        continue;
++    if (pad->is_skeleton)
++      continue;
 +
-       GST_DEBUG_OBJECT (ogg, "adding pad %" GST_PTR_FORMAT, pad);
- 
-       /* mark discont */
+     /* mark discont */
+     pad->discont = TRUE;
+     pad->last_ret = GST_FLOW_OK;


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/F-9/gstreamer-plugins-base.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gstreamer-plugins-base.spec	28 Oct 2008 18:36:34 -0000	1.53
+++ gstreamer-plugins-base.spec	28 Oct 2008 18:55:53 -0000	1.54
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.19
-Release:  	3%{?dist}	
+Release:  	4%{?dist}	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -57,7 +57,7 @@
 %setup -q -n gst-plugins-base-%{version}
 %patch0 -p1 -b .cd-speed
 %patch1 -p1 -b .alsasink
-%patch2 -p0 -b .ogg-skel
+%patch2 -p1 -b .ogg-skel
 
 %build
 %configure \
@@ -252,6 +252,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Tue Oct 28 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.19-4
+- Fix patch to apply
+
 * Tue Oct 28 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.19-3
 - Fix useless codeina popup when playing recent ogg files (#458404)