diff --git a/asfdemux-Fix-compilation-with-gcc-7.patch b/asfdemux-Fix-compilation-with-gcc-7.patch deleted file mode 100644 index 56814e1..0000000 --- a/asfdemux-Fix-compilation-with-gcc-7.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 66659f07f59ca9fcfdef7ae0531ffa681ee5b079 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Mon, 27 Feb 2017 20:55:34 +0200 -Subject: [PATCH] asfdemux: Fix compilation with gcc 7 - -gstasfdemux.c: In function 'gst_asf_demux_parse_stream_object': -gstasfdemux.c:3001:39: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context] - is_encrypted = ! !((flags & 0x8000) << 15); - ~~~~~~~~~~~~~~~~~~^~~~~~ - -https://bugzilla.gnome.org/show_bug.cgi?id=779329 ---- - gst/asfdemux/gstasfdemux.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c -index b8d48ad6..5afeaabb 100644 ---- a/gst/asfdemux/gstasfdemux.c -+++ b/gst/asfdemux/gstasfdemux.c -@@ -2998,7 +2998,7 @@ gst_asf_demux_parse_stream_object (GstASFDemux * demux, guint8 * data, - - flags = gst_asf_demux_get_uint16 (&data, &size); - stream_id = flags & 0x7f; -- is_encrypted = ! !((flags & 0x8000) << 15); -+ is_encrypted = ! !(flags & 0x8000); - unknown = gst_asf_demux_get_uint32 (&data, &size); - - GST_DEBUG_OBJECT (demux, "Found stream %u, time_offset=%" GST_TIME_FORMAT, --- -2.11.1 - diff --git a/gstreamer1-plugins-ugly.spec b/gstreamer1-plugins-ugly.spec index ee69df6..6a607a7 100644 --- a/gstreamer1-plugins-ugly.spec +++ b/gstreamer1-plugins-ugly.spec @@ -1,13 +1,12 @@ Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins Name: gstreamer1-plugins-ugly -Version: 1.11.2 -Release: 2%{?dist} +Version: 1.11.90 +Release: 1%{?dist} License: LGPLv2+ Group: Applications/Multimedia URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{version}.tar.xz -# Upstream fix -Patch0: asfdemux-Fix-compilation-with-gcc-7.patch + BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: gettext-devel gtk-doc @@ -78,7 +77,7 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/*.la %{_libdir}/gstreamer-1.0/libgstasf.so %{_libdir}/gstreamer-1.0/libgstdvdlpcmdec.so %{_libdir}/gstreamer-1.0/libgstdvdsub.so -%{_libdir}/gstreamer-1.0/libgstrmdemux.so +%{_libdir}/gstreamer-1.0/libgstrealmedia.so %{_libdir}/gstreamer-1.0/libgstxingmux.so # Plugins with external dependencies %{_libdir}/gstreamer-1.0/libgsta52dec.so @@ -97,6 +96,10 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/*.la %changelog +* Tue Apr 18 2017 Leigh Scott - 1.11.90-1 +- Update to 1.11.90 +- Upstream renamed libgstrmdemux.so to libgstrealmedia.so + * Sun Mar 19 2017 RPM Fusion Release Engineering - 1.11.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 301b863..408ffa1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7afd2d1df8789f918fb533bc023a467 gst-plugins-ugly-1.11.2.tar.xz +ee77bed21e4dbe35e220675b91deca8e gst-plugins-ugly-1.11.90.tar.xz