From 598319bd8c891e0c76b2d021db2de97ae640244d Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Mon, 2 Nov 2015 19:12:53 +0100
Subject: [PATCH] gst1.0-fsl-plugin: fix FSL codecs, parser and vpuwrap
 detection

Patch gst1.0-fsl-plugin's configure script to add a trailing space in the
FSL_MM_CORE_CFLAGS and FSL_MM_CORE_LIBS variables between different
pkg-config executions.

These variables are used later to pass parameters to the compiler and
as they are not built correctly, the 'configure' script fails to detect
some of the functionality:

Disabled features:
    plugin: imxmp3enc
    plugin: vpu_wrap
    plugin: aiur
    plugin: beep

This was working well in previous versions of Yocto, because pkg-config
until v0.28 was adding that trailing space:

http://cgit.freedesktop.org/pkg-config/commit/?id=f26a505826acec6b1e1af8d1efdf959913421c3a

but this is no longer true, so the trailing space has to be added in the
configure script.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 ...ugins-fix-appending-data-to-variable.patch | 46 +++++++++++++++++++
 .../gstreamer/gst1.0-fsl-plugin_4.0.7.bb      |  5 +-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.7/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch

diff --git a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.7/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.7/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch
new file mode 100644
index 00000000..4f69c784
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.7/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch
@@ -0,0 +1,46 @@
+From: Javier Viguera <javier.viguera@digi.com>
+Date: Mon, 2 Nov 2015 17:52:48 +0100
+Subject: [PATCH] gst1.0-fsl-plugins: fix appending data to variable
+
+FSL_MM_CORE_CFLAGS and FSL_MM_CORE_LIBS where concatenating data at the
+end without adding a blank space between additions.
+
+As the appended data was a result of `pkg-config` expansion, this was
+working correctly until pkg-config v0.28 because it was pkg-config who
+was adding the trailing space.
+
+But after pkg-config v0.28, specifically in this commit:
+
+http://cgit.freedesktop.org/pkg-config/commit/?id=f26a505826acec6b1e1af8d1efdf959913421c3a
+
+this is no longer true, so the configure script needs to add that space.
+
+Signed-off-by: Javier Viguera <javier.viguera@digi.com>
+---
+ configure.ac | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4da48867fafd..01bff6ca5348 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -203,14 +203,14 @@ 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 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`"
+ 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 libfslvideocodec 2>/dev/null`"
++FSL_MM_CORE_LIBS+=" `$PKG_CONFIG --libs libfslparser 2>/dev/null`"
+ AC_SUBST(FSL_MM_CORE_LIBS)
+ 
+ EXTRAPLATFORMCFLAGS="-DARM -D_GNUC_"
diff --git a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.7.bb b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.7.bb
index 7d8ef0a9..62b38c76 100644
--- a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.7.bb
+++ b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.7.bb
@@ -18,7 +18,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
                     file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
 
-SRC_URI = "${FSL_MIRROR}/gst1.0-fsl-plugins-${PV}.tar.gz"
+SRC_URI = " \
+    ${FSL_MIRROR}/gst1.0-fsl-plugins-${PV}.tar.gz \
+    file://0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch \
+"
 SRC_URI[md5sum] = "81e2dbd702ea2cd7904fc54981ea3d19"
 SRC_URI[sha256sum] = "fc287a672e2f040c2697af618b2f6ed319202a6dfbb731cbfb7987b41de2d62b"
 
-- 
2.40.1