summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/qt5-layer
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-02 09:18:25 -0300
commit22408f5766b64f9122b61a0aa15263a7e71763d1 (patch)
tree6de3b45e0a8973c6534b97d638b1f6666ef29cec /dynamic-layers/qt5-layer
parentb37a332b130389d8f4429fbb9d87d26b65cfc386 (diff)
downloadmeta-freescale-22408f5766b64f9122b61a0aa15263a7e71763d1.tar.gz
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>
Diffstat (limited to 'dynamic-layers/qt5-layer')
-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 @@
1diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
2index c202c47fa1..2bfb96f4ec 100644
3--- a/mkspecs/linux-oe-g++/qmake.conf
4+++ b/mkspecs/linux-oe-g++/qmake.conf
5@@ -33,6 +33,8 @@ QMAKE_CFLAGS_ISYSTEM =
6 # for the SDK
7 isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
8
9+EGLFS_DEVICE_INTEGRATION = eglfs_viv
10+
11 include(../oe-device-extra.pri)
12
13 load(device_config)
14--
152.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 0294b3c7..0a396e52 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 = " \
9 file://0014-Add-IMX-GPU-support.patch \ 9 file://0014-Add-IMX-GPU-support.patch \
10 file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \ 10 file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \
11" 11"
12SRC_URI_APPEND_3D_NOT_X11 = " \
13 file://0015-Add-eglfs-to-IMX-GPU.patch \
14"
15SRC_URI_append_imxgpu3d = " \
16 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '${SRC_URI_APPEND_3D_NOT_X11}', d)} \
17"
18 12
19PACKAGECONFIG_GL_IMX_GPU = "" 13PACKAGECONFIG_GL_IMX_GPU = ""
20PACKAGECONFIG_GL_IMX_GPU_mx8 = "gbm kms" 14PACKAGECONFIG_GL_IMX_GPU_mx8 = "gbm kms"