summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-05 13:34:54 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-07 17:30:01 +0000
commitfc81c805367930e6a70eac3aea57b002db3743bb (patch)
treef50cc314719a6f80697fa5c8109fea32ff88b868
parent3f024740df18e53ef5f9f3bad89968abae1664ec (diff)
downloadpoky-fc81c805367930e6a70eac3aea57b002db3743bb.tar.gz
gstreamer1.0-plugins-bad_git: avoid including <sys/poll.h> directly
musl libc generates warnings if <sys/poll.h> is included directly. The warnings only cause problems for the git versions (-Werror is turned off for GStreamer stable releases). (From OE-Core rev: 7ed1c70b1ad13cc0850d5e637638569a687cef5e) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch30
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
new file mode 100644
index 0000000000..357fd78002
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
@@ -0,0 +1,30 @@
1From 72561a0fca562d03567ace7b4cfc94992cd6525c Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Wed, 3 Feb 2016 18:05:41 -0800
4Subject: [PATCH] avoid including <sys/poll.h> directly
5
6musl libc generates warnings if <sys/poll.h> is included directly.
7
8Upstream-Status: Pending
9
10Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
11---
12 sys/dvb/gstdvbsrc.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
16index b93255f..49f145a 100644
17--- a/sys/dvb/gstdvbsrc.c
18+++ b/sys/dvb/gstdvbsrc.c
19@@ -93,7 +93,7 @@
20 #include <gst/gst.h>
21 #include <gst/glib-compat-private.h>
22 #include <sys/ioctl.h>
23-#include <sys/poll.h>
24+#include <poll.h>
25 #include <fcntl.h>
26 #include <errno.h>
27 #include <stdio.h>
28--
291.9.1
30
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
index 99690a3b81..0ebf62227e 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
@@ -12,6 +12,7 @@ SRC_URI = " \
12 git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \ 12 git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \
13 file://configure-allow-to-disable-libssh2.patch \ 13 file://configure-allow-to-disable-libssh2.patch \
14 file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ 14 file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \
15 file://avoid-including-sys-poll.h-directly.patch \
15" 16"
16 17
17PV = "1.7.1+git${SRCPV}" 18PV = "1.7.1+git${SRCPV}"