Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwayland/
Date: Wed, 26 Feb 2020 22:02:26
Message-Id: 1582754203.1c95aab1a62e2d11ec6a728204bd3d819bc9a4b2.asturm@gentoo
1 commit: 1c95aab1a62e2d11ec6a728204bd3d819bc9a4b2
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 26 20:37:41 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 26 21:56:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c95aab1
7
8 dev-qt/qtwayland: Add USE vulkan
9
10 Closes: https://bugs.gentoo.org/703594
11 Package-Manager: Portage-2.3.89, Repoman-2.3.20
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 dev-qt/qtwayland/metadata.xml | 1 +
15 dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild | 9 +++++++--
16 2 files changed, 8 insertions(+), 2 deletions(-)
17
18 diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
19 index 4fb03e67901..db7a41ae479 100644
20 --- a/dev-qt/qtwayland/metadata.xml
21 +++ b/dev-qt/qtwayland/metadata.xml
22 @@ -7,6 +7,7 @@
23 </maintainer>
24 <use>
25 <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
26 + <flag name="vulkan">Enable support for Vulkan-based server buffer integration</flag>
27 </use>
28 <upstream>
29 <bugs-to>https://bugreports.qt.io/</bugs-to>
30
31 diff --git a/dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild
32 index 0602db2ff59..5fa75b673a7 100644
33 --- a/dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild
34 +++ b/dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild
35 @@ -10,15 +10,16 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
36 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
37 fi
38
39 -IUSE="+libinput xcomposite"
40 +IUSE="+libinput vulkan xcomposite"
41
42 DEPEND="
43 >=dev-libs/wayland-1.6.0
44 ~dev-qt/qtcore-${PV}
45 ~dev-qt/qtdeclarative-${PV}
46 - ~dev-qt/qtgui-${PV}[egl,libinput=]
47 + ~dev-qt/qtgui-${PV}[egl,libinput=,vulkan=]
48 media-libs/mesa[egl]
49 >=x11-libs/libxkbcommon-0.2.0
50 + vulkan? ( dev-util/vulkan-headers )
51 xcomposite? (
52 x11-libs/libX11
53 x11-libs/libXcomposite
54 @@ -37,6 +38,10 @@ src_prepare() {
55 src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \
56 tests/auto/compositor/compositor/compositor.pro
57
58 + qt_use_disable_config vulkan wayland-vulkan-server-buffer \
59 + src/plugins/hardwareintegration/client/client.pro \
60 + src/plugins/hardwareintegration/compositor/compositor.pro
61 +
62 use xcomposite || rm -r config.tests/xcomposite || die
63
64 qt5-build_src_prepare