1 |
commit: c44760bfd0fa7f8bb9d31a06346fb9367795ba56 |
2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 24 23:19:55 2019 +0000 |
4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 24 23:19:55 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c44760bf |
7 |
|
8 |
dev-qt/qtwayland: fix build with >=media-libs/mesa-19.3.0_rc4 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/700832 |
11 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
12 |
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> |
13 |
|
14 |
.../qtwayland-5.13.2-fix-linuxdmabuf-build.patch | 29 ++++++++++++++++++++++ |
15 |
dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild | 2 ++ |
16 |
2 files changed, 31 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000..f9b6b657 |
21 |
--- /dev/null |
22 |
+++ b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch |
23 |
@@ -0,0 +1,29 @@ |
24 |
+From 23ea5504200ff5f7e40bd264280a78db09c1bc5b Mon Sep 17 00:00:00 2001 |
25 |
+From: Johan Klokkhammer Helsing <johan.helsing@××.io> |
26 |
+Date: Fri, 8 Nov 2019 13:58:04 +0100 |
27 |
+Subject: [PATCH] WIP: Fix compilation of linuxdmabuf compositor plugin |
28 |
+ |
29 |
+WIP, because I'm not sure if this is the way to go, but it fixes |
30 |
+compilation on my machine. |
31 |
+ |
32 |
+Fixes: QTBUG-79709 |
33 |
+Change-Id: I3190ef56e0e162636efea440dff7e760cf11fcd0 |
34 |
+--- |
35 |
+ .../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h | 1 + |
36 |
+ 1 file changed, 1 insertion(+) |
37 |
+ |
38 |
+diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h |
39 |
+index 2abc2ce6b..d1f4a3039 100644 |
40 |
+--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h |
41 |
++++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h |
42 |
+@@ -53,6 +53,7 @@ |
43 |
+ |
44 |
+ #include <EGL/egl.h> |
45 |
+ #include <EGL/eglext.h> |
46 |
++#include <EGL/eglmesaext.h> |
47 |
+ |
48 |
+ // compatibility with libdrm <= 2.4.74 |
49 |
+ #ifndef DRM_FORMAT_RESERVED |
50 |
+-- |
51 |
+2.16.3 |
52 |
+ |
53 |
|
54 |
diff --git a/dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild b/dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild |
55 |
index ac4fdc11..921cad2b 100644 |
56 |
--- a/dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild |
57 |
+++ b/dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild |
58 |
@@ -26,6 +26,8 @@ DEPEND=" |
59 |
" |
60 |
RDEPEND="${DEPEND}" |
61 |
|
62 |
+PATCHES=( "${FILESDIR}/${PN}-5.13.2-fix-linuxdmabuf-build.patch" ) |
63 |
+ |
64 |
src_prepare() { |
65 |
qt_use_disable_config libinput xkbcommon-evdev \ |
66 |
src/client/client.pro \ |