aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr2016-11-15 09:14:31 -0800
committerDonald Carr2017-01-13 06:17:02 -0800
commitae9e0f380ee2db8aa6d98fb0ca3f86e919e958a3 (patch)
treea22aca8307a3bf149fff237625e31793ac59dbee
parent654b224ef43d955449fb332ea62ac2f70a585d50 (diff)
downloadaur-ae9e0f380ee2db8aa6d98fb0ca3f86e919e958a3.tar.gz
Fix brcm-egl build against Qt 5.8 beta
Change-Id: I57173a45e9aecc05617ebae7602d10bbda1120e1
-rw-r--r--0001-Fix-build-of-brcm-egl-client.patch27
-rw-r--r--PKGBUILD4
2 files changed, 31 insertions, 0 deletions
diff --git a/0001-Fix-build-of-brcm-egl-client.patch b/0001-Fix-build-of-brcm-egl-client.patch
new file mode 100644
index 000000000000..539f9a521cfb
--- /dev/null
+++ b/0001-Fix-build-of-brcm-egl-client.patch
@@ -0,0 +1,27 @@
+From 0a52f991561ea7633aa813f759664657a856b079 Mon Sep 17 00:00:00 2001
+From: Donald Carr <sirspudd@gmail.com>
+Date: Tue, 15 Nov 2016 09:11:25 -0800
+Subject: [PATCH] Fix build of brcm-egl client
+
+Addendum to 3443483c9efdcfbfe049f96c83f83a5bf1d81e61
+
+Change-Id: I915495d506efaa23f8f901293ee12ef5ec1736de
+---
+ src/hardwareintegration/client/brcm-egl/brcm-egl.pri | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri
+index c4ccdcc..e4fd68f 100644
+--- a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri
++++ b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri
+@@ -8,6 +8,7 @@ contains(QT_CONFIG, no-pkg-config) {
+ }
+
+ CONFIG += egl
++QT += egl_support-private
+
+ SOURCES += $$PWD/qwaylandbrcmeglintegration.cpp \
+ $$PWD/qwaylandbrcmglcontext.cpp \
+--
+2.10.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 3a2e372b8d7f..54b21b37074f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -161,6 +161,7 @@ build() {
local _srcdir="${srcdir}/${_source_package_name}"
local _bindir="${_srcdir}"
local _basedir="${_srcdir}/qtbase"
+ local _waylanddir="${_srcdir}/qtwayland"
local _declarativedir="${_srcdir}/qtdeclarative"
local _webenginedir="${_srcdir}/qtwebengine"
local _mkspec_dir="${_basedir}/mkspecs/devices/${_mkspec}"
@@ -194,6 +195,9 @@ if $_patching; then
cd ${_basedir}
patch -p1 < ${startdir}/0001-Check-lib64-as-well-as-lib.patch
+ cd ${_waylanddir}
+ patch -p1 < ${startdir}/0001-Fix-build-of-brcm-egl-client.patch
+
# Work around our embarresing propensity to stomp on your own tailored build configuration
sed -i "s/O[23]/Os/" ${_basedir}/mkspecs/common/gcc-base.conf || exit 1
fi