From e34bcb88901f8b4fc1d39a1449630c232d6405c7 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 27 May 2020 09:10:35 -0500 Subject: qtbase: Drop upstreamed patch Drop patch 0015-Add-eglfs-to-IMX-GPU.patch. It is upstream and no longer necessary. Signed-off-by: Tom Hochstein (cherry picked from commit 22408f5766b64f9122b61a0aa15263a7e71763d1) --- .../recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch | 15 --------------- dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 6 ------ 2 files changed, 21 deletions(-) delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch deleted file mode 100644 index 46541d43..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf -index c202c47fa1..2bfb96f4ec 100644 ---- a/mkspecs/linux-oe-g++/qmake.conf -+++ b/mkspecs/linux-oe-g++/qmake.conf -@@ -33,6 +33,8 @@ QMAKE_CFLAGS_ISYSTEM = - # for the SDK - isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG) - -+EGLFS_DEVICE_INTEGRATION = eglfs_viv -+ - include(../oe-device-extra.pri) - - load(device_config) --- -2.17.1 diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 8c2a5ea9..25625b20 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -9,12 +9,6 @@ SRC_URI_append_imxgpu = " \ file://0014-Add-IMX-GPU-support.patch \ file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \ " -SRC_URI_APPEND_3D_NOT_X11 = " \ - file://0015-Add-eglfs-to-IMX-GPU.patch \ -" -SRC_URI_append_imxgpu3d = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '${SRC_URI_APPEND_3D_NOT_X11}', d)} \ -" PACKAGECONFIG_GL_IMX_GPU = "" PACKAGECONFIG_GL_IMX_GPU_mx8 = "gbm kms" -- cgit v1.2.3-54-g00ecf