From: Sébastien Taylor <[email protected]> The meta-qt5 updated Qt version 5.1.1 to 5.2.0. Contents remain compatible.
Signed-off-by: Sébastien Taylor <[email protected]> --- qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend | 57 -------------------------- qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend | 57 ++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend diff --git a/qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend deleted file mode 100644 index 310d7f7..0000000 --- a/qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique - -HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}" - -PACKAGECONFIG_GL_mx5 = "gles2" -PACKAGECONFIG_append_mx5 = " tslib icu examples" - -PACKAGECONFIG_GL_mx6 = "gles2" -PACKAGECONFIG_append_mx6 = " tslib icu examples" - -do_configure_prepend_mx5() { - sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf - - cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF -IMX5_CFLAGS = -D_LINUX=1 -QMAKE_LIBS_EGL += -lEGL -QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -QMAKE_LIBS_OPENVG += -lOpenVG -lEGL - -QMAKE_CFLAGS_RELEASE += \$\$IMX5_CFLAGS -QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS -QMAKE_CFLAGS_DEBUG += \$\$IMX5_CFLAGS -QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS - -load(qt_config) - -EOF -} - -do_configure_prepend_mx6() { - # adapt qmake.conf to our needs - sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf - if test ${HAS_X11} -eq 0; then - cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF -EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp -IMX6_CFLAGS = -DLINUX=1 -DEGL_API_FB=1 -EOF - # copy the hook in the mkspecs directory OE is using - cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/ - else - cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF -IMX6_CFLAGS = -DLINUX=1 -EOF - fi - cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF -QMAKE_LIBS_EGL += -lEGL -QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL -QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL -QMAKE_CFLAGS_RELEASE += \$\$IMX6_CFLAGS -QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS -QMAKE_CFLAGS_DEBUG += \$\$IMX6_CFLAGS -QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS - -load(qt_config) - -EOF -} diff --git a/qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend new file mode 100644 index 0000000..310d7f7 --- /dev/null +++ b/qt5-layer/recipes-qt/qt5/qtbase_5.2.0.bbappend @@ -0,0 +1,57 @@ +# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique + +HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}" + +PACKAGECONFIG_GL_mx5 = "gles2" +PACKAGECONFIG_append_mx5 = " tslib icu examples" + +PACKAGECONFIG_GL_mx6 = "gles2" +PACKAGECONFIG_append_mx6 = " tslib icu examples" + +do_configure_prepend_mx5() { + sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf + + cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF +IMX5_CFLAGS = -D_LINUX=1 +QMAKE_LIBS_EGL += -lEGL +QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL +QMAKE_LIBS_OPENVG += -lOpenVG -lEGL + +QMAKE_CFLAGS_RELEASE += \$\$IMX5_CFLAGS +QMAKE_CXXFLAGS_RELEASE += \$\$IMX5_CFLAGS +QMAKE_CFLAGS_DEBUG += \$\$IMX5_CFLAGS +QMAKE_CXXFLAGS_DEBUG += \$\$IMX5_CFLAGS + +load(qt_config) + +EOF +} + +do_configure_prepend_mx6() { + # adapt qmake.conf to our needs + sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf + if test ${HAS_X11} -eq 0; then + cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF +EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp +IMX6_CFLAGS = -DLINUX=1 -DEGL_API_FB=1 +EOF + # copy the hook in the mkspecs directory OE is using + cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/ + else + cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF +IMX6_CFLAGS = -DLINUX=1 +EOF + fi + cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF +QMAKE_LIBS_EGL += -lEGL +QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL +QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL +QMAKE_CFLAGS_RELEASE += \$\$IMX6_CFLAGS +QMAKE_CXXFLAGS_RELEASE += \$\$IMX6_CFLAGS +QMAKE_CFLAGS_DEBUG += \$\$IMX6_CFLAGS +QMAKE_CXXFLAGS_DEBUG += \$\$IMX6_CFLAGS + +load(qt_config) + +EOF +} -- 1.8.3.4 (Apple Git-47) _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
