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/qt3d/
Date: Mon, 12 Oct 2020 16:15:34
Message-Id: 1602519319.e0a2412fad307e4d5713f384463ba0cc6dd00cb7.asturm@gentoo
1 commit: e0a2412fad307e4d5713f384463ba0cc6dd00cb7
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 12 14:10:08 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 12 16:15:19 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a2412f
7
8 dev-qt/qt3d: Add IUSE="vulkan" tied to dev-qt/qtgui, add slot op
9
10 Uses private headers from dev-qt/qtgui.
11
12 Package-Manager: Portage-3.0.8, Repoman-3.0.1
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 dev-qt/qt3d/metadata.xml | 1 +
16 dev-qt/qt3d/qt3d-5.15.1.ebuild | 10 ++++++----
17 2 files changed, 7 insertions(+), 4 deletions(-)
18
19 diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml
20 index 5e4a34f313a..d359595b180 100644
21 --- a/dev-qt/qt3d/metadata.xml
22 +++ b/dev-qt/qt3d/metadata.xml
23 @@ -8,6 +8,7 @@
24 <use>
25 <flag name="gamepad">Add support for gamepad hardware via <pkg>dev-qt/qtgamepad</pkg></flag>
26 <flag name="qml">Build QML/QtQuick bindings</flag>
27 + <flag name="vulkan">Enable support for Vulkan</flag>
28 </use>
29 <upstream>
30 <bugs-to>https://bugreports.qt.io/</bugs-to>
31
32 diff --git a/dev-qt/qt3d/qt3d-5.15.1.ebuild b/dev-qt/qt3d/qt3d-5.15.1.ebuild
33 index 7b9a8b1af12..b23230d95b1 100644
34 --- a/dev-qt/qt3d/qt3d-5.15.1.ebuild
35 +++ b/dev-qt/qt3d/qt3d-5.15.1.ebuild
36 @@ -11,18 +11,20 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
37 fi
38
39 # TODO: tools
40 -IUSE="gamepad gles2-only qml"
41 +IUSE="gamepad gles2-only qml vulkan"
42
43 -DEPEND="
44 +RDEPEND="
45 ~dev-qt/qtconcurrent-${PV}
46 ~dev-qt/qtcore-${PV}
47 - ~dev-qt/qtgui-${PV}
48 + ~dev-qt/qtgui-${PV}:5=[vulkan=]
49 ~dev-qt/qtnetwork-${PV}
50 >=media-libs/assimp-4.0.0
51 gamepad? ( ~dev-qt/qtgamepad-${PV} )
52 qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
53 "
54 -RDEPEND="${DEPEND}"
55 +DEPEND="${RDEPEND}
56 + vulkan? ( dev-util/vulkan-headers )
57 +"
58
59 src_prepare() {
60 rm -r src/3rdparty/assimp/{code,contrib,include} || die