1 |
commit: 97e19a05376c0140fa74ee215ef79d677772fb05 |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 28 20:00:50 2018 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 28 20:01:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e19a05 |
7 |
|
8 |
app-emulation/vkd3d: Sync with ::wine |
9 |
|
10 |
Fix dependencies |
11 |
|
12 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
13 |
|
14 |
app-emulation/vkd3d/vkd3d-1.0.ebuild | 9 ++++++++- |
15 |
app-emulation/vkd3d/vkd3d-9999.ebuild | 9 ++++++++- |
16 |
2 files changed, 16 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/app-emulation/vkd3d/vkd3d-1.0.ebuild b/app-emulation/vkd3d/vkd3d-1.0.ebuild |
19 |
index a84144c4147..e5f968f0a63 100644 |
20 |
--- a/app-emulation/vkd3d/vkd3d-1.0.ebuild |
21 |
+++ b/app-emulation/vkd3d/vkd3d-1.0.ebuild |
22 |
@@ -15,7 +15,14 @@ fi |
23 |
|
24 |
IUSE="spirv-tools" |
25 |
RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] ) |
26 |
- x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]" |
27 |
+ dev-util/spirv-headers |
28 |
+ || ( |
29 |
+ ( <=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] ) |
30 |
+ ( >media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] |
31 |
+ dev-util/vulkan-headers |
32 |
+ ) |
33 |
+ ) |
34 |
+ x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]" |
35 |
|
36 |
DEPEND="${RDEPEND}" |
37 |
|
38 |
|
39 |
diff --git a/app-emulation/vkd3d/vkd3d-9999.ebuild b/app-emulation/vkd3d/vkd3d-9999.ebuild |
40 |
index a84144c4147..e5f968f0a63 100644 |
41 |
--- a/app-emulation/vkd3d/vkd3d-9999.ebuild |
42 |
+++ b/app-emulation/vkd3d/vkd3d-9999.ebuild |
43 |
@@ -15,7 +15,14 @@ fi |
44 |
|
45 |
IUSE="spirv-tools" |
46 |
RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] ) |
47 |
- x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]" |
48 |
+ dev-util/spirv-headers |
49 |
+ || ( |
50 |
+ ( <=media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] ) |
51 |
+ ( >media-libs/vulkan-loader-1.1.70.0-r999[${MULTILIB_USEDEP}] |
52 |
+ dev-util/vulkan-headers |
53 |
+ ) |
54 |
+ ) |
55 |
+ x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]" |
56 |
|
57 |
DEPEND="${RDEPEND}" |