From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 27 Apr 2015 18:47:57 +0000 (-0300)
Subject: gst-fsl-plugin: Fix CFLAGS query using pkgconfig
X-Git-Tag: 2.1~587
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b240c70de0a0d5bedd532ccde1ddc41aa7fd2015;p=meta-freescale.git

gst-fsl-plugin: Fix CFLAGS query using pkgconfig

The pkgconfig queries cannot be appended without explicit spaces as
pkgconfig does not print trailing spaces by itself.

Change-Id: Ifa0d25ea715c1a517a81d971c9d5c46ffa9c64e6
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin/configure.ac-Fix-query-of-CFLAGS-to-pkgconfig.patch b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin/configure.ac-Fix-query-of-CFLAGS-to-pkgconfig.patch
new file mode 100644
index 00000000..16a75fc9
--- /dev/null
+++ b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin/configure.ac-Fix-query-of-CFLAGS-to-pkgconfig.patch
@@ -0,0 +1,46 @@
+From 3312c9fbc80b7b7fe3e28b24c4b8955aa3d5bf18 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Mon, 27 Apr 2015 15:36:06 -0300
+Subject: [PATCH] configure.ac: Fix query of CFLAGS to pkgconfig
+Organization: O.S. Systems Software LTDA.
+
+The pkgconfig queries cannot be appended without explicit spaces as
+pkgconfig does not print trailing spaces by itself.
+
+Upstream-Status: Pending
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ configure.ac | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 86da399..276728f 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -175,15 +175,15 @@ AC_CHECK_LIB(rt, clock_gettime)
+ AC_SUBST(RT_CFLAGS)
+ AC_SUBST(RT_LIBS)
+ 
+-FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null`
+-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`
+-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslparser 2>/dev/null`
+-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`
++FSL_MM_CORE_CFLAGS="`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null` \
++                    `$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null` \
++                    `$PKG_CONFIG --cflags libfslparser 2>/dev/null` \
++                    `$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`"
+ AC_SUBST(FSL_MM_CORE_CFLAGS)
+ 
+-FSL_MM_CORE_LIBS=`$PKG_CONFIG --libs libfslaudiocodec 2>/dev/null`
+-FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`
+-FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslparser 2>/dev/null`
++FSL_MM_CORE_LIBS="`$PKG_CONFIG --libs libfslaudiocodec 2>/dev/null` \
++                  `$PKG_CONFIG --libs libfslvideocodec 2>/dev/null` \
++                  `$PKG_CONFIG --libs libfslparser 2>/dev/null`"
+ AC_SUBST(FSL_MM_CORE_LIBS)
+ 
+ EXTRAPLATFORMCFLAGS="-DARM -D_GNUC_"
+-- 
+2.1.4
+
diff --git a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin_4.0.3.bb b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin_4.0.3.bb
index 7cb3c68b..2e23e98e 100644
--- a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin_4.0.3.bb
+++ b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin_4.0.3.bb
@@ -7,6 +7,7 @@ EXTRA_OECONF += " CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR}"
 
 SRC_URI = "${FSL_MIRROR}/gst-fsl-plugins-${PV}.tar.gz \
            file://Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch \
+           file://configure.ac-Fix-query-of-CFLAGS-to-pkgconfig.patch \
 "
 
 S = "${WORKDIR}/gst-fsl-plugins-${PV}"