aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr2016-11-17 15:13:49 -0800
committerDonald Carr2017-01-13 06:18:05 -0800
commit2ccae88ac62c91f63fd5881d830f032219765e03 (patch)
tree0d15bea4776be461d66877fcdc455f50ac830f6e
parent590f253f5606e788c728539204521b5cf1545c81 (diff)
downloadaur-2ccae88ac62c91f63fd5881d830f032219765e03.tar.gz
Integrate patch to fix brcm-egl breakage
Change-Id: I65aa5133dfec3b6d477e8e9f66a814be8f47b96d
-rw-r--r--0001-Fix-brcm-egl-build-by-correcting-commit-usage.patch30
-rw-r--r--PKGBUILD1
2 files changed, 31 insertions, 0 deletions
diff --git a/0001-Fix-brcm-egl-build-by-correcting-commit-usage.patch b/0001-Fix-brcm-egl-build-by-correcting-commit-usage.patch
new file mode 100644
index 000000000000..9cdfe7c8434d
--- /dev/null
+++ b/0001-Fix-brcm-egl-build-by-correcting-commit-usage.patch
@@ -0,0 +1,30 @@
+From 458ce42f8177cc51f882fc408d8252d30ece660c Mon Sep 17 00:00:00 2001
+From: Donald Carr <sirspudd@gmail.com>
+Date: Thu, 17 Nov 2016 15:04:43 -0800
+Subject: [PATCH] Fix brcm-egl build by correcting commit() usage
+
+Adjusted existing call to commit() in keeping with parallel changes in 5b807802
+
+Change-Id: I31c17336efa9a79a5f6c1719702215db7239a97d
+---
+ src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
+index 4d56d66..9842f61 100644
+--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
++++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
+@@ -252,9 +252,7 @@ void QWaylandBrcmEglWindow::swapBuffers()
+ return;
+
+ m_buffers[m_current]->bind();
+- attach(m_buffers[m_current], 0, 0);
+- damage(QRect(QPoint(), geometry().size()));
+- commit();
++ commit(m_buffers[m_current], QRegion(0, 0, geometry().size().width(), geometry().size().height()));
+
+ m_current = (m_current + 1) % m_count;
+ m_buffers[m_current]->waitForRelease();
+--
+2.10.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 73c636427fa9..42f1ad45c0b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -242,6 +242,7 @@ if $_patching; then
cd ${_waylanddir}
patch -p1 < ${startdir}/0001-Fix-build-of-brcm-egl-client.patch
patch -p1 < ${startdir}/5.8.0-beta1-5b807802866c8df00cb3340d4f9bcc343be5973a.patch
+ patch -p1 < ${startdir}/0001-Fix-brcm-egl-build-by-correcting-commit-usage.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