* [meta-fsl-arm][PATCH 1/3] gst-fsl-plugin, gst-plugins-base: Move to gstreamer subdir
@ 2013-11-07 19:26 Otavio Salvador
2013-11-07 19:26 ` [meta-fsl-arm][PATCH 2/3] gst-fsl-plugin: Fix checking for include headers in multiple paths Otavio Salvador
2013-11-07 19:26 ` [meta-fsl-arm][PATCH 3/3] linux-fslc: Update to revision 83ccff683 Otavio Salvador
0 siblings, 2 replies; 7+ messages in thread
From: Otavio Salvador @ 2013-11-07 19:26 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Otavio Salvador
There're no reason to keep the directories split and we follow now how
done in OE-Core and Meta-OE putting it inside
recipes-multimedia/gstreamer/.
Change-Id: Ib6e6ba20880434d500334b6f4d2f48f367c773aa
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
recipes-multimedia/{gst-plugins => gstreamer}/gst-fsl-plugin.inc | 0
.../gst-fsl-plugin/remove-GST_INFO-in-mfw_gst_utils.h.patch | 0
recipes-multimedia/{gst-plugins => gstreamer}/gst-fsl-plugin_3.0.9.bb | 0
.../gst-plugins-base/gstplaybin2-rawvideo-support.patch | 0
.../{gst-plugins => gstreamer}/gst-plugins-base_0.10.36.bbappend | 0
5 files changed, 0 insertions(+), 0 deletions(-)
rename recipes-multimedia/{gst-plugins => gstreamer}/gst-fsl-plugin.inc (100%)
rename recipes-multimedia/{gst-plugins => gstreamer}/gst-fsl-plugin/remove-GST_INFO-in-mfw_gst_utils.h.patch (100%)
rename recipes-multimedia/{gst-plugins => gstreamer}/gst-fsl-plugin_3.0.9.bb (100%)
rename recipes-multimedia/{gst-plugins => gstreamer}/gst-plugins-base/gstplaybin2-rawvideo-support.patch (100%)
rename recipes-multimedia/{gst-plugins => gstreamer}/gst-plugins-base_0.10.36.bbappend (100%)
diff --git a/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc b/recipes-multimedia/gstreamer/gst-fsl-plugin.inc
similarity index 100%
rename from recipes-multimedia/gst-plugins/gst-fsl-plugin.inc
rename to recipes-multimedia/gstreamer/gst-fsl-plugin.inc
diff --git a/recipes-multimedia/gst-plugins/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
similarity index 100%
rename from recipes-multimedia/gst-plugins/gst-fsl-plugin/remove-GST_INFO-in-mfw_gst_utils.h.patch
rename to recipes-multimedia/gstreamer/gst-fsl-plugin/remove-GST_INFO-in-mfw_gst_utils.h.patch
diff --git a/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.9.bb b/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.9.bb
similarity index 100%
rename from recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.9.bb
rename to recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.9.bb
diff --git a/recipes-multimedia/gst-plugins/gst-plugins-base/gstplaybin2-rawvideo-support.patch b/recipes-multimedia/gstreamer/gst-plugins-base/gstplaybin2-rawvideo-support.patch
similarity index 100%
rename from recipes-multimedia/gst-plugins/gst-plugins-base/gstplaybin2-rawvideo-support.patch
rename to recipes-multimedia/gstreamer/gst-plugins-base/gstplaybin2-rawvideo-support.patch
diff --git a/recipes-multimedia/gst-plugins/gst-plugins-base_0.10.36.bbappend b/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bbappend
similarity index 100%
rename from recipes-multimedia/gst-plugins/gst-plugins-base_0.10.36.bbappend
rename to recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bbappend
--
1.8.4.rc3
^ permalink raw reply [flat|nested] 7+ messages in thread* [meta-fsl-arm][PATCH 2/3] gst-fsl-plugin: Fix checking for include headers in multiple paths 2013-11-07 19:26 [meta-fsl-arm][PATCH 1/3] gst-fsl-plugin, gst-plugins-base: Move to gstreamer subdir Otavio Salvador @ 2013-11-07 19:26 ` Otavio Salvador 2013-11-07 20:21 ` Daiane Angolini 2013-11-07 19:26 ` [meta-fsl-arm][PATCH 3/3] linux-fslc: Update to revision 83ccff683 Otavio Salvador 1 sibling, 1 reply; 7+ messages in thread From: Otavio Salvador @ 2013-11-07 19:26 UTC (permalink / raw) To: meta-freescale Mailing List; +Cc: Otavio Salvador This fixes the support for proper detecting Freescale specific headers in include/linux and include/uapu. Without this patch I have the configure log with the same feature in 'enabled' and 'disabled' state and it was impossible to proper override CPPFLAGS. After this patch, building it against MX53 I get: Configure result: Enabled features: plugin: aac_dec plugin: mp3_dec plugin: vorbis_dec plugin: amr_dec plugin: mp3_enc plugin: h264_dec plugin: mpeg4_dec plugin: mpeg2_dec plugin: aiur plugin: beep plugin: v4lsink plugin: isink plugin: ipucsc library: libipu library: libX11 Disabled features: plugin: aacp_dec plugin: wma10_dec plugin: ac3_dec plugin: wma8_enc plugin: downmix plugin: wmv9mp_dec plugin: wmv78_dec plugin: vpu_wrap and building it against MX6Q I get: Configure result: Enabled features: plugin: aac_dec plugin: mp3_dec plugin: vorbis_dec plugin: amr_dec plugin: mp3_enc plugin: h264_dec plugin: mpeg4_dec plugin: mpeg2_dec plugin: vpu_wrap plugin: aiur plugin: beep plugin: v4lsink plugin: isink plugin: ipucsc library: libipu library: libX11 Disabled features: plugin: aacp_dec plugin: wma10_dec plugin: ac3_dec plugin: wma8_enc plugin: downmix plugin: wmv9mp_dec plugin: wmv78_dec Change-Id: Icdd40a1686212275b67baede34bb45eb41be3cf1 Reported-by: Jānis Čoders <janis.coders@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- recipes-multimedia/gstreamer/gst-fsl-plugin.inc | 6 +-- ...c-Fix-checking-for-include-headers-in-mul.patch | 63 ++++++++++++++++++++++ .../gstreamer/gst-fsl-plugin_3.0.9.bb | 3 +- 3 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 recipes-multimedia/gstreamer/gst-fsl-plugin/configure.ac-Fix-checking-for-include-headers-in-mul.patch diff --git a/recipes-multimedia/gstreamer/gst-fsl-plugin.inc b/recipes-multimedia/gstreamer/gst-fsl-plugin.inc index e179c76..5331887 100644 --- a/recipes-multimedia/gstreamer/gst-fsl-plugin.inc +++ b/recipes-multimedia/gstreamer/gst-fsl-plugin.inc @@ -26,10 +26,8 @@ PLATFORM_mx6sl = "MX6SL" PLATFORM_mx28 = "MX28" # Todo add a mechanism to map posible build targets -INCLUDE_DIR = "-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include" -EXTRA_OEMAKE = "INCLUDES="${INCLUDE_DIR}"" -EXTRA_OECONF = "PLATFORM=${PLATFORM} --disable-valgrind --disable-examples --disable-debug CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR}" -CACHED_CONFIGUREVARS += "CROSS_ROOT=${STAGING_DIR_TARGET}" +EXTRA_OECONF = "PLATFORM=${PLATFORM} --disable-valgrind --disable-examples --disable-debug \ + CPPFLAGS="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include"" PACKAGES += "${PN}-libmfwsconf ${PN}-libgplaycore ${PN}-libgstfsl \ ${PN}-libme ${PN}-libgstbufmeta ${PN}-libmfwba \ 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 new file mode 100644 index 0000000..abe5aa9 --- /dev/null +++ b/recipes-multimedia/gstreamer/gst-fsl-plugin/configure.ac-Fix-checking-for-include-headers-in-mul.patch @@ -0,0 +1,63 @@ +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/uapu. + +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_3.0.9.bb b/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.9.bb index 52813a5..fc9b38f 100644 --- a/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.9.bb +++ b/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.9.bb @@ -5,7 +5,8 @@ require gst-fsl-plugin.inc # FIXME: Inspecting the source code the content is in fact 3.0.9 SRC_URI = "${FSL_MIRROR}/gst-fsl-plugins-3.10.9-1.0.0.tar.gz \ - file://remove-GST_INFO-in-mfw_gst_utils.h.patch" + file://remove-GST_INFO-in-mfw_gst_utils.h.patch \ + file://configure.ac-Fix-checking-for-include-headers-in-mul.patch" SRC_URI[md5sum] = "a338a5c25225c765ae5f44af82fe7413" SRC_URI[sha256sum] = "e809daa0cd60381f05a79f34a53305a5ee53bfed22192a1cda6d998acc84a6fd" -- 1.8.4.rc3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [meta-fsl-arm][PATCH 2/3] gst-fsl-plugin: Fix checking for include headers in multiple paths 2013-11-07 19:26 ` [meta-fsl-arm][PATCH 2/3] gst-fsl-plugin: Fix checking for include headers in multiple paths Otavio Salvador @ 2013-11-07 20:21 ` Daiane Angolini 2013-11-07 20:43 ` Otavio Salvador 0 siblings, 1 reply; 7+ messages in thread From: Daiane Angolini @ 2013-11-07 20:21 UTC (permalink / raw) To: Otavio Salvador, meta-freescale Mailing List On 07-11-2013 17:26, Otavio Salvador wrote: > This fixes the support for proper detecting Freescale specific headers > in include/linux and include/uapu. include/uapi > > Without this patch I have the configure log with the same feature in > 'enabled' and 'disabled' state and it was impossible to proper > override CPPFLAGS. > > After this patch, building it against MX53 I get: > > Configure result: > Enabled features: > plugin: aac_dec > plugin: mp3_dec > plugin: vorbis_dec > plugin: amr_dec > plugin: mp3_enc > plugin: h264_dec > plugin: mpeg4_dec > plugin: mpeg2_dec > plugin: aiur > plugin: beep > plugin: v4lsink > plugin: isink > plugin: ipucsc > library: libipu > library: libX11 > Disabled features: > plugin: aacp_dec > plugin: wma10_dec > plugin: ac3_dec > plugin: wma8_enc > plugin: downmix > plugin: wmv9mp_dec > plugin: wmv78_dec > plugin: vpu_wrap > > and building it against MX6Q I get: > > Configure result: > Enabled features: > plugin: aac_dec > plugin: mp3_dec > plugin: vorbis_dec > plugin: amr_dec > plugin: mp3_enc > plugin: h264_dec > plugin: mpeg4_dec > plugin: mpeg2_dec > plugin: vpu_wrap > plugin: aiur > plugin: beep > plugin: v4lsink > plugin: isink > plugin: ipucsc > library: libipu > library: libX11 > Disabled features: > plugin: aacp_dec > plugin: wma10_dec > plugin: ac3_dec > plugin: wma8_enc > plugin: downmix > plugin: wmv9mp_dec > plugin: wmv78_dec > > Change-Id: Icdd40a1686212275b67baede34bb45eb41be3cf1 > Reported-by: Jānis Čoders <janis.coders@gmail.com> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > recipes-multimedia/gstreamer/gst-fsl-plugin.inc | 6 +-- > ...c-Fix-checking-for-include-headers-in-mul.patch | 63 ++++++++++++++++++++++ > .../gstreamer/gst-fsl-plugin_3.0.9.bb | 3 +- > 3 files changed, 67 insertions(+), 5 deletions(-) > create mode 100644 recipes-multimedia/gstreamer/gst-fsl-plugin/configure.ac-Fix-checking-for-include-headers-in-mul.patch > > diff --git a/recipes-multimedia/gstreamer/gst-fsl-plugin.inc b/recipes-multimedia/gstreamer/gst-fsl-plugin.inc > index e179c76..5331887 100644 > --- a/recipes-multimedia/gstreamer/gst-fsl-plugin.inc > +++ b/recipes-multimedia/gstreamer/gst-fsl-plugin.inc > @@ -26,10 +26,8 @@ PLATFORM_mx6sl = "MX6SL" > PLATFORM_mx28 = "MX28" > > # Todo add a mechanism to map posible build targets > -INCLUDE_DIR = "-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include" > -EXTRA_OEMAKE = "INCLUDES="${INCLUDE_DIR}"" > -EXTRA_OECONF = "PLATFORM=${PLATFORM} --disable-valgrind --disable-examples --disable-debug CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR}" Are you droping CROSS_ROOT because now the configure can detect header files properly? > -CACHED_CONFIGUREVARS += "CROSS_ROOT=${STAGING_DIR_TARGET}" > +EXTRA_OECONF = "PLATFORM=${PLATFORM} --disable-valgrind --disable-examples --disable-debug \ > + CPPFLAGS="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include"" > > PACKAGES += "${PN}-libmfwsconf ${PN}-libgplaycore ${PN}-libgstfsl \ > ${PN}-libme ${PN}-libgstbufmeta ${PN}-libmfwba \ > 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 > new file mode 100644 > index 0000000..abe5aa9 > --- /dev/null > +++ b/recipes-multimedia/gstreamer/gst-fsl-plugin/configure.ac-Fix-checking-for-include-headers-in-mul.patch > @@ -0,0 +1,63 @@ > +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/uapu. > + > +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_3.0.9.bb b/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.9.bb > index 52813a5..fc9b38f 100644 > --- a/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.9.bb > +++ b/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.9.bb > @@ -5,7 +5,8 @@ require gst-fsl-plugin.inc > > # FIXME: Inspecting the source code the content is in fact 3.0.9 > SRC_URI = "${FSL_MIRROR}/gst-fsl-plugins-3.10.9-1.0.0.tar.gz \ > - file://remove-GST_INFO-in-mfw_gst_utils.h.patch" > + file://remove-GST_INFO-in-mfw_gst_utils.h.patch \ > + file://configure.ac-Fix-checking-for-include-headers-in-mul.patch" > > SRC_URI[md5sum] = "a338a5c25225c765ae5f44af82fe7413" > SRC_URI[sha256sum] = "e809daa0cd60381f05a79f34a53305a5ee53bfed22192a1cda6d998acc84a6fd" > Very nice patch! Let's wait for Janis Coders test in his side ;) -- Daiane ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-fsl-arm][PATCH 2/3] gst-fsl-plugin: Fix checking for include headers in multiple paths 2013-11-07 20:21 ` Daiane Angolini @ 2013-11-07 20:43 ` Otavio Salvador 2013-11-08 8:40 ` Janis Coders 0 siblings, 1 reply; 7+ messages in thread From: Otavio Salvador @ 2013-11-07 20:43 UTC (permalink / raw) To: Daiane Angolini; +Cc: meta-freescale Mailing List Hello Daiane, On Thu, Nov 7, 2013 at 6:21 PM, Daiane Angolini <daiane.angolini@freescale.com> wrote: > On 07-11-2013 17:26, Otavio Salvador wrote: >> >> This fixes the support for proper detecting Freescale specific headers >> in include/linux and include/uapu. > > > include/uapi Fixed in my tree. >> Without this patch I have the configure log with the same feature in >> 'enabled' and 'disabled' state and it was impossible to proper >> override CPPFLAGS. >> >> After this patch, building it against MX53 I get: >> >> Configure result: >> Enabled features: >> plugin: aac_dec >> plugin: mp3_dec >> plugin: vorbis_dec >> plugin: amr_dec >> plugin: mp3_enc >> plugin: h264_dec >> plugin: mpeg4_dec >> plugin: mpeg2_dec >> plugin: aiur >> plugin: beep >> plugin: v4lsink >> plugin: isink >> plugin: ipucsc >> library: libipu >> library: libX11 >> Disabled features: >> plugin: aacp_dec >> plugin: wma10_dec >> plugin: ac3_dec >> plugin: wma8_enc >> plugin: downmix >> plugin: wmv9mp_dec >> plugin: wmv78_dec >> plugin: vpu_wrap >> >> and building it against MX6Q I get: >> >> Configure result: >> Enabled features: >> plugin: aac_dec >> plugin: mp3_dec >> plugin: vorbis_dec >> plugin: amr_dec >> plugin: mp3_enc >> plugin: h264_dec >> plugin: mpeg4_dec >> plugin: mpeg2_dec >> plugin: vpu_wrap >> plugin: aiur >> plugin: beep >> plugin: v4lsink >> plugin: isink >> plugin: ipucsc >> library: libipu >> library: libX11 >> Disabled features: >> plugin: aacp_dec >> plugin: wma10_dec >> plugin: ac3_dec >> plugin: wma8_enc >> plugin: downmix >> plugin: wmv9mp_dec >> plugin: wmv78_dec >> >> Change-Id: Icdd40a1686212275b67baede34bb45eb41be3cf1 >> Reported-by: Jānis Čoders <janis.coders@gmail.com> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> >> --- >> recipes-multimedia/gstreamer/gst-fsl-plugin.inc | 6 +-- >> ...c-Fix-checking-for-include-headers-in-mul.patch | 63 >> ++++++++++++++++++++++ >> .../gstreamer/gst-fsl-plugin_3.0.9.bb | 3 +- >> 3 files changed, 67 insertions(+), 5 deletions(-) >> create mode 100644 >> recipes-multimedia/gstreamer/gst-fsl-plugin/configure.ac-Fix-checking-for-include-headers-in-mul.patch >> >> diff --git a/recipes-multimedia/gstreamer/gst-fsl-plugin.inc >> b/recipes-multimedia/gstreamer/gst-fsl-plugin.inc >> index e179c76..5331887 100644 >> --- a/recipes-multimedia/gstreamer/gst-fsl-plugin.inc >> +++ b/recipes-multimedia/gstreamer/gst-fsl-plugin.inc >> @@ -26,10 +26,8 @@ PLATFORM_mx6sl = "MX6SL" >> PLATFORM_mx28 = "MX28" >> >> # Todo add a mechanism to map posible build targets >> -INCLUDE_DIR = "-I${STAGING_KERNEL_DIR}/include/uapi >> -I${STAGING_KERNEL_DIR}/include" >> -EXTRA_OEMAKE = "INCLUDES="${INCLUDE_DIR}"" >> -EXTRA_OECONF = "PLATFORM=${PLATFORM} --disable-valgrind >> --disable-examples --disable-debug CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR}" > > > Are you droping CROSS_ROOT because now the configure can detect header files > properly? ... It worked well without it and the code just uses it if it cannot find the header. So in the new code it is unused. Quoted the configure.ac code below: ... AC_CHECK_HEADERS([linux/ipu.h], [HAVE_IPU_HEAD=yes], [HAVE_IPU_HEAD=no]) AC_CHECK_HEADERS([ipu.h], [HAVE_IPU_HEAD=yes], [HAVE_IPU_HEAD=no]) if test "x$HAVE_IPU_HEAD" = "xno"; then ipuhead=`find $CROSS_ROOT/usr/src/ -name ipu.h | grep "/linux/ipu.h" | head -n 1 | sed -e 's,/linux/ipu.h,,'` if test "x$ipuhead" != "x"; then IPU_CFLAGS=-I$ipuhead fi fi ... This try to find the linux/ipu.h in standard paths (which is set in sysroot option of gcc) and also the paths we provide in CPPFLAGS so it is found properly and never runs it. > Very nice patch! Let's wait for Janis Coders test in his side ;) I hope it works for him. I am also putting this in build in my autobuilder for /all/ boards so we find out if it breaks something :) I am sure there're some other corner cases hidden in this code but this simplifies the code and make it easier to spot it. Regards, -- Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-fsl-arm][PATCH 2/3] gst-fsl-plugin: Fix checking for include headers in multiple paths 2013-11-07 20:43 ` Otavio Salvador @ 2013-11-08 8:40 ` Janis Coders 2013-11-08 11:50 ` Otavio Salvador 0 siblings, 1 reply; 7+ messages in thread From: Janis Coders @ 2013-11-08 8:40 UTC (permalink / raw) To: Otavio Salvador; +Cc: meta-freescale@yoctoproject.org Checked out dora-next branch and everything compiled fine for my custom board, which is based on imx53qsb. ipu_csc plugin is included and works as expected. Thank you. :) How/when dora-next branch is merged into dora? On 11/07/2013 10:43 PM, Otavio Salvador wrote: > Hello Daiane, > > On Thu, Nov 7, 2013 at 6:21 PM, Daiane Angolini > <daiane.angolini@freescale.com> wrote: >> On 07-11-2013 17:26, Otavio Salvador wrote: >>> This fixes the support for proper detecting Freescale specific headers >>> in include/linux and include/uapu. >> >> include/uapi > Fixed in my tree. > >>> Without this patch I have the configure log with the same feature in >>> 'enabled' and 'disabled' state and it was impossible to proper >>> override CPPFLAGS. >>> >>> After this patch, building it against MX53 I get: >>> >>> Configure result: >>> Enabled features: >>> plugin: aac_dec >>> plugin: mp3_dec >>> plugin: vorbis_dec >>> plugin: amr_dec >>> plugin: mp3_enc >>> plugin: h264_dec >>> plugin: mpeg4_dec >>> plugin: mpeg2_dec >>> plugin: aiur >>> plugin: beep >>> plugin: v4lsink >>> plugin: isink >>> plugin: ipucsc >>> library: libipu >>> library: libX11 >>> Disabled features: >>> plugin: aacp_dec >>> plugin: wma10_dec >>> plugin: ac3_dec >>> plugin: wma8_enc >>> plugin: downmix >>> plugin: wmv9mp_dec >>> plugin: wmv78_dec >>> plugin: vpu_wrap >>> >>> and building it against MX6Q I get: >>> >>> Configure result: >>> Enabled features: >>> plugin: aac_dec >>> plugin: mp3_dec >>> plugin: vorbis_dec >>> plugin: amr_dec >>> plugin: mp3_enc >>> plugin: h264_dec >>> plugin: mpeg4_dec >>> plugin: mpeg2_dec >>> plugin: vpu_wrap >>> plugin: aiur >>> plugin: beep >>> plugin: v4lsink >>> plugin: isink >>> plugin: ipucsc >>> library: libipu >>> library: libX11 >>> Disabled features: >>> plugin: aacp_dec >>> plugin: wma10_dec >>> plugin: ac3_dec >>> plugin: wma8_enc >>> plugin: downmix >>> plugin: wmv9mp_dec >>> plugin: wmv78_dec >>> >>> Change-Id: Icdd40a1686212275b67baede34bb45eb41be3cf1 >>> Reported-by: Jānis Čoders <janis.coders@gmail.com> >>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> >>> --- >>> recipes-multimedia/gstreamer/gst-fsl-plugin.inc | 6 +-- >>> ...c-Fix-checking-for-include-headers-in-mul.patch | 63 >>> ++++++++++++++++++++++ >>> .../gstreamer/gst-fsl-plugin_3.0.9.bb | 3 +- >>> 3 files changed, 67 insertions(+), 5 deletions(-) >>> create mode 100644 >>> recipes-multimedia/gstreamer/gst-fsl-plugin/configure.ac-Fix-checking-for-include-headers-in-mul.patch >>> >>> diff --git a/recipes-multimedia/gstreamer/gst-fsl-plugin.inc >>> b/recipes-multimedia/gstreamer/gst-fsl-plugin.inc >>> index e179c76..5331887 100644 >>> --- a/recipes-multimedia/gstreamer/gst-fsl-plugin.inc >>> +++ b/recipes-multimedia/gstreamer/gst-fsl-plugin.inc >>> @@ -26,10 +26,8 @@ PLATFORM_mx6sl = "MX6SL" >>> PLATFORM_mx28 = "MX28" >>> >>> # Todo add a mechanism to map posible build targets >>> -INCLUDE_DIR = "-I${STAGING_KERNEL_DIR}/include/uapi >>> -I${STAGING_KERNEL_DIR}/include" >>> -EXTRA_OEMAKE = "INCLUDES="${INCLUDE_DIR}"" >>> -EXTRA_OECONF = "PLATFORM=${PLATFORM} --disable-valgrind >>> --disable-examples --disable-debug CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR}" >> >> Are you droping CROSS_ROOT because now the configure can detect header files >> properly? > ... > > It worked well without it and the code just uses it if it cannot find > the header. So in the new code it is unused. > > Quoted the configure.ac code below: > ... > AC_CHECK_HEADERS([linux/ipu.h], [HAVE_IPU_HEAD=yes], [HAVE_IPU_HEAD=no]) > AC_CHECK_HEADERS([ipu.h], [HAVE_IPU_HEAD=yes], [HAVE_IPU_HEAD=no]) > if test "x$HAVE_IPU_HEAD" = "xno"; then > ipuhead=`find $CROSS_ROOT/usr/src/ -name ipu.h | grep > "/linux/ipu.h" | head -n 1 | sed -e 's,/linux/ipu.h,,'` > if test "x$ipuhead" != "x"; then > IPU_CFLAGS=-I$ipuhead > fi > fi > ... > > This try to find the linux/ipu.h in standard paths (which is set in > sysroot option of gcc) and also the paths we provide in CPPFLAGS so it > is found properly and never runs it. > >> Very nice patch! Let's wait for Janis Coders test in his side ;) > I hope it works for him. I am also putting this in build in my > autobuilder for /all/ boards so we find out if it breaks something :) > > I am sure there're some other corner cases hidden in this code but > this simplifies the code and make it easier to spot it. > > Regards, > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-fsl-arm][PATCH 2/3] gst-fsl-plugin: Fix checking for include headers in multiple paths 2013-11-08 8:40 ` Janis Coders @ 2013-11-08 11:50 ` Otavio Salvador 0 siblings, 0 replies; 7+ messages in thread From: Otavio Salvador @ 2013-11-08 11:50 UTC (permalink / raw) To: Janis Coders; +Cc: meta-freescale@yoctoproject.org On Fri, Nov 8, 2013 at 6:40 AM, Janis Coders <janis.coders@gmail.com> wrote: > Checked out dora-next branch and everything compiled fine for my custom > board, which is based on imx53qsb. > ipu_csc plugin is included and works as expected. > Thank you. :) Awesome! > How/when dora-next branch is merged into dora? 2 minutes ago ;-) In fact I merged those fix only ... part of it is still being worked on. -- Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [meta-fsl-arm][PATCH 3/3] linux-fslc: Update to revision 83ccff683 2013-11-07 19:26 [meta-fsl-arm][PATCH 1/3] gst-fsl-plugin, gst-plugins-base: Move to gstreamer subdir Otavio Salvador 2013-11-07 19:26 ` [meta-fsl-arm][PATCH 2/3] gst-fsl-plugin: Fix checking for include headers in multiple paths Otavio Salvador @ 2013-11-07 19:26 ` Otavio Salvador 1 sibling, 0 replies; 7+ messages in thread From: Otavio Salvador @ 2013-11-07 19:26 UTC (permalink / raw) To: meta-freescale Mailing List; +Cc: Otavio Salvador This merges the v3.12 final changes into patches-3.12 branch. Change-Id: I4bd512f90da5814cbf06fc0a1baf08f2966f316d Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- recipes-kernel/linux/linux-fslc_3.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-fslc_3.12.bb b/recipes-kernel/linux/linux-fslc_3.12.bb index 8b07c6b..1067177 100644 --- a/recipes-kernel/linux/linux-fslc_3.12.bb +++ b/recipes-kernel/linux/linux-fslc_3.12.bb @@ -6,6 +6,6 @@ include linux-fslc.inc PV = "3.12+git${SRCPV}" # patches-3.12 -SRCREV = "1b62e41916cf33e4d3fc3d61564f1f5a0f7a0d2e" +SRCREV = "83ccff683f04f0f4e47bce191d6ffde52fc79e13" COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)" -- 1.8.4.rc3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-11-08 11:50 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-11-07 19:26 [meta-fsl-arm][PATCH 1/3] gst-fsl-plugin, gst-plugins-base: Move to gstreamer subdir Otavio Salvador 2013-11-07 19:26 ` [meta-fsl-arm][PATCH 2/3] gst-fsl-plugin: Fix checking for include headers in multiple paths Otavio Salvador 2013-11-07 20:21 ` Daiane Angolini 2013-11-07 20:43 ` Otavio Salvador 2013-11-08 8:40 ` Janis Coders 2013-11-08 11:50 ` Otavio Salvador 2013-11-07 19:26 ` [meta-fsl-arm][PATCH 3/3] linux-fslc: Update to revision 83ccff683 Otavio Salvador
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.