From da0845a04a271c3ba8bc3e337d3f519983f49b9a Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 27 Jun 2010 16:39:50 +0000 Subject: [PATCH] - Update to prerelease --- .cvsignore | 2 +- ...-queue2-don-t-wait-for-data-when-EOS.patch | 31 ------------------- gstreamer.spec | 13 ++++---- sources | 2 +- 4 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 0001-queue2-don-t-wait-for-data-when-EOS.patch diff --git a/.cvsignore b/.cvsignore index 71461e4..ac53555 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gstreamer-0.10.29.tar.bz2 +gstreamer-0.10.29.2.tar.bz2 diff --git a/0001-queue2-don-t-wait-for-data-when-EOS.patch b/0001-queue2-don-t-wait-for-data-when-EOS.patch deleted file mode 100644 index 3b1b27e..0000000 --- a/0001-queue2-don-t-wait-for-data-when-EOS.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 15141b3954fdfb46002783463f1cace148480fe9 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Mon, 7 Jun 2010 10:16:04 +0200 -Subject: [PATCH] queue2: don't wait for data when EOS - -When in download mode and we need to provide data for an offset that we don't -have, also perform a seek to the requested location when we are EOS. The reason -why we shouldn't wait for more data is because after EOS, there simply will be -no more data and we end up waiting forever. - -Fixes #620500 ---- - plugins/elements/gstqueue2.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c -index d3e8e2c..df8aaea 100644 ---- a/plugins/elements/gstqueue2.c -+++ b/plugins/elements/gstqueue2.c -@@ -1051,7 +1051,7 @@ gst_queue2_have_data (GstQueue2 * queue, guint64 offset, guint length) - GST_INFO_OBJECT (queue, "not found in any range"); - /* we don't have the range, see how far away we are, FIXME, find a good - * threshold based on the incomming rate. */ -- if (queue->current) { -+ if (!queue->is_eos && queue->current) { - if (offset < queue->current->writing_pos + 200000) { - update_cur_pos (queue, queue->current, offset + length); - GST_INFO_OBJECT (queue, "wait for data"); --- -1.7.0.1 - diff --git a/gstreamer.spec b/gstreamer.spec index 3864bf7..c3e9a5d 100644 --- a/gstreamer.spec +++ b/gstreamer.spec @@ -7,15 +7,15 @@ %define _gir-repository 0.6.5-6 Name: %{gstreamer} -Version: 0.10.29 +Version: 0.10.29.2 Release: 2%{?dist} Summary: GStreamer streaming media framework runtime Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ -#Source: http://gstreamer.freedesktop.org/src/gstreamer/pre/gstreamer-%{version}.tar.bz2 -Source: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.bz2 +Source: http://gstreamer.freedesktop.org/src/gstreamer/pre/gstreamer-%{version}.tar.bz2 +#Source: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gstreamer-tools >= %{version} @@ -42,9 +42,6 @@ Patch1: gstreamer-inspect-rpm-format.patch Source1: gstreamer.prov Source2: macros.gstreamer -# https://bugzilla.gnome.org/show_bug.cgi?id=620500 -Patch2: 0001-queue2-don-t-wait-for-data-when-EOS.patch - ### documentation requirements BuildRequires: python2 BuildRequires: openjade @@ -123,7 +120,6 @@ with different major/minor versions of GStreamer. %setup -q %patch1 -p1 -b .rpm-provides -%patch2 -p1 -b .wait-eos %build # 0.10.0: manuals do not build due to an openjade error; disable for now @@ -248,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor} %changelog +* Sun Jun 27 2010 Benjamin Otte 0.10.29.2-1 +- Update to prerelease + * Mon Jun 07 2010 Bastien Nocera 0.10.29-2 - Add patch to fix download buffering in Totem diff --git a/sources b/sources index d24ce9b..fcafd00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c92d6bce4fc65fa9d5a3ad35cdd1a466 gstreamer-0.10.29.tar.bz2 +3bc3d9950e805bb33ed7a974fd9d80cc gstreamer-0.10.29.2.tar.bz2