1 |
commit: a0f47f12ffa2381a33c872db6cc344e1a4c764d1 |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 31 00:45:41 2020 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 31 00:47:41 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0f47f12 |
7 |
|
8 |
app-emulation/wine-staging: Sync with ::wine |
9 |
|
10 |
Add unwind USE |
11 |
|
12 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
13 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
14 |
|
15 |
app-emulation/wine-staging/metadata.xml | 1 + |
16 |
app-emulation/wine-staging/wine-staging-5.5.ebuild | 4 +++- |
17 |
app-emulation/wine-staging/wine-staging-9999.ebuild | 4 +++- |
18 |
3 files changed, 7 insertions(+), 2 deletions(-) |
19 |
|
20 |
diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml |
21 |
index ebbe6f23153..47f226562ce 100644 |
22 |
--- a/app-emulation/wine-staging/metadata.xml |
23 |
+++ b/app-emulation/wine-staging/metadata.xml |
24 |
@@ -44,6 +44,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset. |
25 |
<flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag> |
26 |
<flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag> |
27 |
<flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> |
28 |
+ <flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> to unwind the stack</flag> |
29 |
<flag name="vkd3d">Use <pkg>app-emulation/vkd3d</pkg> to provide Direct3D 12 support</flag> |
30 |
<flag name="vulkan">Enable Vulkan drivers</flag> |
31 |
</use> |
32 |
|
33 |
diff --git a/app-emulation/wine-staging/wine-staging-5.5.ebuild b/app-emulation/wine-staging/wine-staging-5.5.ebuild |
34 |
index 81084a55cb3..c4c429fb8c2 100644 |
35 |
--- a/app-emulation/wine-staging/wine-staging-5.5.ebuild |
36 |
+++ b/app-emulation/wine-staging/wine-staging-5.5.ebuild |
37 |
@@ -44,7 +44,7 @@ fi |
38 |
|
39 |
LICENSE="LGPL-2.1" |
40 |
SLOT="${PV}" |
41 |
-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 +mono mp3 ncurses 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 v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" |
42 |
+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 +mono mp3 ncurses 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 v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" |
43 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
44 |
X? ( truetype ) |
45 |
elibc_glibc? ( threads ) |
46 |
@@ -112,6 +112,7 @@ COMMON_DEPEND=" |
47 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
48 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
49 |
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
50 |
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) |
51 |
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) |
52 |
vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) |
53 |
vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] ) |
54 |
@@ -473,6 +474,7 @@ multilib_src_configure() { |
55 |
$(use_enable test tests) |
56 |
$(use_with truetype freetype) |
57 |
$(use_with udev) |
58 |
+ $(use_with unwind) |
59 |
$(use_with v4l v4l2) |
60 |
$(use_with vkd3d) |
61 |
$(use_with vulkan) |
62 |
|
63 |
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild |
64 |
index 81084a55cb3..c4c429fb8c2 100644 |
65 |
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild |
66 |
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild |
67 |
@@ -44,7 +44,7 @@ fi |
68 |
|
69 |
LICENSE="LGPL-2.1" |
70 |
SLOT="${PV}" |
71 |
-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 +mono mp3 ncurses 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 v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" |
72 |
+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 +mono mp3 ncurses 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 v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" |
73 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
74 |
X? ( truetype ) |
75 |
elibc_glibc? ( threads ) |
76 |
@@ -112,6 +112,7 @@ COMMON_DEPEND=" |
77 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
78 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
79 |
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
80 |
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) |
81 |
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) |
82 |
vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) |
83 |
vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] ) |
84 |
@@ -473,6 +474,7 @@ multilib_src_configure() { |
85 |
$(use_enable test tests) |
86 |
$(use_with truetype freetype) |
87 |
$(use_with udev) |
88 |
+ $(use_with unwind) |
89 |
$(use_with v4l v4l2) |
90 |
$(use_with vkd3d) |
91 |
$(use_with vulkan) |