qt4: Rework bbappend code to avoid duplication

The X11 and Embedded flavours are doing the same changes so there is
no reason to duplicate it all.

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

diff --git a/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_%.bbappend b/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_%.bbappend
index 05cc2e6853e4ad6672c6cc6e023929b81c088996..14324ca1a6105336b989548d823a11c647db5e7c 100644 (file)
--- a/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_%.bbappend
+++ b/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_%.bbappend
@@ -1,12 +1 @@
-#Freescale
-include qt4-phonon-patches.inc
-
-DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2"
-QT_GLFLAGS_mx5 = "-opengl es2 -openvg"
-QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/"
-
-DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2"
-QT_GLFLAGS_mx6 = "-opengl es2 -openvg"
-QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/uapi \
-                               -I${STAGING_KERNEL_DIR}/include/ \
-                               -DLINUX=1 -DEGL_API_FB=1"
+include qt4-imx-support.inc

diff --git a/meta-fsl-arm/recipes-qt/qt4/qt4-imx-support.inc b/meta-fsl-arm/recipes-qt/qt4/qt4-imx-support.inc
new file mode 100644 (file)
index 0000000..7ba4aea
--- /dev/null
+++ b/meta-fsl-arm/recipes-qt/qt4/qt4-imx-support.inc
@@ -0,0 +1,20 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:"
+
+SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch"
+SRC_URI_append_mx6 += " \
+       file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \
+       file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \
+       file://0003-i.MX6-force-egl-visual-ID-33.patch \
+"
+
+DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2"
+QT_GLFLAGS_mx5 = "-opengl es2 -openvg"
+QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/"
+
+DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2"
+QT_GLFLAGS_mx6 = "-opengl es2 -openvg"
+QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/uapi \
+                               -I${STAGING_KERNEL_DIR}/include/ \
+                               -DLINUX=1 -DEGL_API_FB=1 \
+                               -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1"
+

diff --git a/meta-fsl-arm/recipes-qt/qt4/qt4-phonon-patches.inc b/meta-fsl-arm/recipes-qt/qt4/qt4-phonon-patches.inc
deleted file mode 100644 (file)
index 60bdeea..0000000
--- a/meta-fsl-arm/recipes-qt/qt4/qt4-phonon-patches.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:"
-
-SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch"
-SRC_URI_append_mx6 += " \
-       file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \
-       file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \
-"
-

diff --git a/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_%.bbappend b/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_%.bbappend
index cf763b64a4594979ba860cff3f5c657c6a15f975..14324ca1a6105336b989548d823a11c647db5e7c 100644 (file)
--- a/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_%.bbappend
+++ b/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_%.bbappend
@@ -1,15 +1 @@
-#Freescale
-include qt4-phonon-patches.inc
-
-DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2"
-QT_GLFLAGS_mx5 = "-opengl es2 -openvg"
-QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/"
-
-DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2"
-QT_GLFLAGS_mx6 = "-opengl es2 -openvg"
-QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/uapi \
-                               -I${STAGING_KERNEL_DIR}/include/ \
-                               -DLINUX=1 -DEGL_API_FB=1 \
-                               -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1"
-
-SRC_URI_append_mx6 = " file://0003-i.MX6-force-egl-visual-ID-33.patch"
+include qt4-imx-support.inc