From c2a0d924f6200eea1fb1d1b61e7420ea5da2f8fb Mon Sep 17 00:00:00 2001 From: antznin Date: Tue, 5 May 2020 15:28:15 +0200 Subject: qtbase: Fix patch fuzz for mkspecs/linux-oe-g++/qmake.conf The current version of the patch causes a fuzz because of context change. Signed-off-by: antznin (cherry picked from commit eaefe965615070e58438b868467f7a045289d8ec) --- .../recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 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 index 8e7129e3..46541d43 100644 --- 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 @@ -1,8 +1,8 @@ -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 -@@ -37,6 +37,8 @@ QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK) +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) @@ -10,4 +10,6 @@ Index: git/mkspecs/linux-oe-g++/qmake.conf + include(../oe-device-extra.pri) - QMAKE_LIBS_EGL += -lEGL + load(device_config) +-- +2.17.1 -- cgit v1.2.3-54-g00ecf