diff options
| author |   Jimi Huotari <chiitoo@gentoo.org> | 2019-11-25 01:19:55 +0200 |
|---|---|---|
| committer |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-11-25 02:35:28 +0100 |
| commit | aaed88e77bdfa5a236a9fd7a89084394598ab0a5 (patch) | |
| tree | 652ec03dc771b4676b82415d1538c1c8da9bbcf9 /dev-qt | |
| parent | sys-boot/gnu-efi: remove old (diff) | |
| download | gentoo-aaed88e77bdfa5a236a9fd7a89084394598ab0a5.tar.gz gentoo-aaed88e77bdfa5a236a9fd7a89084394598ab0a5.tar.bz2 gentoo-aaed88e77bdfa5a236a9fd7a89084394598ab0a5.zip | |
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@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@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch | 29 | ||||
| -rw-r--r-- | dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild | 2 |
2 files changed, 31 insertions, 0 deletions
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 000000000000..f9b6b6571182 --- /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 <johan.helsing@qt.io> +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 7c452ff8e0b3..5cc773676a7c 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() { |