commit: c6f9b5ac7d5bf0220fd08187cc85c101f5de9909
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue May 1 01:53:20 2018 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue May 1 01:53:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=c6f9b5ac
app-emulation/wine-any: Updates to 9999
- Added sdl USE
- Updated upstream SRC_URI to point to the active fork
- Removed unneeded patch exclusion as the patch was dropped upstream
Package-Manager: Portage-2.3.31, Repoman-2.3.9
app-emulation/wine-any/metadata.xml | 1 +
app-emulation/wine-any/wine-any-9999.ebuild | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app-emulation/wine-any/metadata.xml
b/app-emulation/wine-any/metadata.xml
index 35b3090..4f3128c 100644
--- a/app-emulation/wine-any/metadata.xml
+++ b/app-emulation/wine-any/metadata.xml
@@ -45,6 +45,7 @@ This variant of the wine packaging allows for the use of the
Wine-Staging patchs
<flag name="samba">Add support for NTLM auth. see
http://wiki.winehq.org/NtlmAuthSetupGuide and
http://wiki.winehq.org/NtlmSigningAndSealing</flag>
+ <flag name="sdl">Add support for gamepad detection using
SDL</flag>
<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>
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild
b/app-emulation/wine-any/wine-any-9999.ebuild
index d868884..11a4e31 100644
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@@ -38,17 +38,17 @@ SRC_URI="${SRC_URI}
"
if [[ ${PV} == "9999" ]] ; then
-
STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git";
+ STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git";
D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git";
else
SRC_URI="${SRC_URI}
- staging? (
https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz ->
${STAGING_P}.tar.gz )
+ staging? (
https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz ->
${STAGING_P}.tar.gz )
d3d9? (
https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
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 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"
+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 sdl 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 )
@@ -109,6 +109,7 @@ COMMON_DEPEND="
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+ sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
themes? (
@@ -363,7 +364,6 @@ src_prepare() {
ewarn "Wine bugzilla should explicitly state that staging was
used."
local STAGING_EXCLUDE=""
- STAGING_EXCLUDE="${STAGING_EXCLUDE} -W
winhlp32-Flex_Workaround" # Avoid double patching
https://bugs.winehq.org/show_bug.cgi?id=42132
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W
Pipelight"
# Launch wine-staging patcher in a subshell, using eapply as a
backend, and gitapply.sh as a backend for binary patches
@@ -484,6 +484,7 @@ multilib_src_configure() {
$(use_with pulseaudio pulse)
$(use_with threads pthread)
$(use_with scanner sane)
+ $(use_with sdl)
$(use_enable test tests)
$(use_with truetype freetype)
$(use_with udev)
