From ba487405f60c38ea2a77b7a6866f954b665eefa7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 5 Jul 2013 13:39:25 -0300 Subject: qt4: Follow OE-Core upgrade to 4.8.5 version Change-Id: I8a13169e2add1d36aa7f83e7865b954090208a74 Signed-off-by: Otavio Salvador --- recipes-qt/qt4/qt4-embedded_4.8.4.bbappend | 16 ---------------- recipes-qt/qt4/qt4-embedded_4.8.5.bbappend | 14 ++++++++++++++ recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend | 16 ---------------- recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend | 14 ++++++++++++++ 4 files changed, 28 insertions(+), 32 deletions(-) delete mode 100644 recipes-qt/qt4/qt4-embedded_4.8.4.bbappend create mode 100644 recipes-qt/qt4/qt4-embedded_4.8.5.bbappend delete mode 100644 recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend create mode 100644 recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend diff --git a/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend b/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend deleted file mode 100644 index 041f1eb..0000000 --- a/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend +++ /dev/null @@ -1,16 +0,0 @@ -#Freescale -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" - -DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" -PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" -QT_GLFLAGS_mx5 = "-opengl es2 -openvg" -QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" - -DEPENDS_append_mx6 = " virtual/kernel" -PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" -QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/" - -PRINC := "${@int(PRINC) + 2}" diff --git a/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend b/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend new file mode 100644 index 0000000..74bfb31 --- /dev/null +++ b/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend @@ -0,0 +1,14 @@ +#Freescale +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" + +DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" +PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" +QT_GLFLAGS_mx5 = "-opengl es2 -openvg" +QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" + +DEPENDS_append_mx6 = " virtual/kernel" +PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" +QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/" diff --git a/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend b/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend deleted file mode 100644 index 041f1eb..0000000 --- a/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend +++ /dev/null @@ -1,16 +0,0 @@ -#Freescale -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" - -DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" -PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" -QT_GLFLAGS_mx5 = "-opengl es2 -openvg" -QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" - -DEPENDS_append_mx6 = " virtual/kernel" -PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" -QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/" - -PRINC := "${@int(PRINC) + 2}" diff --git a/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend b/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend new file mode 100644 index 0000000..74bfb31 --- /dev/null +++ b/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend @@ -0,0 +1,14 @@ +#Freescale +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" + +DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2" +PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" +QT_GLFLAGS_mx5 = "-opengl es2 -openvg" +QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" + +DEPENDS_append_mx6 = " virtual/kernel" +PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" +QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/" -- cgit v1.2.3-54-g00ecf