commit: 6834cdcf10049eca40224e4d5248710ecbd6d7bb Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Fri Mar 2 02:11:31 2018 +0000 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> CommitDate: Fri Mar 2 02:13:54 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6834cdcf
app-emulation/wine-staging: Sync from ::wine Add GSSAPI and Vulkan support Closes: https://bugs.gentoo.org/649132 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-emulation/wine-staging/metadata.xml | 2 ++ app-emulation/wine-staging/wine-staging-9999.ebuild | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml index e9e31879e22..1295661b4ce 100644 --- a/app-emulation/wine-staging/metadata.xml +++ b/app-emulation/wine-staging/metadata.xml @@ -21,6 +21,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset. <flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag> <flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag> <flag name="gecko">Add support for the Gecko engine when using iexplore</flag> + <flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag> <flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag> <flag name="mono">Add support for .NET using Wine's Mono add-on</flag> <flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag> @@ -40,6 +41,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset. <flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag> <flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag> <flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> + <flag name="vulkan">Enable Vulkan drivers</flag> </use> <upstream> <remote-id type="github">wine-compholio/wine-staging</remote-id> diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 9454c3d09a9..477b8968d2f 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -44,7 +44,7 @@ fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -74,6 +74,7 @@ COMMON_DEPEND=" fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] @@ -110,6 +111,7 @@ COMMON_DEPEND=" udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) xml? ( @@ -182,7 +184,6 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 - "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -404,7 +405,6 @@ src_prepare() { l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS # Fix manpage generation for locales #469418 and abi_x86_64 #617864 - # Requires wine-2.0-rearrange-manpages.patch # Duplicate manpages input files for wine64 local f @@ -462,6 +462,7 @@ multilib_src_configure() { $(use_enable gecko mshtml) $(use_with gphoto2 gphoto) $(use_with gsm) + $(use_with gssapi) $(use_with gstreamer) --without-hal $(use_with jpeg) @@ -485,6 +486,7 @@ multilib_src_configure() { $(use_with truetype freetype) $(use_with udev) $(use_with v4l) + $(use_with vulkan) $(use_with X x) $(use_with X xfixes) $(use_with xcomposite)
