aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-05-01 16:00:43 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2014-05-05 09:34:23 -0300
commite39dc2c1dc05f9a25bb1f80a3926d932e99beb8e (patch)
tree10d0e9dbe0967b4b643e692572d7c78c903170c2
parent700af12aa8e2fe7b739c246abd5b1cb237b2eb06 (diff)
downloadmeta-fsl-arm-e39dc2c1dc05f9a25bb1f80a3926d932e99beb8e.tar.gz
meta-fsl-arm-e39dc2c1dc05f9a25bb1f80a3926d932e99beb8e.tar.bz2
meta-fsl-arm-e39dc2c1dc05f9a25bb1f80a3926d932e99beb8e.zip
gst-fsl-plugin: Remove unused patches
Following patches: - configure.ac-Fix-checking-for-include-headers-in-mul.patch - makefile.am-fix-aac-for-imx6.patch - remove-GST_INFO-in-mfw_gst_utils.h.patch were unused, so remove them. Change-Id: I3e0bc71ec8a64059d63e74ee46cdd89cfd599a82 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-multimedia/gstreamer/gst-fsl-plugin/configure.ac-Fix-checking-for-include-headers-in-mul.patch63
-rw-r--r--recipes-multimedia/gstreamer/gst-fsl-plugin/makefile.am-fix-aac-for-imx6.patch11
-rw-r--r--recipes-multimedia/gstreamer/gst-fsl-plugin/remove-GST_INFO-in-mfw_gst_utils.h.patch40
3 files changed, 0 insertions, 114 deletions
diff --git a/recipes-multimedia/gstreamer/gst-fsl-plugin/configure.ac-Fix-checking-for-include-headers-in-mul.patch b/recipes-multimedia/gstreamer/gst-fsl-plugin/configure.ac-Fix-checking-for-include-headers-in-mul.patch
deleted file mode 100644
index 02b5208..0000000
--- a/recipes-multimedia/gstreamer/gst-fsl-plugin/configure.ac-Fix-checking-for-include-headers-in-mul.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From be38dc1816d4de1a1b463988763f50226eb8417f Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Thu, 7 Nov 2013 10:50:51 -0200
-Subject: [PATCH] configure.ac: Fix checking for include headers in multiple
- paths
-Organization: O.S. Systems Software LTDA.
-
-This fixes the support for proper detecting Freescale specific headers
-in include/linux and include/uapi.
-
-Without this patch we have the configure log with the same feature in
-'enabled' and 'disabled' state and it was impossible to override the
-CPPFLAGS.
-
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
----
- configure.ac | 19 ++++++++-----------
- 1 file changed, 8 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d74ee0e..f11c76c 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,13 +58,9 @@ AC_DEFUN([CHECK_DISABLE_FEATURE],
- [use_[$1]=$enableval],
- [use_[$1]=yes])
- if test "$use_[$1]" = "yes"; then
-- SAVE_CPPFLAGS="$CPPFLAGS"
-- CPPFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec`
-- CPPFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec`
-- CPPFLAGS+=`$PKG_CONFIG --cflags libfslparser`
-- CPPFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap`
-- AC_CHECK_HEADERS([$4], HAVE_[$3]=yes, HAVE_[$3]=no && break)
-- CPPFLAGS="$SAVE_CPPFLAGS"
-+ for h in "$4"; do
-+ AC_CHECK_HEADERS([$h], HAVE_[$3]=yes && break, HAVE_[$3]=no)
-+ done
- if test "x$HAVE_[$3]" = "xyes"; then
- enabled_feature="$enabled_feature\n\t\t[$5]"
- else
-@@ -283,12 +279,13 @@ CHECK_DISABLE_FEATURE(beep, [Disable beep audio decoder], [BEEP], [fsl_unia.h],
-
- CHECK_DISABLE_FEATURE(v4lsink, [Disable fsl v4l sink], [V4L_SINK], [linux/videodev2.h], [plugin: v4lsink])
-
-+# Allow headers to be inside include/uapi and include/linux
- saved_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $IPU_CFLAGS"
--CHECK_DISABLE_FEATURE(isink, [Disable fsl ipu sink], [I_SINK], [linux/mxcfb.h], [plugin: isink])
--CHECK_DISABLE_FEATURE(isink, [Disable fsl ipu sink], [I_SINK], [uapi/mxcfb.h], [plugin: isink])
--CHECK_DISABLE_FEATURE(ipucsc, [Disable fsl ipu csc], [I_CSC], [linux/mxcfb.h], [plugin: ipucsc])
--CHECK_DISABLE_FEATURE(ipucsc, [Disable fsl ipu csc], [I_CSC], [uapi/mxcfb.h], [plugin: ipucsc])
-+
-+CHECK_DISABLE_FEATURE(isink, [Disable fsl ipu sink], [I_SINK], [linux/mxcfb.h uapi/mxcfb.h], [plugin: isink])
-+CHECK_DISABLE_FEATURE(ipucsc, [Disable fsl ipu csc], [I_CSC], [linux/mxcfb.h uapi/mxcfb.h], [plugin: ipucsc])
-+
- CFLAGS=$saved_CFLAGS
-
- CHECK_DISABLE_FEATURE(ipulib, [Disable ipu lib], [IPU_LIB], [mxc_ipu_hl_lib.h], [library: libipu])
---
-1.8.4.rc3
-
diff --git a/recipes-multimedia/gstreamer/gst-fsl-plugin/makefile.am-fix-aac-for-imx6.patch b/recipes-multimedia/gstreamer/gst-fsl-plugin/makefile.am-fix-aac-for-imx6.patch
deleted file mode 100644
index d12dc33..0000000
--- a/recipes-multimedia/gstreamer/gst-fsl-plugin/makefile.am-fix-aac-for-imx6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am 2013-09-10 20:52:22.000000000 +0200
-+++ b/Makefile.am 2013-12-05 18:26:24.964585163 +0100
-@@ -928,7 +928,7 @@
- tools/gplay
-
- SUBDIRS = $(AUDIODIRS) $(LIBSDIRS) $(BASEDIRS) $(VPUWRAPDIRS) $(WMA8ENC_DIR) $(MP3ENC_DIR) \
-- $(H264DEC_DIR) $(MPEG2DEC_DIR) $(MPEG4DEC_DIR) $(WMV9MPDEC_DIR) $(WMV78DEC_DIR) \
-+ $(H264DEC_DIR) $(MPEG2DEC_DIR) $(MPEG4DEC_DIR) $(WMV9MPDEC_DIR) $(WMV78DEC_DIR) $(AACDEC_DIR)\
- $(DOWNMIX_DIR) $(AMRDEC_DIR) $(IPUDIRS) $(TOOLDIRS)
-
- endif
diff --git a/recipes-multimedia/gstreamer/gst-fsl-plugin/remove-GST_INFO-in-mfw_gst_utils.h.patch b/recipes-multimedia/gstreamer/gst-fsl-plugin/remove-GST_INFO-in-mfw_gst_utils.h.patch
deleted file mode 100644
index e06a250..0000000
--- a/recipes-multimedia/gstreamer/gst-fsl-plugin/remove-GST_INFO-in-mfw_gst_utils.h.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 28ad25933dc51d8af13927a9943a353677c31a3a Mon Sep 17 00:00:00 2001
-From: Lyon Wang <lyon.wang@freescale.com>
-Date: Tue, 22 Oct 2013 16:15:43 +0800
-Subject: [PATCH] remove GST_INFO in mfw_gst_utils.h
-
-GST_INFO() should not be used in the global header
-or it will cause some macro definiation error.
-
-so comment the GST_INFO() in the mfw_gst_utils.h
-
-Upstream-Status: Backport [GIT]
----
- inc/plugin/mfw_gst_utils.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/inc/plugin/mfw_gst_utils.h b/inc/plugin/mfw_gst_utils.h
-index 366d50e..c1b6f90 100755
---- a/inc/plugin/mfw_gst_utils.h
-+++ b/inc/plugin/mfw_gst_utils.h
-@@ -876,7 +876,7 @@ getChipCodeFromSocid (void)
- }
- fclose(fp);
-
-- GST_INFO("SOC is %s\n", soc_name);
-+ //GST_INFO("SOC is %s\n", soc_name);
-
- int num = sizeof(soc_info) / sizeof(SOC_INFO);
- int i;
-@@ -913,7 +913,7 @@ getChipCode (void)
- }
-
- kv = ((kv_major << 16) + (kv_minor << 8) + kv_rel);
-- GST_INFO("kernel:%s, %d.%d.%d\n", sys_name.release, kv_major, kv_minor, kv_rel);
-+ //GST_INFO("kernel:%s, %d.%d.%d\n", sys_name.release, kv_major, kv_minor, kv_rel);
-
- if (kv < KERN_VER(3, 10, 0))
- return getChipCodeFromCpuinfo();
---
-1.7.9.5
-