app-emulation/wine-any: Sync with ::wine

Add ffmpeg USE

Package-Manager: Portage-2.3.42, Repoman-2.3.9

diff --git a/app-emulation/wine-any/metadata.xml b/app-emulation/wine-any/metadata.xml
index 928f2a8c2b69f04b7256e1f7f6ee6ab1f9f181ac..ea740bb3f7a6202a6e4e1ef2da6113eef2d38f31 100644 (file)
--- a/app-emulation/wine-any/metadata.xml
+++ b/app-emulation/wine-any/metadata.xml
@@ -27,6 +27,7 @@ This variant of the wine packaging allows for the use of the Wine-Staging patchs
                <flag name="d3d9">Apply highly experimental patches for Gallium Nine support.
                        This patch may break some applications.</flag>
                <flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
+               <flag name="ffmpeg">Use <pkg>media-video/ffmpeg</pkg> to decode WMA formats</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>

diff --git a/app-emulation/wine-any/wine-any-3.12.ebuild b/app-emulation/wine-any/wine-any-3.12.ebuild
index e713de98aba4cfe09ffe79656f47fe71297cc62d..d1e7371c75a3d7a48ae85ce263e64f4c1b46ff84 100644 (file)
--- a/app-emulation/wine-any/wine-any-3.12.ebuild
+++ b/app-emulation/wine-any/wine-any-3.12.ebuild
@@ -48,7 +48,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 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 d3d9 dos elibc_glibc 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 )
@@ -80,6 +80,7 @@ COMMON_DEPEND="
                x11-libs/libXext[${MULTILIB_USEDEP}]
                x11-libs/libxcb[${MULTILIB_USEDEP}]
        )
+       ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
        fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
        gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
        gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -458,6 +459,7 @@ multilib_src_configure() {
                $(use_with cups)
                $(use_with ncurses curses)
                $(use_with udisks dbus)
+               $(use_with ffmpeg)
                $(use_with fontconfig)
                $(use_with ssl gnutls)
                $(use_enable gecko mshtml)

diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild
index e713de98aba4cfe09ffe79656f47fe71297cc62d..d1e7371c75a3d7a48ae85ce263e64f4c1b46ff84 100644 (file)
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@@ -48,7 +48,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 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 d3d9 dos elibc_glibc 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 )
@@ -80,6 +80,7 @@ COMMON_DEPEND="
                x11-libs/libXext[${MULTILIB_USEDEP}]
                x11-libs/libxcb[${MULTILIB_USEDEP}]
        )
+       ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
        fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
        gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
        gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -458,6 +459,7 @@ multilib_src_configure() {
                $(use_with cups)
                $(use_with ncurses curses)
                $(use_with udisks dbus)
+               $(use_with ffmpeg)
                $(use_with fontconfig)
                $(use_with ssl gnutls)
                $(use_enable gecko mshtml)