From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C9837138334 for ; Wed, 18 Dec 2019 15:41:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DEC7DE08AD; Wed, 18 Dec 2019 15:41:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1FCFE08AD for ; Wed, 18 Dec 2019 15:41:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5EABE34D9F2 for ; Wed, 18 Dec 2019 15:41:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65828778 for ; Wed, 18 Dec 2019 15:41:49 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1576683697.5433f2def6a70a0c0fedc1581ce0727ec1ef3595.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwayland/, dev-qt/qtwayland/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwayland/files/qtwayland-5.14.0-fix-linuxdmabuf-build.patch dev-qt/qtwayland/qtwayland-5.14.0.ebuild X-VCS-Directories: dev-qt/qtwayland/files/ dev-qt/qtwayland/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5433f2def6a70a0c0fedc1581ce0727ec1ef3595 X-VCS-Branch: master Date: Wed, 18 Dec 2019 15:41:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f2f6856b-96b2-474c-9e7b-87a491aa443b X-Archives-Hash: 037aa8a01eb198f9e65d1e0a91995cad commit: 5433f2def6a70a0c0fedc1581ce0727ec1ef3595 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Dec 18 15:41:22 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 18 15:41:37 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5433f2de dev-qt/qtwayland: Use final upstream patch Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../qtwayland-5.14.0-fix-linuxdmabuf-build.patch | 31 ++++++++++++++++++++++ dev-qt/qtwayland/qtwayland-5.14.0.ebuild | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) 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 00000000000..7040a68a1b8 --- /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 921cad2b4aa..9f283811681 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 \