1 |
commit: 83829e4e555e7d4063d2362ac5ff2c2879e7f077 |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 28 15:58:34 2018 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 28 15:58:34 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83829e4e |
7 |
|
8 |
app-emulation/wine-d3d9: Sync with ::wine |
9 |
|
10 |
Add vkd3d USE |
11 |
|
12 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
13 |
|
14 |
app-emulation/wine-d3d9/metadata.xml | 1 + |
15 |
app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild | 4 +++- |
16 |
app-emulation/wine-d3d9/wine-d3d9-9999.ebuild | 4 +++- |
17 |
3 files changed, 7 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/app-emulation/wine-d3d9/metadata.xml b/app-emulation/wine-d3d9/metadata.xml |
20 |
index cea9c514b69..fcb2defbd2b 100644 |
21 |
--- a/app-emulation/wine-d3d9/metadata.xml |
22 |
+++ b/app-emulation/wine-d3d9/metadata.xml |
23 |
@@ -44,6 +44,7 @@ This variant of the Wine packaging includes the Gallium Nine patchset. |
24 |
http://wiki.winehq.org/NtlmSigningAndSealing</flag> |
25 |
<flag name="sdl">Add support for gamepad detection using SDL</flag> |
26 |
<flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> |
27 |
+ <flag name="vkd3d">Use <pkg>app-emulation/vkd3d</pkg> to provide Direct3D 12 support</flag> |
28 |
<flag name="vulkan">Enable Vulkan drivers</flag> |
29 |
</use> |
30 |
<upstream> |
31 |
|
32 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild |
33 |
index 0fba831fcde..76dbf253632 100644 |
34 |
--- a/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild |
35 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild |
36 |
@@ -44,7 +44,7 @@ fi |
37 |
|
38 |
LICENSE="LGPL-2.1" |
39 |
SLOT="${PV}" |
40 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" |
41 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml" |
42 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
43 |
X? ( truetype ) |
44 |
elibc_glibc? ( threads ) |
45 |
@@ -107,6 +107,7 @@ COMMON_DEPEND=" |
46 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
47 |
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
48 |
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) |
49 |
+ vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] ) |
50 |
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) |
51 |
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) |
52 |
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
53 |
@@ -435,6 +436,7 @@ multilib_src_configure() { |
54 |
$(use_with truetype freetype) |
55 |
$(use_with udev) |
56 |
$(use_with v4l) |
57 |
+ $(use_with vkd3d) |
58 |
$(use_with vulkan) |
59 |
$(use_with X x) |
60 |
$(use_with X xfixes) |
61 |
|
62 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
63 |
index 0fba831fcde..76dbf253632 100644 |
64 |
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
65 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
66 |
@@ -44,7 +44,7 @@ fi |
67 |
|
68 |
LICENSE="LGPL-2.1" |
69 |
SLOT="${PV}" |
70 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" |
71 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml" |
72 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
73 |
X? ( truetype ) |
74 |
elibc_glibc? ( threads ) |
75 |
@@ -107,6 +107,7 @@ COMMON_DEPEND=" |
76 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
77 |
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
78 |
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) |
79 |
+ vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] ) |
80 |
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) |
81 |
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) |
82 |
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
83 |
@@ -435,6 +436,7 @@ multilib_src_configure() { |
84 |
$(use_with truetype freetype) |
85 |
$(use_with udev) |
86 |
$(use_with v4l) |
87 |
+ $(use_with vkd3d) |
88 |
$(use_with vulkan) |
89 |
$(use_with X x) |
90 |
$(use_with X xfixes) |