Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/
Date: Mon, 09 May 2022 22:09:09
Message-Id: 1652134076.04958f253000b568cafe05b3c7c07fdf4b391092.sarnex@gentoo
1 commit: 04958f253000b568cafe05b3c7c07fdf4b391092
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 9 22:07:56 2022 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Mon May 9 22:07:56 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=04958f25
7
8 app-emulation/wine-staging: Remove vkd3d USE
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
12
13 app-emulation/wine-staging/wine-staging-7.8.ebuild | 7 ++-----
14 app-emulation/wine-staging/wine-staging-9999.ebuild | 7 ++-----
15 2 files changed, 4 insertions(+), 10 deletions(-)
16
17 diff --git a/app-emulation/wine-staging/wine-staging-7.8.ebuild b/app-emulation/wine-staging/wine-staging-7.8.ebuild
18 index 75221ce..4929984 100644
19 --- a/app-emulation/wine-staging/wine-staging-7.8.ebuild
20 +++ b/app-emulation/wine-staging/wine-staging-7.8.ebuild
21 @@ -48,14 +48,13 @@ fi
22
23 LICENSE="LGPL-2.1"
24 SLOT="${MY_PV}"
25 -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
26 +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
27 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
28 X? ( truetype )
29 elibc_glibc? ( threads )
30 osmesa? ( opengl )
31 pipelight? ( staging )
32 - test? ( abi_x86_32 )
33 - vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
34 + test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
35
36 # FIXME: the test suite is unsuitable for us; many tests require net access
37 # or fail due to Xvfb's opengl limitations.
38 @@ -110,7 +109,6 @@ COMMON_DEPEND="
39 unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
40 usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
41 v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
42 - vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
43 vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
44 xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
45 xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
46 @@ -487,7 +485,6 @@ multilib_src_configure() {
47 $(use_with unwind)
48 $(use_with usb)
49 $(use_with v4l v4l2)
50 -# $(use_enable vkd3d)
51 $(use_with vulkan)
52 $(use_with X x)
53 $(use_with X xfixes)
54
55 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
56 index 75221ce..4929984 100644
57 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
58 +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
59 @@ -48,14 +48,13 @@ fi
60
61 LICENSE="LGPL-2.1"
62 SLOT="${MY_PV}"
63 -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
64 +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vulkan +X +xcomposite xinerama"
65 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
66 X? ( truetype )
67 elibc_glibc? ( threads )
68 osmesa? ( opengl )
69 pipelight? ( staging )
70 - test? ( abi_x86_32 )
71 - vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
72 + test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
73
74 # FIXME: the test suite is unsuitable for us; many tests require net access
75 # or fail due to Xvfb's opengl limitations.
76 @@ -110,7 +109,6 @@ COMMON_DEPEND="
77 unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
78 usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
79 v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
80 - vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
81 vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
82 xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
83 xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
84 @@ -487,7 +485,6 @@ multilib_src_configure() {
85 $(use_with unwind)
86 $(use_with usb)
87 $(use_with v4l v4l2)
88 -# $(use_enable vkd3d)
89 $(use_with vulkan)
90 $(use_with X x)
91 $(use_with X xfixes)