diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-04-01 15:55:51 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-04-02 22:49:07 -0300 |
commit | 3e667b23645b46dc7f10a47497da7ab151a9a501 (patch) | |
tree | da083d924444d9b6c3bbcd0698f91d1acaa3137b /recipes-qt/qt4 | |
parent | 21c2208b43b3ea54d0078ee165c1bf31892396a9 (diff) | |
download | meta-fsl-arm-3e667b23645b46dc7f10a47497da7ab151a9a501.tar.gz |
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>
Diffstat (limited to 'recipes-qt/qt4')
-rw-r--r-- | recipes-qt/qt4/qt4-embedded_%.bbappend | 13 | ||||
-rw-r--r-- | recipes-qt/qt4/qt4-imx-support.inc | 20 | ||||
-rw-r--r-- | recipes-qt/qt4/qt4-phonon-patches.inc | 8 | ||||
-rw-r--r-- | recipes-qt/qt4/qt4-x11-free_%.bbappend | 16 |
4 files changed, 22 insertions, 35 deletions
diff --git a/recipes-qt/qt4/qt4-embedded_%.bbappend b/recipes-qt/qt4/qt4-embedded_%.bbappend index 05cc2e6..14324ca 100644 --- a/recipes-qt/qt4/qt4-embedded_%.bbappend +++ b/recipes-qt/qt4/qt4-embedded_%.bbappend | |||
@@ -1,12 +1 @@ | |||
1 | #Freescale | include qt4-imx-support.inc | |
2 | include qt4-phonon-patches.inc | ||
3 | |||
4 | DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" | ||
5 | QT_GLFLAGS_mx5 = "-opengl es2 -openvg" | ||
6 | QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" | ||
7 | |||
8 | DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2" | ||
9 | QT_GLFLAGS_mx6 = "-opengl es2 -openvg" | ||
10 | QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/uapi \ | ||
11 | -I${STAGING_KERNEL_DIR}/include/ \ | ||
12 | -DLINUX=1 -DEGL_API_FB=1" | ||
diff --git a/recipes-qt/qt4/qt4-imx-support.inc b/recipes-qt/qt4/qt4-imx-support.inc new file mode 100644 index 0000000..7ba4aea --- /dev/null +++ b/recipes-qt/qt4/qt4-imx-support.inc | |||
@@ -0,0 +1,20 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:" | ||
2 | |||
3 | SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch" | ||
4 | SRC_URI_append_mx6 += " \ | ||
5 | file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \ | ||
6 | file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \ | ||
7 | file://0003-i.MX6-force-egl-visual-ID-33.patch \ | ||
8 | " | ||
9 | |||
10 | DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" | ||
11 | QT_GLFLAGS_mx5 = "-opengl es2 -openvg" | ||
12 | QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" | ||
13 | |||
14 | DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2" | ||
15 | QT_GLFLAGS_mx6 = "-opengl es2 -openvg" | ||
16 | QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/uapi \ | ||
17 | -I${STAGING_KERNEL_DIR}/include/ \ | ||
18 | -DLINUX=1 -DEGL_API_FB=1 \ | ||
19 | -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1" | ||
20 | |||
diff --git a/recipes-qt/qt4/qt4-phonon-patches.inc b/recipes-qt/qt4/qt4-phonon-patches.inc deleted file mode 100644 index 60bdeea..0000000 --- a/recipes-qt/qt4/qt4-phonon-patches.inc +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:" | ||
2 | |||
3 | SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch" | ||
4 | SRC_URI_append_mx6 += " \ | ||
5 | file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \ | ||
6 | file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \ | ||
7 | " | ||
8 | |||
diff --git a/recipes-qt/qt4/qt4-x11-free_%.bbappend b/recipes-qt/qt4/qt4-x11-free_%.bbappend index cf763b6..14324ca 100644 --- a/recipes-qt/qt4/qt4-x11-free_%.bbappend +++ b/recipes-qt/qt4/qt4-x11-free_%.bbappend | |||
@@ -1,15 +1 @@ | |||
1 | #Freescale | include qt4-imx-support.inc | |
2 | include qt4-phonon-patches.inc | ||
3 | |||
4 | DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" | ||
5 | QT_GLFLAGS_mx5 = "-opengl es2 -openvg" | ||
6 | QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" | ||
7 | |||
8 | DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2" | ||
9 | QT_GLFLAGS_mx6 = "-opengl es2 -openvg" | ||
10 | QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/uapi \ | ||
11 | -I${STAGING_KERNEL_DIR}/include/ \ | ||
12 | -DLINUX=1 -DEGL_API_FB=1 \ | ||
13 | -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1" | ||
14 | |||
15 | SRC_URI_append_mx6 = " file://0003-i.MX6-force-egl-visual-ID-33.patch" | ||