commit: aaed88e77bdfa5a236a9fd7a89084394598ab0a5 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Sun Nov 24 23:19:55 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Nov 25 01:35:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaed88e7
dev-qt/qtwayland: fix build with >=media-libs/mesa-19.3.0_rc4 See also: https://bugreports.qt.io/browse/QTBUG-79709 Reported-by: Ostashevskyi Viktor <ostash <AT> ostash.kiev.ua> Closes: https://bugs.gentoo.org/699190 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../qtwayland-5.13.2-fix-linuxdmabuf-build.patch | 29 ++++++++++++++++++++++ dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild | 2 ++ 2 files changed, 31 insertions(+) diff --git a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch new file mode 100644 index 00000000000..f9b6b657118 --- /dev/null +++ b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch @@ -0,0 +1,29 @@ +From 23ea5504200ff5f7e40bd264280a78db09c1bc5b Mon Sep 17 00:00:00 2001 +From: Johan Klokkhammer Helsing <[email protected]> +Date: Fri, 8 Nov 2019 13:58:04 +0100 +Subject: [PATCH] WIP: Fix compilation of linuxdmabuf compositor plugin + +WIP, because I'm not sure if this is the way to go, but it fixes +compilation on my machine. + +Fixes: QTBUG-79709 +Change-Id: I3190ef56e0e162636efea440dff7e760cf11fcd0 +--- + .../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h +index 2abc2ce6b..d1f4a3039 100644 +--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h ++++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h +@@ -53,6 +53,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + + // compatibility with libdrm <= 2.4.74 + #ifndef DRM_FORMAT_RESERVED +-- +2.16.3 + diff --git a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild index 7c452ff8e0b..5cc773676a7 100644 --- a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild @@ -29,6 +29,8 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-fix-touch-ignored.patch" # QTBUG-79744 "${FILESDIR}/${P}-fix-crash.patch" # QTBUG-79674 + # Pending upstream: + "${FILESDIR}/${P}-fix-linuxdmabuf-build.patch" # bug 699190, QTBUG-79709 ) src_prepare() {
