From 82926285249116b6e5032cd75c4fe51786695488 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 26 Dec 2019 14:12:11 +0100 Subject: [PATCH] qtbase: Use upstreamed patches instead of custom NXP ones. These patches were copied from meta-fsl-bsp-release layer, but with the latest versions throws a compilation issue with the ccimx8mn platform. However the upstreamed patches works fine. Signed-off-by: Arturo Buzarra --- ...d-error-when-egl-headers-need-platfo.patch | 30 ------------------- .../qt5/qtbase/0014-Add-IMX-GPU-support.patch | 22 -------------- .../qtbase/0015-Add-eglfs-to-IMX-GPU.patch | 13 -------- ...-Configure-eglfs-with-egl-pkg-config.patch | 13 -------- 4 files changed, 78 deletions(-) delete mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch delete mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch delete mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch delete mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/0016-Configure-eglfs-with-egl-pkg-config.patch diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch b/meta-digi-dey/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch deleted file mode 100644 index c99c04704..000000000 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3f9703fecd670b36030e1093466f6d11b370c19f Mon Sep 17 00:00:00 2001 -From: Yuqing Zhu -Date: Mon, 27 Mar 2017 15:33:35 +0800 -Subject: [PATCH] egl.prf: Fix build error when egl headers need platform - definition - -Gain the value through pkg-config and pass it through QMAKE_CFLAGS_EGL. - -Signed-off-by: Yuqing Zhu ---- - mkspecs/features/egl.prf | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf -index 9fa0c9e..85d5852 100644 ---- a/mkspecs/features/egl.prf -+++ b/mkspecs/features/egl.prf -@@ -1,3 +1,9 @@ -+# egl headers need a definition -+PKG_CONFIG = $$pkgConfigExecutable() -+PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags egl) -+PKGCONFIG_CFLAGS = $$find(PKGCONFIG_CFLAGS, ^-D.*) -+QMAKE_CFLAGS_EGL = $$PKGCONFIG_CFLAGS -+ - INCLUDEPATH += $$QMAKE_INCDIR_EGL - LIBS_PRIVATE += $$QMAKE_LIBS_EGL - QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL --- -1.9.1 - diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch b/meta-digi-dey/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch deleted file mode 100644 index 370a2fc8a..000000000 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch +++ /dev/null @@ -1,22 +0,0 @@ -From bd9d14bbb7cc121d97d7f9e3b49509d8491a9aaa Mon Sep 17 00:00:00 2001 -From: Tom Hochstein -Date: Tue, 2 May 2017 22:17:34 -0500 - ---- - mkspecs/linux-oe-g++/qmake.conf | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf -index 30d31ed..7a93f2b 100644 ---- a/mkspecs/linux-oe-g++/qmake.conf -+++ b/mkspecs/linux-oe-g++/qmake.conf -@@ -38,5 +38,9 @@ isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG) - - include(../oe-device-extra.pri) - -+QMAKE_LIBS_EGL += -lEGL -+QMAKE_LIBS_OPENGL_ES2 += -lEGL -lGLESv2 -+QMAKE_LIBS_OPENVG += -lEGL -lOpenVG -+ - load(device_config) - load(qt_config) diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch b/meta-digi-dey/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch deleted file mode 100644 index 794fa6222..000000000 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/mkspecs/linux-oe-g++/qmake.conf -=================================================================== ---- git.orig/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 17:03:17.000000000 -0600 -+++ git/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 17:06:23.000000000 -0600 -@@ -39,6 +39,8 @@ - - include(../oe-device-extra.pri) - -+EGLFS_DEVICE_INTEGRATION = eglfs_viv -+ - QMAKE_LIBS_EGL += -lEGL - QMAKE_LIBS_OPENGL_ES2 += -lEGL -lGLESv2 - QMAKE_LIBS_OPENVG += -lEGL -lOpenVG diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/0016-Configure-eglfs-with-egl-pkg-config.patch b/meta-digi-dey/recipes-qt/qt5/qtbase/0016-Configure-eglfs-with-egl-pkg-config.patch deleted file mode 100644 index a245d79aa..000000000 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/0016-Configure-eglfs-with-egl-pkg-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/src/plugins/platforms/eglfs/eglfs-plugin.pro -=================================================================== ---- git.orig/src/plugins/platforms/eglfs/eglfs-plugin.pro 2017-01-04 16:54:05.000000000 -0600 -+++ git/src/plugins/platforms/eglfs/eglfs-plugin.pro 2017-01-04 16:56:25.000000000 -0600 -@@ -2,6 +2,8 @@ - - QT += platformsupport-private eglfs_device_lib-private - -+CONFIG += egl -+ - SOURCES += $$PWD/qeglfsmain.cpp - - OTHER_FILES += $$PWD/eglfs.json