From 1a5a1675bf6ddb85dcabe775e1c3d39d787f4b05 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 13 Sep 2015 22:36:20 +0200 Subject: qtbase: remove Force_egl_visual_ID_33.patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It does not apply for Qt 5.5 anymore and mainline qtbase takes care for vivante specifics. See qtbase commit e7bd18f156e508969cc536c0f0b8e3c2c3c75c47 Author: Laszlo Agocs Date: Wed Mar 18 11:03:39 2015 +0100 Fix EGL config - X visual matching for i.MX6 Task-number: QTBUG-44290 Change-Id: I06cbb169803aa8a06ea310651def1f3582194c8e Reviewed-by: Jørgen Lind Signed-off-by: Andreas Müller Signed-off-by: Otavio Salvador --- .../qt5/qtbase/Force_egl_visual_ID_33.patch | 23 ---------------------- qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 4 ---- 2 files changed, 27 deletions(-) delete mode 100644 qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch diff --git a/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch b/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch deleted file mode 100644 index b0be292..0000000 --- a/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch +++ /dev/null @@ -1,23 +0,0 @@ -Workaround EGL initialization failure due visual mismatch - -Error: - -Warning: EGL suggested using X Visual ID 33 (RGB888) for EGL config 28 (RGB444), but this is incompatable -Unable to find an X11 visual which matches EGL config 28 -Could not initialize EGL -Aborted - -Upstream-Status: Inappropriate [workaround] - -Signed-off-by: Otavio Salvador - -diff -Naur qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp ---- qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:08:42.163895341 -0800 -+++ qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:09:37.207893799 -0800 -@@ -180,5 +180,5 @@ - } - - qWarning("Unable to find an X11 visual which matches EGL config %d", configId); -- return (VisualID)0; -+ return (VisualID)33; - } diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 2803d0a..6570702 100644 --- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -1,9 +1,5 @@ # Copyright (C) 2013 Eric Bénard - Eukréa Electromatique -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://Force_egl_visual_ID_33.patch" - HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}" IS_MX6SL = "0" -- cgit v1.2.3-54-g00ecf