summaryrefslogtreecommitdiffstats
path: root/dynamic-layers
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers')
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend33
1 files changed, 16 insertions, 17 deletions
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index a376a838..e0979bf5 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -15,13 +15,12 @@ QT_CONFIG_FLAGS_append_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-e
15PACKAGECONFIG_GL_mx6q = "gles2" 15PACKAGECONFIG_GL_mx6q = "gles2"
16PACKAGECONFIG_GL_mx6dl = "gles2" 16PACKAGECONFIG_GL_mx6dl = "gles2"
17PACKAGECONFIG_GL_mx6sx = "gles2" 17PACKAGECONFIG_GL_mx6sx = "gles2"
18PACKAGECONFIG_GL_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', \ 18PACKAGECONFIG_GL_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', ' gl', '', d)}"
19 ' gl', '', d)}"
20QT_CONFIG_FLAGS_append_mx6q = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}" 19QT_CONFIG_FLAGS_append_mx6q = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
21QT_CONFIG_FLAGS_append_mx6dl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}" 20QT_CONFIG_FLAGS_append_mx6dl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
22QT_CONFIG_FLAGS_append_mx6sx = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}" 21QT_CONFIG_FLAGS_append_mx6sx = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
23QT_CONFIG_FLAGS_append_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', \ 22QT_CONFIG_FLAGS_append_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', \
24 ' -no-eglfs', ' -no-opengl -linuxfb -no-eglfs', d)}" 23 ' -no-opengl -linuxfb -no-eglfs', d)}"
25 24
26do_configure_prepend_mx5() { 25do_configure_prepend_mx5() {
27 sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf 26 sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
@@ -43,28 +42,28 @@ EOF
43} 42}
44 43
45do_configure_prepend_mx6() { 44do_configure_prepend_mx6() {
46 # adapt qmake.conf to our needs 45 # adapt qmake.conf to our needs
47 sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf 46 sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
48 if test ${HAS_X11} -eq 0; then 47 if test ${HAS_X11} -eq 0; then
49 if test ${IS_MX6SL} -eq 0; then 48 if test ${IS_MX6SL} -eq 0; then
50 49
51 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF 50 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
52EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp 51EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
53IMX6_CFLAGS = -DLINUX=1 -DEGL_API_FB=1 52IMX6_CFLAGS = -DLINUX=1 -DEGL_API_FB=1
54EOF 53EOF
55 else 54 else
56cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF 55 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
57IMX6_CFLAGS = -DLINUX=1 56IMX6_CFLAGS = -DLINUX=1
58EOF 57EOF
59fi 58 fi
60 # copy the hook in the mkspecs directory OE is using 59 # copy the hook in the mkspecs directory OE is using
61 cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/ 60 cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
62 else 61 else
63 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF 62 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
64IMX6_CFLAGS = -DLINUX=1 63IMX6_CFLAGS = -DLINUX=1
65EOF 64EOF
66 fi 65 fi
67 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF 66 cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
68QMAKE_LIBS_EGL += -lEGL 67QMAKE_LIBS_EGL += -lEGL
69QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL 68QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL
70QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL 69QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL