diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-03-21 18:40:08 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-24 21:44:25 +0000 |
| commit | 67fc36615351dff37516ee6c9239025198379112 (patch) | |
| tree | d78af36e8508f8e3dc6c3cada21b9c606419b63f | |
| parent | 138a03308fb24936466beb082b350d872ad423a6 (diff) | |
| download | openembedded-core-67fc36615351dff37516ee6c9239025198379112.tar.gz openembedded-core-67fc36615351dff37516ee6c9239025198379112.tar.bz2 openembedded-core-67fc36615351dff37516ee6c9239025198379112.zip | |
gstreamer1.0-plugins-bad: fix incorrect handling of Cflags in gstreamer-gl.pc file
Cflags had GL_CFLAGS appended, which contained full sysroot path to libdrm include;
generally such dependencies should be handled by pkgconfig's Requires facility.
It's unlikely that this .pc file is used by anything, but it was causing a QA error.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch new file mode 100644 index 0000000000..e81b065705 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch @@ -0,0 +1,27 @@ +From a93ca63d01e7cd1e40b5be576992f77fac364bd5 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 21 Mar 2016 18:21:17 +0200 +Subject: [PATCH] gstreamer-gl.pc.in: don't append GL_CFLAGS to CFLAGS + +Dependencies' include directories should not be added in this way; +it causes problems when cross-compiling in sysroot environments. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + pkgconfig/gstreamer-gl.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pkgconfig/gstreamer-gl.pc.in b/pkgconfig/gstreamer-gl.pc.in +index 5589e2a..b986450 100644 +--- a/pkgconfig/gstreamer-gl.pc.in ++++ b/pkgconfig/gstreamer-gl.pc.in +@@ -10,4 +10,4 @@ Version: @VERSION@ + Requires: gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@ + + Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ @GL_LIBS@ +-Cflags: -I${includedir} @GL_CFLAGS@ ++Cflags: -I${includedir} +-- +2.7.0 + 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 5be76db83c..ef6581b2ab 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb @@ -14,6 +14,7 @@ SRC_URI = " \ file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ file://avoid-including-sys-poll.h-directly.patch \ file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ + file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \ " PV = "1.7.2+git${SRCPV}" |