commit c5cdb5c97f191f41bc8c2efa0ea3673823c20ea7
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Feb 27 19:21:13 2017 +0000
Add upstream gcc-7 commit
asfdemux-Fix-compilation-with-gcc-7.patch | 31 +++++++++++++++++++++++++++++++
gstreamer1-plugins-ugly.spec | 5 ++++-
2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/asfdemux-Fix-compilation-with-gcc-7.patch
b/asfdemux-Fix-compilation-with-gcc-7.patch
new file mode 100644
index 0000000..56814e1
--- /dev/null
+++ b/asfdemux-Fix-compilation-with-gcc-7.patch
@@ -0,0 +1,31 @@
+From 66659f07f59ca9fcfdef7ae0531ffa681ee5b079 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian(a)centricular.com>
+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 47f940f..92768bc 100644
--- a/gstreamer1-plugins-ugly.spec
+++ b/gstreamer1-plugins-ugly.spec
@@ -6,6 +6,8 @@ License: LGPLv2+
Group: Applications/Multimedia
URL:
http://gstreamer.freedesktop.org/
Source0:
http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{...
+# 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
@@ -49,7 +51,7 @@ be shipped in gstreamer-plugins-good because:
%prep
-%autosetup -n gst-plugins-ugly-%{version}
+%autosetup -p1 -n gst-plugins-ugly-%{version}
%build
@@ -97,6 +99,7 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/*.la
%changelog
* Mon Feb 27 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.11.2-1
- Update to 1.11.2
+- Add upstream gcc-7 commit
* Mon Jan 16 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.11.1-1
- Update to 1.11.1