1 |
commit: d6f5a4e43b87ea56823d81fec032f84016f0ab62 |
2 |
Author: Alex Xu (Hello71) <alex_y_xu <AT> yahoo <DOT> ca> |
3 |
AuthorDate: Mon Oct 25 19:42:02 2021 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 6 21:44:17 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=d6f5a4e4 |
7 |
|
8 |
app-emulation/wine-staging: update USE, deps for 6.20, 9999 |
9 |
|
10 |
vendored versions maybe should be split out, but for now the depends |
11 |
should be kept accurate. also gcrypt, themes, vaapi patches are disabled |
12 |
in wine-staging. |
13 |
|
14 |
Signed-off-by: Alex Xu (Hello71) <alex_y_xu <AT> yahoo.ca> |
15 |
Closes: https://github.com/gentoo/repo-proj-wine/pull/22 |
16 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
17 |
|
18 |
.../wine-staging/wine-staging-6.20.ebuild | 39 ++++------------------ |
19 |
.../wine-staging/wine-staging-9999.ebuild | 39 ++++------------------ |
20 |
2 files changed, 12 insertions(+), 66 deletions(-) |
21 |
|
22 |
diff --git a/app-emulation/wine-staging/wine-staging-6.20.ebuild b/app-emulation/wine-staging/wine-staging-6.20.ebuild |
23 |
index a6c1ddd..123600c 100644 |
24 |
--- a/app-emulation/wine-staging/wine-staging-6.20.ebuild |
25 |
+++ b/app-emulation/wine-staging/wine-staging-6.20.ebuild |
26 |
@@ -48,15 +48,13 @@ fi |
27 |
|
28 |
LICENSE="LGPL-2.1" |
29 |
SLOT="${MY_PV}" |
30 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" |
31 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos kernel_FreeBSD ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama" |
32 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
33 |
X? ( truetype ) |
34 |
elibc_glibc? ( threads ) |
35 |
osmesa? ( opengl ) |
36 |
pipelight? ( staging ) |
37 |
test? ( abi_x86_32 ) |
38 |
- themes? ( staging ) |
39 |
- vaapi? ( staging ) |
40 |
vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 |
41 |
|
42 |
# FIXME: the test suite is unsuitable for us; many tests require net access |
43 |
@@ -75,21 +73,18 @@ COMMON_DEPEND=" |
44 |
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) |
45 |
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) |
46 |
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) |
47 |
- faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) |
48 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
49 |
- gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] ) |
50 |
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
51 |
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
52 |
+ gphoto2? ( |
53 |
+ media-libs/libgphoto2:=[${MULTILIB_USEDEP}] |
54 |
+ virtual/jpeg:0=[${MULTILIB_USEDEP}] |
55 |
+ ) |
56 |
gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
57 |
gstreamer? ( |
58 |
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] |
59 |
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] |
60 |
) |
61 |
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) |
62 |
kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) |
63 |
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) |
64 |
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) |
65 |
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) |
66 |
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) |
67 |
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) |
68 |
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) |
69 |
@@ -100,32 +95,21 @@ COMMON_DEPEND=" |
70 |
) |
71 |
osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) |
72 |
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) |
73 |
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
74 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
75 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
76 |
sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
77 |
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
78 |
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
79 |
- themes? ( |
80 |
- dev-libs/glib:2[${MULTILIB_USEDEP}] |
81 |
- x11-libs/cairo[${MULTILIB_USEDEP}] |
82 |
- x11-libs/gtk+:3[${MULTILIB_USEDEP}] |
83 |
- ) |
84 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
85 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
86 |
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
87 |
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) |
88 |
usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) |
89 |
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) |
90 |
- vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) |
91 |
vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) |
92 |
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) |
93 |
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) |
94 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
95 |
- xml? ( |
96 |
- dev-libs/libxml2[${MULTILIB_USEDEP}] |
97 |
- dev-libs/libxslt[${MULTILIB_USEDEP}] |
98 |
- )" |
99 |
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )" |
100 |
|
101 |
RDEPEND="${COMMON_DEPEND} |
102 |
app-emulation/wine-desktop-common |
103 |
@@ -472,26 +456,20 @@ multilib_src_configure() { |
104 |
--sysconfdir="${EPREFIX}/etc/wine" |
105 |
$(use_with alsa) |
106 |
$(use_with capi) |
107 |
- $(use_with lcms cms) |
108 |
$(use_with cups) |
109 |
$(use_with udisks dbus) |
110 |
- $(use_with faudio) |
111 |
$(use_with fontconfig) |
112 |
$(use_with ssl gnutls) |
113 |
$(use_enable gecko mshtml) |
114 |
- $(use_with gcrypt) |
115 |
$(use_with gphoto2 gphoto) |
116 |
- $(use_with gsm) |
117 |
$(use_with gssapi) |
118 |
$(use_with gstreamer) |
119 |
--without-hal |
120 |
- $(use_with jpeg) |
121 |
$(use_with kerberos krb5) |
122 |
$(use_with ldap) |
123 |
# TODO: Will bug 685172 still need special handling? |
124 |
$(use_with mingw) |
125 |
$(use_enable mono mscoree) |
126 |
- $(use_with mp3 mpg123) |
127 |
$(use_with netapi) |
128 |
$(use_with nls gettext) |
129 |
$(use_with openal) |
130 |
@@ -500,7 +478,6 @@ multilib_src_configure() { |
131 |
$(use_with osmesa) |
132 |
$(use_with oss) |
133 |
$(use_with pcap) |
134 |
- $(use_with png) |
135 |
$(use_with pulseaudio pulse) |
136 |
$(use_with threads pthread) |
137 |
$(use_with scanner sane) |
138 |
@@ -517,14 +494,10 @@ multilib_src_configure() { |
139 |
$(use_with X xfixes) |
140 |
$(use_with xcomposite) |
141 |
$(use_with xinerama) |
142 |
- $(use_with xml) |
143 |
- $(use_with xml xslt) |
144 |
) |
145 |
|
146 |
use staging && myconf+=( |
147 |
--with-xattr |
148 |
- $(use_with themes gtk3) |
149 |
- $(use_with vaapi va) |
150 |
) |
151 |
|
152 |
local PKG_CONFIG |
153 |
|
154 |
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild |
155 |
index a6c1ddd..123600c 100644 |
156 |
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild |
157 |
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild |
158 |
@@ -48,15 +48,13 @@ fi |
159 |
|
160 |
LICENSE="LGPL-2.1" |
161 |
SLOT="${MY_PV}" |
162 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" |
163 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos kernel_FreeBSD ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama" |
164 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
165 |
X? ( truetype ) |
166 |
elibc_glibc? ( threads ) |
167 |
osmesa? ( opengl ) |
168 |
pipelight? ( staging ) |
169 |
test? ( abi_x86_32 ) |
170 |
- themes? ( staging ) |
171 |
- vaapi? ( staging ) |
172 |
vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 |
173 |
|
174 |
# FIXME: the test suite is unsuitable for us; many tests require net access |
175 |
@@ -75,21 +73,18 @@ COMMON_DEPEND=" |
176 |
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) |
177 |
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) |
178 |
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) |
179 |
- faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) |
180 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
181 |
- gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] ) |
182 |
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
183 |
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
184 |
+ gphoto2? ( |
185 |
+ media-libs/libgphoto2:=[${MULTILIB_USEDEP}] |
186 |
+ virtual/jpeg:0=[${MULTILIB_USEDEP}] |
187 |
+ ) |
188 |
gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
189 |
gstreamer? ( |
190 |
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] |
191 |
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] |
192 |
) |
193 |
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) |
194 |
kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) |
195 |
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) |
196 |
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) |
197 |
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) |
198 |
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) |
199 |
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) |
200 |
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) |
201 |
@@ -100,32 +95,21 @@ COMMON_DEPEND=" |
202 |
) |
203 |
osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) |
204 |
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) |
205 |
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
206 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
207 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
208 |
sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
209 |
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
210 |
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
211 |
- themes? ( |
212 |
- dev-libs/glib:2[${MULTILIB_USEDEP}] |
213 |
- x11-libs/cairo[${MULTILIB_USEDEP}] |
214 |
- x11-libs/gtk+:3[${MULTILIB_USEDEP}] |
215 |
- ) |
216 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
217 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
218 |
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
219 |
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) |
220 |
usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) |
221 |
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) |
222 |
- vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) |
223 |
vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) |
224 |
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) |
225 |
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) |
226 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
227 |
- xml? ( |
228 |
- dev-libs/libxml2[${MULTILIB_USEDEP}] |
229 |
- dev-libs/libxslt[${MULTILIB_USEDEP}] |
230 |
- )" |
231 |
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )" |
232 |
|
233 |
RDEPEND="${COMMON_DEPEND} |
234 |
app-emulation/wine-desktop-common |
235 |
@@ -472,26 +456,20 @@ multilib_src_configure() { |
236 |
--sysconfdir="${EPREFIX}/etc/wine" |
237 |
$(use_with alsa) |
238 |
$(use_with capi) |
239 |
- $(use_with lcms cms) |
240 |
$(use_with cups) |
241 |
$(use_with udisks dbus) |
242 |
- $(use_with faudio) |
243 |
$(use_with fontconfig) |
244 |
$(use_with ssl gnutls) |
245 |
$(use_enable gecko mshtml) |
246 |
- $(use_with gcrypt) |
247 |
$(use_with gphoto2 gphoto) |
248 |
- $(use_with gsm) |
249 |
$(use_with gssapi) |
250 |
$(use_with gstreamer) |
251 |
--without-hal |
252 |
- $(use_with jpeg) |
253 |
$(use_with kerberos krb5) |
254 |
$(use_with ldap) |
255 |
# TODO: Will bug 685172 still need special handling? |
256 |
$(use_with mingw) |
257 |
$(use_enable mono mscoree) |
258 |
- $(use_with mp3 mpg123) |
259 |
$(use_with netapi) |
260 |
$(use_with nls gettext) |
261 |
$(use_with openal) |
262 |
@@ -500,7 +478,6 @@ multilib_src_configure() { |
263 |
$(use_with osmesa) |
264 |
$(use_with oss) |
265 |
$(use_with pcap) |
266 |
- $(use_with png) |
267 |
$(use_with pulseaudio pulse) |
268 |
$(use_with threads pthread) |
269 |
$(use_with scanner sane) |
270 |
@@ -517,14 +494,10 @@ multilib_src_configure() { |
271 |
$(use_with X xfixes) |
272 |
$(use_with xcomposite) |
273 |
$(use_with xinerama) |
274 |
- $(use_with xml) |
275 |
- $(use_with xml xslt) |
276 |
) |
277 |
|
278 |
use staging && myconf+=( |
279 |
--with-xattr |
280 |
- $(use_with themes gtk3) |
281 |
- $(use_with vaapi va) |
282 |
) |
283 |
|
284 |
local PKG_CONFIG |