Move to new upstream patch for 5.12.1 bcm_host breakage

3 files changed, 81 insertions, 27 deletions

diff --git a/0001-Move-bcm_host-over-to-pkgConfig.patch b/0001-Move-bcm_host-over-to-pkgConfig.patch
deleted file mode 100644
index 33bf684a4671..000000000000
--- a/0001-Move-bcm_host-over-to-pkgConfig.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From afa87d4fca95754da0d082cf9ac4f7c654800a2c Mon Sep 17 00:00:00 2001
-From: Donald Carr <d@chaos-reins.com>
-Date: Sun, 10 Feb 2019 11:32:42 -0800
-Subject: [PATCH] Move bcm_host over to pkgConfig
-
-Change-Id: I6206245562d2ce1ae83398f4c8fbf97e98dbfaf6
----
- src/gui/configure.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 89934c8f1d..99d81387a0 100644
---- a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -60,7 +60,7 @@
-         "bcm_host": {
-             "export": "",
-             "sources": [
--                "-lbcm_host"
-+                { "type": "pkgConfig", "args": "bcm_host" }
-             ]
-         },
-         "dxguid": {
--- 
-2.20.1
-
diff --git a/0001-Turn-bcm_host-library-into-makeSpec-source.patch b/0001-Turn-bcm_host-library-into-makeSpec-source.patch
new file mode 100644
index 000000000000..7ecbc27dde99
--- /dev/null
+++ b/0001-Turn-bcm_host-library-into-makeSpec-source.patch
@@ -0,0 +1,80 @@
+From 0a50f3de2be1ec6456714d4d54ba86236873b820 Mon Sep 17 00:00:00 2001
+From: Joerg Bornemann <joerg.bornemann@qt.io>
+Date: Mon, 11 Feb 2019 15:00:09 +0100
+Subject: [PATCH] Turn bcm_host library into makeSpec source
+
+The makespec provides LIBDIR, INCDIR and LIBS for bcm_host.
+
+Change-Id: I4bc268504dc48edaf2884f1c14b745260fd9112c
+Fixes: QTBUG-73727
+---
+ mkspecs/devices/linux-rasp-pi-g++/qmake.conf  | 4 ++++
+ mkspecs/devices/linux-rasp-pi2-g++/qmake.conf | 5 +++++
+ mkspecs/devices/linux-rasp-pi3-g++/qmake.conf | 4 ++++
+ src/gui/configure.json                        | 3 ++-
+ 4 files changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
+index b72091373d..6ec7817efb 100644
+--- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
++++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
+@@ -20,6 +20,10 @@ QMAKE_INCDIR_OPENVG     = $${QMAKE_INCDIR_EGL}
+ QMAKE_LIBS_EGL          = -lEGL -lGLESv2
+ QMAKE_LIBS_OPENVG       = -lEGL -lOpenVG -lGLESv2
+ 
++QMAKE_INCDIR_BCM_HOST   = $$[QT_SYSROOT]/opt/vc/include
++QMAKE_LIBDIR_BCM_HOST   = $$[QT_SYSROOT]/opt/vc/lib
++QMAKE_LIBS_BCM_HOST     = -lbcm_host
++
+ contains(DISTRO, squeeze) {
+     #Debian Squeeze: Legacy everything
+     QMAKE_LIBS_OPENGL_ES2   = -lGLESv2 -lEGL
+diff --git a/mkspecs/devices/linux-rasp-pi2-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi2-g++/qmake.conf
+index ffe8f5739a..3b49f19a5b 100644
+--- a/mkspecs/devices/linux-rasp-pi2-g++/qmake.conf
++++ b/mkspecs/devices/linux-rasp-pi2-g++/qmake.conf
+@@ -16,6 +16,11 @@ QMAKE_INCDIR_OPENVG     = $${QMAKE_INCDIR_EGL}
+ 
+ QMAKE_LIBS_EGL          = -lEGL -lGLESv2
+ QMAKE_LIBS_OPENVG       = -lEGL -lOpenVG -lGLESv2
++
++QMAKE_INCDIR_BCM_HOST   = $$[QT_SYSROOT]/opt/vc/include
++QMAKE_LIBDIR_BCM_HOST   = $$[QT_SYSROOT]/opt/vc/lib
++QMAKE_LIBS_BCM_HOST     = -lbcm_host
++
+ QMAKE_CFLAGS            += -march=armv7-a -marm -mthumb-interwork -mfpu=neon-vfpv4 -mtune=cortex-a7 -mabi=aapcs-linux
+ QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
+ 
+diff --git a/mkspecs/devices/linux-rasp-pi3-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi3-g++/qmake.conf
+index 2bb70ffb5a..c35a828745 100644
+--- a/mkspecs/devices/linux-rasp-pi3-g++/qmake.conf
++++ b/mkspecs/devices/linux-rasp-pi3-g++/qmake.conf
+@@ -31,6 +31,10 @@ QMAKE_LIBS_OPENGL_ES2   = $${VC_LINK_LINE} -lGLESv2
+ # The official opt vc EGL references GLESv2 symbols: need to link it
+ QMAKE_LIBS_EGL          = $${VC_LINK_LINE} -lEGL -lGLESv2
+ 
++QMAKE_LIBDIR_BCM_HOST   = =$${VC_LIBRARY_PATH}
++QMAKE_INCDIR_BCM_HOST   = $$VC_INCLUDE_PATH
++QMAKE_LIBS_BCM_HOST     = -lbcm_host
++
+ QMAKE_CFLAGS            = -march=armv8-a -mtune=cortex-a53 -mfpu=crypto-neon-fp-armv8
+ QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
+ 
+diff --git a/src/gui/configure.json b/src/gui/configure.json
+index 70d0817791..3108b691be 100644
+--- a/src/gui/configure.json
++++ b/src/gui/configure.json
+@@ -59,8 +59,9 @@
+         },
+         "bcm_host": {
+             "export": "",
++            "headers": "bcm_host.h",
+             "sources": [
+-                "-lbcm_host"
++                { "type": "makeSpec", "spec": "BCM_HOST" }
+             ]
+         },
+         "dxguid": {
+-- 
+2.20.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 228df1a3afc8..a840ebd5e65d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -395,7 +395,7 @@ fi
 
 if $_patching; then
   cd ${_basedir}
-  patch -p1 < ${startdir}/0001-Move-bcm_host-over-to-pkgConfig.patch
+  patch -p1 < ${startdir}/0001-Turn-bcm_host-library-into-makeSpec-source.patch
 fi
 
   rm -Rf ${_bindir}