app-emulation/wine-d3d9: Sync from ::wine

Add GSSAPI and Vulkan support

Closes: https://bugs.gentoo.org/649132
Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/app-emulation/wine-d3d9/metadata.xml b/app-emulation/wine-d3d9/metadata.xml
index 375e22626d8caff6ba50c175d33ca3f0f0649129..b1ac4c1095ea463620b5e7318960d14eb7254cff 100644 (file)
--- a/app-emulation/wine-d3d9/metadata.xml
+++ b/app-emulation/wine-d3d9/metadata.xml
@@ -27,6 +27,7 @@ This variant of the Wine packaging includes the Gallium Nine patchset.
                        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>
@@ -42,6 +43,7 @@ This variant of the Wine packaging includes the Gallium Nine patchset.
                http://wiki.winehq.org/NtlmAuthSetupGuide and
                http://wiki.winehq.org/NtlmSigningAndSealing</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="sourceforge">wine</remote-id>

diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
index ddbc7bcc947c9b31cfa3f8551167a7e484e1e54c..9025029236ad32aa62b688989e36bc4ba0578a7f 100644 (file)
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-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 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
        X? ( truetype )
        elibc_glibc? ( threads )
@@ -76,6 +76,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}]
@@ -105,6 +106,7 @@ COMMON_DEPEND="
        udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
        udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
        v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+       vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
        xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
        xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
        xml? (
@@ -172,7 +174,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=()
 
@@ -371,7 +372,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
@@ -429,6 +429,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)
@@ -452,6 +453,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)