Patchwork [meta-fsl-arm] qtbase: update to version 5.1.1

login
register
mail settings
Submitter Christoph Settgast
Date Oct. 14, 2013, 4:49 p.m.
Message ID <1381769376-30437-1-git-send-email-christoph.settgast@methodpark.de>
Download mbox | patch
Permalink /patch/59889/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Christoph Settgast - Oct. 14, 2013, 4:49 p.m.
meta-qt5 uses 5.1.1, update bbappend accordingly

Signed-off-by: Christoph Settgast <christoph.settgast@methodpark.de>
---
 qt5-layer/recipes-qt/qt5/qtbase_5.1.0.bbappend | 57 --------------------------
 qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend | 57 ++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 100644 qt5-layer/recipes-qt/qt5/qtbase_5.1.0.bbappend
 create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend
Eric BENARD - Oct. 15, 2013, 12:40 p.m.
Hi Christoph,

Le Mon, 14 Oct 2013 18:49:36 +0200,
Christoph Settgast <christoph.settgast@methodpark.de> a écrit :

> meta-qt5 uses 5.1.1, update bbappend accordingly
> 
> Signed-off-by: Christoph Settgast <christoph.settgast@methodpark.de>
Acked-by: Eric Bénard <eric@eukrea.com>

for this kind of move you can use -M option to format-patch to have a
smaller patch and an easier view of what was changed.

Eric

Patch

diff --git a/qt5-layer/recipes-qt/qt5/qtbase_5.1.0.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_5.1.0.bbappend
deleted file mode 100644
index 310d7f7..0000000
--- a/qt5-layer/recipes-qt/qt5/qtbase_5.1.0.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.1.1.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_5.1.1.bbappend
new file mode 100644
index 0000000..310d7f7
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtbase_5.1.1.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
+}