summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Viguera <javier.viguera@digi.com>2016-02-25 16:17:16 +0100
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-19 15:03:26 -0300
commita87697dfd9d1732c015a1281a4d044658e88ead4 (patch)
tree349107bbe0aeb6238dd009f2b551ced06cba9b2a
parentd9c60161a34c7cf127cda1782e4adf0d52aab947 (diff)
downloadmeta-freescale-a87697dfd9d1732c015a1281a4d044658e88ead4.tar.gz
gst1.0-fsl-plugin: remove not needed patch
The fix in this patch has been included in the new version, so there is no need for this patch anymore. Actually it does not even apply. Signed-off-by: Javier Viguera <javier.viguera@digi.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.8/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch46
-rw-r--r--recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.8.bb1
2 files changed, 0 insertions, 47 deletions
diff --git a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.8/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.8/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch
deleted file mode 100644
index 4f69c784..00000000
--- a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.8/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From: Javier Viguera <javier.viguera@digi.com>
2Date: Mon, 2 Nov 2015 17:52:48 +0100
3Subject: [PATCH] gst1.0-fsl-plugins: fix appending data to variable
4
5FSL_MM_CORE_CFLAGS and FSL_MM_CORE_LIBS where concatenating data at the
6end without adding a blank space between additions.
7
8As the appended data was a result of `pkg-config` expansion, this was
9working correctly until pkg-config v0.28 because it was pkg-config who
10was adding the trailing space.
11
12But after pkg-config v0.28, specifically in this commit:
13
14http://cgit.freedesktop.org/pkg-config/commit/?id=f26a505826acec6b1e1af8d1efdf959913421c3a
15
16this is no longer true, so the configure script needs to add that space.
17
18Signed-off-by: Javier Viguera <javier.viguera@digi.com>
19---
20 configure.ac | 10 +++++-----
21 1 file changed, 5 insertions(+), 5 deletions(-)
22
23diff --git a/configure.ac b/configure.ac
24index 4da48867fafd..01bff6ca5348 100755
25--- a/configure.ac
26+++ b/configure.ac
27@@ -203,14 +203,14 @@ AC_SUBST(RT_CFLAGS)
28 AC_SUBST(RT_LIBS)
29
30 FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null`
31-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`
32-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslparser 2>/dev/null`
33-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`
34+FSL_MM_CORE_CFLAGS+=" `$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`"
35+FSL_MM_CORE_CFLAGS+=" `$PKG_CONFIG --cflags libfslparser 2>/dev/null`"
36+FSL_MM_CORE_CFLAGS+=" `$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`"
37 AC_SUBST(FSL_MM_CORE_CFLAGS)
38
39 FSL_MM_CORE_LIBS=`$PKG_CONFIG --libs libfslaudiocodec 2>/dev/null`
40-FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`
41-FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslparser 2>/dev/null`
42+FSL_MM_CORE_LIBS+=" `$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`"
43+FSL_MM_CORE_LIBS+=" `$PKG_CONFIG --libs libfslparser 2>/dev/null`"
44 AC_SUBST(FSL_MM_CORE_LIBS)
45
46 EXTRAPLATFORMCFLAGS="-DARM -D_GNUC_"
diff --git a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.8.bb b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.8.bb
index 51ea92a8..532ae701 100644
--- a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.8.bb
+++ b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.8.bb
@@ -20,7 +20,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
20 20
21SRC_URI = " \ 21SRC_URI = " \
22 ${FSL_MIRROR}/gst1.0-fsl-plugins-${PV}.tar.gz \ 22 ${FSL_MIRROR}/gst1.0-fsl-plugins-${PV}.tar.gz \
23 file://0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch \
24" 23"
25 24
26SRC_URI[md5sum] = "0669eeea4e37203e2e654a00ded35ba2" 25SRC_URI[md5sum] = "0669eeea4e37203e2e654a00ded35ba2"