commit:     ed4b4d5632b07db8f63b8b8a67c165cea3072135
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  2 02:13:04 2018 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Mar  2 02:13:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed4b4d56

app-emulation/wine-any: 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-any/metadata.xml         | 2 ++
 app-emulation/wine-any/wine-any-9999.ebuild | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app-emulation/wine-any/metadata.xml 
b/app-emulation/wine-any/metadata.xml
index 20330724652..8786a15edd5 100644
--- a/app-emulation/wine-any/metadata.xml
+++ b/app-emulation/wine-any/metadata.xml
@@ -28,6 +28,7 @@ This variant of the wine packaging allows for the use of the 
Wine-Staging patchs
                        This patch may break some applications.</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>
@@ -47,6 +48,7 @@ This variant of the wine packaging allows for the use of the 
Wine-Staging patchs
                <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-any/wine-any-9999.ebuild 
b/app-emulation/wine-any/wine-any-9999.ebuild
index dfe4cca912e..351fee6c6fb 100644
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@@ -48,7 +48,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-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"
+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"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
        X? ( truetype )
        elibc_glibc? ( threads )
@@ -84,6 +84,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}]
@@ -120,6 +121,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? (
@@ -192,7 +194,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=()
 
@@ -426,7 +427,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
@@ -484,6 +484,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)
@@ -507,6 +508,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)

Reply via email to