| 1 |
commit: 616353a10a8262f8ee125b306d4429680aaae20a |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 30 02:19:27 2018 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 30 02:56:13 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=616353a1 |
| 7 |
|
| 8 |
app-emulation/wine-staging: Updates for 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 |
Bug: https://bugs.gentoo.org/647970 |
| 15 |
|
| 16 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
| 17 |
|
| 18 |
app-emulation/wine-staging/metadata.xml | 1 + |
| 19 |
app-emulation/wine-staging/wine-staging-9999.ebuild | 9 +++++---- |
| 20 |
2 files changed, 6 insertions(+), 4 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml |
| 23 |
index 1295661..de9b63d 100644 |
| 24 |
--- a/app-emulation/wine-staging/metadata.xml |
| 25 |
+++ b/app-emulation/wine-staging/metadata.xml |
| 26 |
@@ -38,6 +38,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset. |
| 27 |
<flag name="samba">Add support for NTLM auth. see |
| 28 |
http://wiki.winehq.org/NtlmAuthSetupGuide and |
| 29 |
http://wiki.winehq.org/NtlmSigningAndSealing</flag> |
| 30 |
+ <flag name="sdl">Add support for gamepad detection using SDL</flag> |
| 31 |
<flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag> |
| 32 |
<flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag> |
| 33 |
<flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> |
| 34 |
|
| 35 |
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 36 |
index fd41d6c..7ba4e02 100644 |
| 37 |
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 38 |
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 39 |
@@ -36,15 +36,15 @@ SRC_URI="${SRC_URI} |
| 40 |
" |
| 41 |
|
| 42 |
if [[ ${PV} == "9999" ]] ; then |
| 43 |
- STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git" |
| 44 |
+ STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" |
| 45 |
else |
| 46 |
SRC_URI="${SRC_URI} |
| 47 |
- staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" |
| 48 |
+ staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_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 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 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 |
@@ -99,6 +99,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 |
@@ -349,7 +350,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 |
@@ -462,6 +462,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) |
Archives