Author: jwrdegoede Update of /cvs/free/rpms/gstreamer-plugins-bad/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23095 Modified Files: gstreamer-plugins-bad.spec Added Files: 0001-fix-faad2-version-check.patch Log Message: * Wed May 27 2015 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 0.10.23-7 - Add a patch from upstream fixing a faad2 crash (rf3664) 0001-fix-faad2-version-check.patch: configure.ac | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- NEW FILE 0001-fix-faad2-version-check.patch --- From: Wim Taymans <wtaymans(a)redhat.com&gt; Date: Wed, 13 May 2015 16:23:26 +0200 Subject: fix faad2 version check On fedora 22, the output of cpp inserts extra debug comments, which makes our regexp for the faad2 version check fail. This in turn causes it to compile with the wrong arguments passed which then causes stack corruption and crashes. Fix this by only checking for the version (which should be by itself on a single line). This is potentially less safe, it might be possible that a similar string would appear in a later version in the header file. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=748571 diff --git a/configure.ac b/configure.ac index 29b10a6..ceaf31f 100644 --- a/configure.ac +++ b/configure.ac @@ -1132,9 +1132,9 @@ AG_GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [ AC_MSG_CHECKING([Checking FAAD2 version in $faad_hdr]) for minor in 10 9 8 7 6 5 0; do if test x$faad2_minor_version = "x"; then - AC_EGREP_CPP([GST_CHECK_FAAD_VERSION \"2\.$minor\"], [ + AC_EGREP_CPP([\"2\.$minor\"$], [ #include <$faad_hdr> - GST_CHECK_FAAD_VERSION FAAD2_VERSION + FAAD2_VERSION ], [ faad2_minor_version=$minor ]) -- cgit v0.10.2 Index: gstreamer-plugins-bad.spec =================================================================== RCS file: /cvs/free/rpms/gstreamer-plugins-bad/devel/gstreamer-plugins-bad.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- gstreamer-plugins-bad.spec 1 Sep 2014 02:20:54 -0000 1.52 +++ gstreamer-plugins-bad.spec 27 May 2015 15:31:18 -0000 1.53 @@ -15,11 +15,12 @@ Summary: GStreamer streaming media framework "bad" plug-ins Name: gstreamer-plugins-bad Version: 0.10.23 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ Group: Applications/Multimedia URL: http://gstreamer.freedesktop.org/ Source: http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{ve... +Patch1: 0001-fix-faad2-version-check.patch Requires: %{gstreamer} >= %{gst_minver} # Drag in the free plugins which are in Fedora now, for upgrade path Requires: gstreamer-plugins-bad-free >= %{version} @@ -40,6 +41,8 @@ BuildRequires: libmimic-devel BuildRequires: librtmp-devel BuildRequires: vo-amrwbenc-devel +# For autoreconf +BuildRequires: libtool %description GStreamer is a streaming media framework, based on graphs of elements which @@ -51,6 +54,9 @@ %prep %setup -q -n gst-plugins-bad-%{version} +%patch1 -p1 +# For patch1 +autoreconf -ivf %build @@ -82,7 +88,6 @@ %files -%defattr(-,root,root,-) %doc AUTHORS COPYING README REQUIREMENTS # Take the whole dir for proper dir ownership (shared with other plugin pkgs) %{_datadir}/gstreamer-0.10 @@ -107,6 +112,9 @@ %changelog +* Wed May 27 2015 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 0.10.23-7 +- Add a patch from upstream fixing a faad2 crash (rf3664) + * Mon Sep 01 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 0.10.23-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild @@ -357,7 +365,7 @@ - Re-add devel package now that we have a main shared lib and header files. - Add check build requirement. -* Wed Mar 30 2007 Matthias Saou <http://freshrpms.net/> 0.10.4-1 +* Fri Mar 30 2007 Matthias Saou <http://freshrpms.net/> 0.10.4-1 - Update to 0.10.4 for F7. - Disable swfdec... does anything/anyone even use it here? Once it stabilizes somewhat more, maybe then it'll be worth re-enabling.