diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2016-02-10 14:05:37 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-11 22:33:39 +0000 |
commit | 78be954e909a0260ec86671d41d9bc9e7b76b7f9 (patch) | |
tree | 9258b11e7c7d3f071100dd139adc1e4db9759b95 /meta | |
parent | fdd89795e22ca2e1613aee9bfa199f77deef8448 (diff) | |
download | poky-78be954e909a0260ec86671d41d9bc9e7b76b7f9.tar.gz |
gstreamer1.0-plugins-bad_git: fix gst_structure_get() etc compiler warnings
| ../../../gst-plugins-bad-1.7.1/sys/decklink/gstdecklinkaudiosrc.cpp: In function 'gboolean gst_decklink_audio_src_set_caps(GstBaseSrc*, GstCaps*)':
| ../../../gst-plugins-bad-1.7.1/sys/decklink/gstdecklinkaudiosrc.cpp:315:59: error: missing sentinel in function call [-Werror=format=]
| g_object_get (videosrc, "connection", &vconn, NULL);
| ^
| cc1plus: all warnings being treated as errors
For GStreamer functions declared with G_GNUC_NULL_TERMINATED,
ie __attribute__((__sentinel__)), gcc will generate a warning if the
last parameter passed to the function is not NULL (where a valid NULL
in this context is defined as zero with any pointer type).
The C callers to such functions within gst-plugins-bad use the C NULL
definition (ie ((void*)0)), which is a valid sentinel.
However the C++ NULL definition (ie 0L), is not a valid sentinel
without an explicit cast to a pointer type.
(From OE-Core rev: 4ffc1c6ea67e65c21964fa119820b37725f5a5de)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
2 files changed, 68 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch new file mode 100644 index 0000000000..8ccaaa0598 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | From 3164f23cd6ae338d0e423fccb4e11539cd220e2f Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
3 | Date: Tue, 9 Feb 2016 14:00:00 -0800 | ||
4 | Subject: [PATCH] ensure valid sentinals for gst_structure_get() etc | ||
5 | |||
6 | For GStreamer functions declared with G_GNUC_NULL_TERMINATED, | ||
7 | ie __attribute__((__sentinel__)), gcc will generate a warning if the | ||
8 | last parameter passed to the function is not NULL (where a valid NULL | ||
9 | in this context is defined as zero with any pointer type). | ||
10 | |||
11 | The C callers to such functions within gst-plugins-bad use the C NULL | ||
12 | definition (ie ((void*)0)), which is a valid sentinel. | ||
13 | |||
14 | However the C++ NULL definition (ie 0L), is not a valid sentinel | ||
15 | without an explicit cast to a pointer type. | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
20 | --- | ||
21 | sys/decklink/gstdecklink.cpp | 2 +- | ||
22 | sys/decklink/gstdecklinkaudiosrc.cpp | 2 +- | ||
23 | sys/decklink/gstdecklinkvideosink.cpp | 2 +- | ||
24 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
25 | |||
26 | diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp | ||
27 | index c0d1128..6f2ef75 100644 | ||
28 | --- a/sys/decklink/gstdecklink.cpp | ||
29 | +++ b/sys/decklink/gstdecklink.cpp | ||
30 | @@ -328,7 +328,7 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e) | ||
31 | "interlace-mode", G_TYPE_STRING, | ||
32 | mode->interlaced ? "interleaved" : "progressive", "pixel-aspect-ratio", | ||
33 | GST_TYPE_FRACTION, mode->par_n, mode->par_d, "colorimetry", G_TYPE_STRING, | ||
34 | - mode->colorimetry, "chroma-site", G_TYPE_STRING, "mpeg2", NULL); | ||
35 | + mode->colorimetry, "chroma-site", G_TYPE_STRING, "mpeg2", (void *) NULL); | ||
36 | } | ||
37 | |||
38 | GstCaps * | ||
39 | diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp | ||
40 | index e5ac8ae..a153851 100644 | ||
41 | --- a/sys/decklink/gstdecklinkaudiosrc.cpp | ||
42 | +++ b/sys/decklink/gstdecklinkaudiosrc.cpp | ||
43 | @@ -312,7 +312,7 @@ gst_decklink_audio_src_set_caps (GstBaseSrc * bsrc, GstCaps * caps) | ||
44 | g_mutex_unlock (&self->input->lock); | ||
45 | |||
46 | if (videosrc) { | ||
47 | - g_object_get (videosrc, "connection", &vconn, NULL); | ||
48 | + g_object_get (videosrc, "connection", &vconn, (void *) NULL); | ||
49 | gst_object_unref (videosrc); | ||
50 | |||
51 | switch (vconn) { | ||
52 | diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp | ||
53 | index 7111cb1..b958fda 100644 | ||
54 | --- a/sys/decklink/gstdecklinkvideosink.cpp | ||
55 | +++ b/sys/decklink/gstdecklinkvideosink.cpp | ||
56 | @@ -158,7 +158,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure, | ||
57 | gpointer user_data) | ||
58 | { | ||
59 | gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, | ||
60 | - G_MAXINT, 1, NULL); | ||
61 | + G_MAXINT, 1, (void *) NULL); | ||
62 | |||
63 | return TRUE; | ||
64 | } | ||
65 | -- | ||
66 | 1.9.1 | ||
67 | |||
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 e22a210c68..f9b5f3e223 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = " \ | |||
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 | file://avoid-including-sys-poll.h-directly.patch \ |
16 | file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ | ||
16 | " | 17 | " |
17 | 18 | ||
18 | PV = "1.7.1+git${SRCPV}" | 19 | PV = "1.7.1+git${SRCPV}" |