From 5433f2def6a70a0c0fedc1581ce0727ec1ef3595 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 18 Dec 2019 16:41:22 +0100 Subject: [PATCH] dev-qt/qtwayland: Use final upstream patch Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner --- ...wayland-5.14.0-fix-linuxdmabuf-build.patch | 31 +++++++++++++++++++ dev-qt/qtwayland/qtwayland-5.14.0.ebuild | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 dev-qt/qtwayland/files/qtwayland-5.14.0-fix-linuxdmabuf-build.patch diff --git a/dev-qt/qtwayland/files/qtwayland-5.14.0-fix-linuxdmabuf-build.patch b/dev-qt/qtwayland/files/qtwayland-5.14.0-fix-linuxdmabuf-build.patch new file mode 100644 index 000000000000..7040a68a1b8d --- /dev/null +++ b/dev-qt/qtwayland/files/qtwayland-5.14.0-fix-linuxdmabuf-build.patch @@ -0,0 +1,31 @@ +From c2105d8b7e16cc934b886537968228f6300bf4bc Mon Sep 17 00:00:00 2001 +From: Johan Klokkhammer Helsing +Date: Fri, 8 Nov 2019 13:58:04 +0100 +Subject: [PATCH] Fix compilation of linuxdmabuf compositor plugin + +Mesa's eglext.h no longer includes eglmesaext.h, so copy over the typedefs we need. + +Fixes: QTBUG-79709 +Change-Id: I3190ef56e0e162636efea440dff7e760cf11fcd0 +Reviewed-by: Laszlo Agocs +--- + .../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h +index 8554721e1..02b5b6f88 100644 +--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h ++++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h +@@ -58,6 +58,10 @@ + #define DRM_FORMAT_MOD_INVALID fourcc_mod_code(NONE, DRM_FORMAT_RESERVED) + #endif + ++// Copied from eglmesaext.h ++typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display); ++typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display); ++ + QT_BEGIN_NAMESPACE + + class QWaylandCompositor; +-- +2.16.3 diff --git a/dev-qt/qtwayland/qtwayland-5.14.0.ebuild b/dev-qt/qtwayland/qtwayland-5.14.0.ebuild index 921cad2b4aac..9f2838116819 100644 --- a/dev-qt/qtwayland/qtwayland-5.14.0.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.14.0.ebuild @@ -26,7 +26,9 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-5.13.2-fix-linuxdmabuf-build.patch" ) +PATCHES=( + "${FILESDIR}/${P}-fix-linuxdmabuf-build.patch" # bug 699190, QTBUG-79709 +) src_prepare() { qt_use_disable_config libinput xkbcommon-evdev \ -- 2.26.2