commit: 29af781d767d595f312a687b320993f5c3cca517
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 20:38:57 2019 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 20:39:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29af781d
app-emulation/wine-staging: Sync with ::wine
Faudio updates
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
.../{wine-staging-9999.ebuild => wine-staging-4.4-r1.ebuild} | 3 ++-
app-emulation/wine-staging/wine-staging-9999.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild
b/app-emulation/wine-staging/wine-staging-4.4-r1.ebuild
similarity index 97%
copy from app-emulation/wine-staging/wine-staging-9999.ebuild
copy to app-emulation/wine-staging/wine-staging-4.4-r1.ebuild
index b12f4ca1e78..1fa673641c4 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.4-r1.ebuild
@@ -44,7 +44,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc
faudio ffmpeg +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 samba scanner sdl selinux +ssl staging test themes +threads +truetype
udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc
+faudio ffmpeg +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 samba scanner sdl selinux +ssl staging test themes +threads +truetype
udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -356,6 +356,7 @@ src_prepare() {
local STAGING_EXCLUDE=""
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W
Pipelight"
+ use faudio && STAGING_EXCLUDE="${STAGING_EXCLUDE} -W
xaudio2-revert -W xaudio2_CommitChanges -W xaudio2_7-WMA_support -W
xaudio2_7-CreateFX-FXEcho"
# Launch wine-staging patcher in a subshell, using eapply as a
backend, and gitapply.sh as a backend for binary patches
ebegin "Running Wine-Staging patch installer"
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild
b/app-emulation/wine-staging/wine-staging-9999.ebuild
index b12f4ca1e78..1fa673641c4 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-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 dos elibc_glibc
faudio ffmpeg +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 samba scanner sdl selinux +ssl staging test themes +threads +truetype
udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc
+faudio ffmpeg +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 samba scanner sdl selinux +ssl staging test themes +threads +truetype
udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -356,6 +356,7 @@ src_prepare() {
local STAGING_EXCLUDE=""
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W
Pipelight"
+ use faudio && STAGING_EXCLUDE="${STAGING_EXCLUDE} -W
xaudio2-revert -W xaudio2_CommitChanges -W xaudio2_7-WMA_support -W
xaudio2_7-CreateFX-FXEcho"
# Launch wine-staging patcher in a subshell, using eapply as a
backend, and gitapply.sh as a backend for binary patches
ebegin "Running Wine-Staging patch installer"
