aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2020-05-27 09:10:35 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2020-06-05 10:05:48 -0300
commite34bcb88901f8b4fc1d39a1449630c232d6405c7 (patch)
tree8ce076476887485b31be3142a55d94474a26e162
parent626e271bd66d3320c5a386c43979a27117c9bd87 (diff)
downloadmeta-freescale-e34bcb88901f8b4fc1d39a1449630c232d6405c7.tar.gz
meta-freescale-e34bcb88901f8b4fc1d39a1449630c232d6405c7.tar.bz2
meta-freescale-e34bcb88901f8b4fc1d39a1449630c232d6405c7.zip
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 <tom.hochstein@nxp.com> (cherry picked from commit 22408f5766b64f9122b61a0aa15263a7e71763d1)
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch15
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend6
2 files changed, 0 insertions, 21 deletions
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"