Update to 1.2.4.
- Drop old patches
This commit is contained in:
parent
83e108b8cb
commit
8a59733c13
1
.gitignore
vendored
1
.gitignore
vendored
@ -17,3 +17,4 @@
|
||||
/gst-plugins-good-1.2.1.tar.xz
|
||||
/gst-plugins-good-1.2.2.tar.xz
|
||||
/gst-plugins-good-1.2.3.tar.xz
|
||||
/gst-plugins-good-1.2.4.tar.xz
|
||||
|
@ -1,48 +0,0 @@
|
||||
From 577d87300906f961d13f76b44ba60fc40f0c637a Mon Sep 17 00:00:00 2001
|
||||
From: William Jon McCann <william.jon.mccann@gmail.com>
|
||||
Date: Fri, 14 Feb 2014 15:27:20 -0500
|
||||
Subject: [PATCH] docs: fix mismatched para tags
|
||||
|
||||
newer gtkdoc is more sensitive to mismatched docbook tags.
|
||||
This fixes the build in master.
|
||||
---
|
||||
gst/audiofx/audiocheblimit.c | 4 ++--
|
||||
gst/udp/gstudpsrc.c | 3 +--
|
||||
2 files changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gst/audiofx/audiocheblimit.c b/gst/audiofx/audiocheblimit.c
|
||||
index 549a9d2..e278886 100644
|
||||
--- a/gst/audiofx/audiocheblimit.c
|
||||
+++ b/gst/audiofx/audiocheblimit.c
|
||||
@@ -46,12 +46,12 @@
|
||||
* be at most this value. A lower ripple value will allow a faster rolloff.
|
||||
*
|
||||
* As a special case, a Chebyshev type 1 filter with no ripple is a Butterworth filter.
|
||||
- * </para>
|
||||
+ *
|
||||
* <note><para>
|
||||
* Be warned that a too large number of poles can produce noise. The most poles are possible with
|
||||
* a cutoff frequency at a quarter of the sampling rate.
|
||||
* </para></note>
|
||||
- * <para>
|
||||
+ *
|
||||
* <refsect2>
|
||||
* <title>Example launch line</title>
|
||||
* |[
|
||||
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
|
||||
index c2cbd92..7a24339 100644
|
||||
--- a/gst/udp/gstudpsrc.c
|
||||
+++ b/gst/udp/gstudpsrc.c
|
||||
@@ -78,8 +78,7 @@
|
||||
* </itemizedlist>
|
||||
* The message is typically used to detect that no UDP arrives in the receiver
|
||||
* because it is blocked by a firewall.
|
||||
- * </para>
|
||||
- * <para>
|
||||
+ *
|
||||
* A custom file descriptor can be configured with the
|
||||
* #GstUDPSrc:sockfd property. The socket will be closed when setting the
|
||||
* element to READY by default. This behaviour can be
|
||||
--
|
||||
1.8.5.3
|
||||
|
@ -1,37 +0,0 @@
|
||||
From 5f41f4683d50fce293d770ae35f3f9a0083744a6 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <rishi@gnu.org>
|
||||
Date: Tue, 6 Nov 2012 19:49:45 +0100
|
||||
Subject: [PATCH] v4l2src: Check for obj->pool == NULL
|
||||
|
||||
Not sure how it could happen and can not reproduce it either, but it
|
||||
did happen once during a VoIP call and the backtrace lays the blame
|
||||
on obj->pool being NULL.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=687793
|
||||
---
|
||||
sys/v4l2/gstv4l2src.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
|
||||
index 6197f78..58ff481 100644
|
||||
--- a/sys/v4l2/gstv4l2src.c
|
||||
+++ b/sys/v4l2/gstv4l2src.c
|
||||
@@ -763,11 +763,14 @@ gst_v4l2src_fill (GstPushSrc * src, GstBuffer * buf)
|
||||
{
|
||||
GstV4l2Src *v4l2src = GST_V4L2SRC (src);
|
||||
GstV4l2Object *obj = v4l2src->v4l2object;
|
||||
- GstFlowReturn ret;
|
||||
+ GstFlowReturn ret = GST_FLOW_ERROR;
|
||||
GstClock *clock;
|
||||
GstClockTime abs_time, base_time, timestamp, duration;
|
||||
GstClockTime delay;
|
||||
|
||||
+ if (G_UNLIKELY (obj->pool == NULL))
|
||||
+ goto error;
|
||||
+
|
||||
ret =
|
||||
gst_v4l2_buffer_pool_process (GST_V4L2_BUFFER_POOL_CAST (obj->pool), buf);
|
||||
|
||||
--
|
||||
1.7.12.1
|
||||
|
@ -8,15 +8,13 @@
|
||||
%endif
|
||||
|
||||
Name: gstreamer1-plugins-good
|
||||
Version: 1.2.3
|
||||
Release: 3%{?dist}
|
||||
Version: 1.2.4
|
||||
Release: 1%{?dist}
|
||||
Summary: GStreamer plugins with good code and licensing
|
||||
|
||||
License: LGPLv2+
|
||||
URL: http://gstreamer.freedesktop.org/
|
||||
Source0: http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.xz
|
||||
Patch3: 0001-v4l2src-Check-for-obj-pool-NULL.patch
|
||||
Patch4: 0001-docs-fix-mismatched-para-tags.patch
|
||||
|
||||
BuildRequires: gstreamer1-devel >= %{version}
|
||||
BuildRequires: gstreamer1-plugins-base-devel >= %{version}
|
||||
@ -86,9 +84,6 @@ to be installed.
|
||||
|
||||
%prep
|
||||
%setup -q -n gst-plugins-good-%{version}
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
|
||||
%build
|
||||
%configure \
|
||||
@ -207,6 +202,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jun 17 2014 Wim Taymans <wtaymans@redhat.com> - 1.2.4-1
|
||||
- Update to 1.2.4.
|
||||
- Drop old patches
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user