commit ac320b510f9bcd0ea898d1aad4cfa48029153e5a Author: Bastien Nocera <hadess(a)fedoraproject.org&gt; Date: Mon Nov 30 15:41:02 2009 +0000 - Update to snapshot .cvsignore | 2 +- ...overlay-First-draw-outline-text-and-then-.patch | 47 + ...eep-timestamp-from-incoming-buffer-if-it-.patch | 36 + gstpb-fix-missing-plugins.patch | 2853 -------------------- gstpb-no-subtitle-errors.patch | 164 -- gstpb-playbin-proxy-volume.patch | 184 -- gstreamer-plugins-base.spec | 43 +- sources | 2 +- 8 files changed, 113 insertions(+), 3218 deletions(-) --- diff --git a/.cvsignore b/.cvsignore index 916451f..e493dda 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gst-plugins-base-0.10.25.tar.bz2 +gst-plugins-base-0.10.25.1-20091111.tar.bz2 diff --git a/0001-Revert-textoverlay-First-draw-outline-text-and-then-.patch b/0001-Revert-textoverlay-First-draw-outline-text-and-then-.patch new file mode 100644 index 0000000..71ab7f9 --- /dev/null +++ b/0001-Revert-textoverlay-First-draw-outline-text-and-then-.patch @@ -0,0 +1,47 @@ +From 83932577325d030bfa40a0c1dbc22683957b6b2a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege(a)collabora.co.uk&gt; +Date: Thu, 26 Nov 2009 14:30:33 +0100 +Subject: [PATCH 1/5] Revert "textoverlay: First draw outline text and then the real text" + +This reverts commit 60aa09d28c1f9fd29b56876d7ac6c0366d6cef4d. + +First drawing the real text and then the outline produces ugly +text in lower resolutions. The outline line width needs to be somehow +changed relative to the resolution. Fixes bug #602924. +--- + ext/pango/gsttextoverlay.c | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c +index a79cdd7..12428c6 100644 +--- a/ext/pango/gsttextoverlay.c ++++ b/ext/pango/gsttextoverlay.c +@@ -1253,12 +1253,6 @@ gst_text_overlay_render_pangocairo (GstTextOverlay * overlay, + pango_cairo_show_layout (cr, overlay->layout); + cairo_restore (cr); + +- /* draw text */ +- cairo_save (cr); +- cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); +- pango_cairo_show_layout (cr, overlay->layout); +- cairo_restore (cr); +- + /* draw outline text */ + cairo_save (cr); + cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); +@@ -1267,6 +1261,12 @@ gst_text_overlay_render_pangocairo (GstTextOverlay * overlay, + cairo_stroke (cr); + cairo_restore (cr); + ++ /* draw text */ ++ cairo_save (cr); ++ cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); ++ pango_cairo_show_layout (cr, overlay->layout); ++ cairo_restore (cr); ++ + cairo_destroy (cr); + cairo_surface_destroy (surface); + overlay->image_width = width; +-- +1.6.5.2 + diff --git a/0001-theoradec-Keep-timestamp-from-incoming-buffer-if-it-.patch b/0001-theoradec-Keep-timestamp-from-incoming-buffer-if-it-.patch new file mode 100644 index 0000000..e658b67 --- /dev/null +++ b/0001-theoradec-Keep-timestamp-from-incoming-buffer-if-it-.patch @@ -0,0 +1,36 @@ +From 05aa1959816516d69b32e134661de80916698ff7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.co.uk&gt; +Date: Wed, 11 Nov 2009 19:32:01 -0500 +Subject: [PATCH 01/59] theoradec: Keep timestamp from incoming buffer if it is valid + +Fixes bug #601627. +--- + ext/theora/theoradec.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ext/theora/theoradec.c b/ext/theora/theoradec.c +index 5a4a98d..96bacf2 100644 +--- a/ext/theora/theoradec.c ++++ b/ext/theora/theoradec.c +@@ -1333,15 +1333,15 @@ theora_dec_decode_buffer (GstTheoraDec * dec, GstBuffer * buf) + + GST_LOG_OBJECT (dec, "decode buffer of size %ld", packet.bytes); + +- if (dec->have_header) { ++ if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) { ++ dec->last_timestamp = GST_BUFFER_TIMESTAMP (buf); ++ } else if (dec->have_header) { + if (packet.granulepos != -1) { + dec->granulepos = packet.granulepos; + dec->last_timestamp = _theora_granule_start_time (dec, packet.granulepos); + } else if (dec->last_timestamp != -1) { + dec->last_timestamp = _theora_granule_start_time (dec, dec->granulepos); + } +- if (dec->last_timestamp == -1 && GST_BUFFER_TIMESTAMP_IS_VALID (buf)) +- dec->last_timestamp = GST_BUFFER_TIMESTAMP (buf); + } else { + dec->last_timestamp = -1; + } +-- +1.6.5.2 + diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec index 23bb8f8..d66b19d 100644 --- a/gstreamer-plugins-base.spec +++ b/gstreamer-plugins-base.spec @@ -2,14 +2,22 @@ %define majorminor 0.10 Name: %{gstreamer}-plugins-base -Version: 0.10.25 -Release: 5%{?dist} +Version: 0.10.25.1 +Release: 2%{?dist} Summary: GStreamer streaming media framework base plug-ins Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ -Source: http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{... +# Tarfile created using git +# git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-base +# git reset --hard %{gitversion} +# ./autogen.sh --enable-gtk-doc && make all dist +# mv gstreamer-%{version}.tar.gz gstreamer-%{version}-%{gitdate}.tar.gz +#Source: http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{... +%define gitdate 20091111 +%define git_version 1da5a3f +Source: gst-plugins-base-%{version}-%{gitdate}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{gstreamer} >= %{version} @@ -33,17 +41,18 @@ BuildRequires: gtk2-devel BuildRequires: pkgconfig Obsoletes: gstreamer-plugins -# https://bugzilla.gnome.org/show_bug.cgi?id=587704 -Patch0: gstpb-no-subtitle-errors.patch -# https://bugzilla.gnome.org/show_bug.cgi?id=591677 -Patch1: gstpb-fix-missing-plugins.patch # Revert http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=35cddfb... # We have a new enough pulsesink # https://bugzilla.gnome.org/show_bug.cgi?id=599105 -Patch2: pulsesink-disable-old-version-hack.patch +Patch1: pulsesink-disable-old-version-hack.patch Conflicts: gstreamer-plugins-good < 0.10.16-3 -# https://bugzilla.gnome.org/show_bug.cgi?id=596164#c12 -Patch3: gstpb-playbin-proxy-volume.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=537170 +# https://bugzilla.gnome.org/show_bug.cgi?id=601627 +Patch2: 0001-theoradec-Keep-timestamp-from-incoming-buffer-if-it-.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=537559 +# https://bugzilla.gnome.org/show_bug.cgi?id=602924 +Patch3: 0001-Revert-textoverlay-First-draw-outline-text-and-then-.patch # documentation BuildRequires: gtk-doc >= 1.3 @@ -61,10 +70,9 @@ This package contains a set of well-maintained base plug-ins. %prep %setup -q -n gst-plugins-base-%{version} -%patch0 -p1 -b .subtitle-errors -%patch1 -p1 -b .missing-plugins -%patch2 -p1 -R -b .old-pulsesink -%patch3 -p1 -b .volume-notify +%patch1 -p1 -b .old-pulsesink +%patch2 -p1 -b .theoradec-timestamps +%patch3 -p1 -b .text-overlay %build %configure \ @@ -133,7 +141,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux.so %{_libdir}/gstreamer-%{majorminor}/libgstaudioresample.so %{_libdir}/gstreamer-%{majorminor}/libgstgdp.so -%{_libdir}/gstreamer-%{majorminor}/libgstqueue2.so %{_libdir}/gstreamer-%{majorminor}/libgstgio.so %{_libdir}/gstreamer-%{majorminor}/libgstapp.so @@ -260,6 +267,12 @@ GStreamer Base Plugins library development and header files. %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog +* Mon Nov 30 2009 Bastien Nocera <bnocera(a)redhat.com&gt; 0.10.25.1-2 +- Update to snapshot + +* Fri Nov 06 2009 Bastien Nocera <bnocera(a)redhat.com&gt; 0.10.25-6 +- Fix hangs when loading a movie with an associated subtitle in Totem + * Tue Nov 03 2009 Bastien Nocera <bnocera(a)redhat.com&gt; 0.10.25-5 - Update volume notification patch diff --git a/sources b/sources index b920614..60f9163 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d29669dd79276c5cd94e1613c03cd9ab gst-plugins-base-0.10.25.tar.bz2 +1e7572ef5000bf424db1545992eeea53 gst-plugins-base-0.10.25.1-20091111.tar.bz2