1 |
commit: c6f9b5ac7d5bf0220fd08187cc85c101f5de9909 |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 1 01:53:20 2018 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 1 01:53:24 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=c6f9b5ac |
7 |
|
8 |
app-emulation/wine-any: Updates to 9999 |
9 |
|
10 |
- Added sdl USE |
11 |
- Updated upstream SRC_URI to point to the active fork |
12 |
- Removed unneeded patch exclusion as the patch was dropped upstream |
13 |
|
14 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
15 |
|
16 |
app-emulation/wine-any/metadata.xml | 1 + |
17 |
app-emulation/wine-any/wine-any-9999.ebuild | 9 +++++---- |
18 |
2 files changed, 6 insertions(+), 4 deletions(-) |
19 |
|
20 |
diff --git a/app-emulation/wine-any/metadata.xml b/app-emulation/wine-any/metadata.xml |
21 |
index 35b3090..4f3128c 100644 |
22 |
--- a/app-emulation/wine-any/metadata.xml |
23 |
+++ b/app-emulation/wine-any/metadata.xml |
24 |
@@ -45,6 +45,7 @@ This variant of the wine packaging allows for the use of the Wine-Staging patchs |
25 |
<flag name="samba">Add support for NTLM auth. see |
26 |
http://wiki.winehq.org/NtlmAuthSetupGuide and |
27 |
http://wiki.winehq.org/NtlmSigningAndSealing</flag> |
28 |
+ <flag name="sdl">Add support for gamepad detection using SDL</flag> |
29 |
<flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag> |
30 |
<flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag> |
31 |
<flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> |
32 |
|
33 |
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild |
34 |
index d868884..11a4e31 100644 |
35 |
--- a/app-emulation/wine-any/wine-any-9999.ebuild |
36 |
+++ b/app-emulation/wine-any/wine-any-9999.ebuild |
37 |
@@ -38,17 +38,17 @@ SRC_URI="${SRC_URI} |
38 |
" |
39 |
|
40 |
if [[ ${PV} == "9999" ]] ; then |
41 |
- STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git" |
42 |
+ STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" |
43 |
D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git" |
44 |
else |
45 |
SRC_URI="${SRC_URI} |
46 |
- staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz ) |
47 |
+ staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz ) |
48 |
d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )" |
49 |
fi |
50 |
|
51 |
LICENSE="LGPL-2.1" |
52 |
SLOT="${PV}" |
53 |
-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" |
54 |
+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" |
55 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
56 |
X? ( truetype ) |
57 |
elibc_glibc? ( threads ) |
58 |
@@ -109,6 +109,7 @@ COMMON_DEPEND=" |
59 |
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
60 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
61 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
62 |
+ sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
63 |
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
64 |
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
65 |
themes? ( |
66 |
@@ -363,7 +364,6 @@ src_prepare() { |
67 |
ewarn "Wine bugzilla should explicitly state that staging was used." |
68 |
|
69 |
local STAGING_EXCLUDE="" |
70 |
- STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132 |
71 |
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" |
72 |
|
73 |
# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches |
74 |
@@ -484,6 +484,7 @@ multilib_src_configure() { |
75 |
$(use_with pulseaudio pulse) |
76 |
$(use_with threads pthread) |
77 |
$(use_with scanner sane) |
78 |
+ $(use_with sdl) |
79 |
$(use_enable test tests) |
80 |
$(use_with truetype freetype) |
81 |
$(use_with udev) |