summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/ensure-valid-sentinel-for-gst_structure_get.patch40
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb1
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/ensure-valid-sentinel-for-gst_structure_get.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/ensure-valid-sentinel-for-gst_structure_get.patch
new file mode 100644
index 0000000000..bc7ac0b6a1
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/ensure-valid-sentinel-for-gst_structure_get.patch
@@ -0,0 +1,40 @@
1From 2169f2205c0205a220d826d7573e5a863bd36e0a Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 9 Feb 2016 14:00:00 -0800
4Subject: [PATCH] ensure valid sentinal for gst_structure_get()
5
6gst_structure_get() is declared with G_GNUC_NULL_TERMINATED, ie
7__attribute__((__sentinel__)), which means gcc will generate a
8warning if the last parameter passed to the function is not NULL
9(where a valid NULL in this context is defined as zero with any
10pointer type).
11
12The C code callers to gst_structure_get() within gst-plugins-good
13use the C NULL definition (ie ((void*)0)), which is a valid sentinel.
14
15However gstid3v2mux.cc uses the C++ NULL definition (ie 0L), which
16is not a valid sentinel without an explicit cast to a pointer type.
17
18Upstream-Status: Pending
19
20Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
21---
22 ext/taglib/gstid3v2mux.cc | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/ext/taglib/gstid3v2mux.cc b/ext/taglib/gstid3v2mux.cc
26index 8651e77..a87234f 100644
27--- a/ext/taglib/gstid3v2mux.cc
28+++ b/ext/taglib/gstid3v2mux.cc
29@@ -465,7 +465,7 @@ add_image_tag (ID3v2::Tag * id3v2tag, const GstTagList * list,
30
31 if (info_struct) {
32 if (gst_structure_get (info_struct, "image-type",
33- GST_TYPE_TAG_IMAGE_TYPE, &image_type, NULL)) {
34+ GST_TYPE_TAG_IMAGE_TYPE, &image_type, (void *) NULL)) {
35 if (image_type > 0 && image_type <= 18) {
36 image_type += 2;
37 } else {
38--
391.9.1
40
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
index 20dfb8349e..e3a2019b41 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
@@ -11,6 +11,7 @@ SRC_URI = " \
11 git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \ 11 git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \
12 file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ 12 file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \
13 file://avoid-including-sys-poll.h-directly.patch \ 13 file://avoid-including-sys-poll.h-directly.patch \
14 file://ensure-valid-sentinel-for-gst_structure_get.patch \
14" 15"
15 16
16PV = "1.7.1+git${SRCPV}" 17PV = "1.7.1+git${SRCPV}"