| 1 |
commit: ed4b4d5632b07db8f63b8b8a67c165cea3072135 |
| 2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 2 02:13:04 2018 +0000 |
| 4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 2 02:13:58 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed4b4d56 |
| 7 |
|
| 8 |
app-emulation/wine-any: Sync from ::wine |
| 9 |
|
| 10 |
Add GSSAPI and Vulkan support |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/649132 |
| 13 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 14 |
|
| 15 |
app-emulation/wine-any/metadata.xml | 2 ++ |
| 16 |
app-emulation/wine-any/wine-any-9999.ebuild | 8 +++++--- |
| 17 |
2 files changed, 7 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/wine-any/metadata.xml b/app-emulation/wine-any/metadata.xml |
| 20 |
index 20330724652..8786a15edd5 100644 |
| 21 |
--- a/app-emulation/wine-any/metadata.xml |
| 22 |
+++ b/app-emulation/wine-any/metadata.xml |
| 23 |
@@ -28,6 +28,7 @@ This variant of the wine packaging allows for the use of the Wine-Staging patchs |
| 24 |
This patch may break some applications.</flag> |
| 25 |
<flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag> |
| 26 |
<flag name="gecko">Add support for the Gecko engine when using iexplore</flag> |
| 27 |
+ <flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag> |
| 28 |
<flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag> |
| 29 |
<flag name="mono">Add support for .NET using Wine's Mono add-on</flag> |
| 30 |
<flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag> |
| 31 |
@@ -47,6 +48,7 @@ This variant of the wine packaging allows for the use of the Wine-Staging patchs |
| 32 |
<flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag> |
| 33 |
<flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag> |
| 34 |
<flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> |
| 35 |
+ <flag name="vulkan">Enable Vulkan drivers</flag> |
| 36 |
</use> |
| 37 |
<upstream> |
| 38 |
<remote-id type="github">wine-compholio/wine-staging</remote-id> |
| 39 |
|
| 40 |
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild |
| 41 |
index dfe4cca912e..351fee6c6fb 100644 |
| 42 |
--- a/app-emulation/wine-any/wine-any-9999.ebuild |
| 43 |
+++ b/app-emulation/wine-any/wine-any-9999.ebuild |
| 44 |
@@ -48,7 +48,7 @@ fi |
| 45 |
|
| 46 |
LICENSE="LGPL-2.1" |
| 47 |
SLOT="${PV}" |
| 48 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm 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 s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml" |
| 49 |
+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 pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml" |
| 50 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 51 |
X? ( truetype ) |
| 52 |
elibc_glibc? ( threads ) |
| 53 |
@@ -84,6 +84,7 @@ COMMON_DEPEND=" |
| 54 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
| 55 |
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
| 56 |
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
| 57 |
+ gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
| 58 |
gstreamer? ( |
| 59 |
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] |
| 60 |
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] |
| 61 |
@@ -120,6 +121,7 @@ COMMON_DEPEND=" |
| 62 |
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
| 63 |
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) |
| 64 |
vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) |
| 65 |
+ vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) |
| 66 |
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) |
| 67 |
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
| 68 |
xml? ( |
| 69 |
@@ -192,7 +194,6 @@ PATCHES=( |
| 70 |
"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 71 |
"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 72 |
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 |
| 73 |
- "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 |
| 74 |
) |
| 75 |
PATCHES_BIN=() |
| 76 |
|
| 77 |
@@ -426,7 +427,6 @@ src_prepare() { |
| 78 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 79 |
|
| 80 |
# Fix manpage generation for locales #469418 and abi_x86_64 #617864 |
| 81 |
- # Requires wine-2.0-rearrange-manpages.patch |
| 82 |
|
| 83 |
# Duplicate manpages input files for wine64 |
| 84 |
local f |
| 85 |
@@ -484,6 +484,7 @@ multilib_src_configure() { |
| 86 |
$(use_enable gecko mshtml) |
| 87 |
$(use_with gphoto2 gphoto) |
| 88 |
$(use_with gsm) |
| 89 |
+ $(use_with gssapi) |
| 90 |
$(use_with gstreamer) |
| 91 |
--without-hal |
| 92 |
$(use_with jpeg) |
| 93 |
@@ -507,6 +508,7 @@ multilib_src_configure() { |
| 94 |
$(use_with truetype freetype) |
| 95 |
$(use_with udev) |
| 96 |
$(use_with v4l) |
| 97 |
+ $(use_with vulkan) |
| 98 |
$(use_with X x) |
| 99 |
$(use_with X xfixes) |
| 100 |
$(use_with xcomposite) |
Archives