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

Add ffmpeg USE

Package-Manager: Portage-2.3.42, Repoman-2.3.9

diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml
index da4de45bfb761095db845fd71248e82b64ba1d43..116d5656a6a473e8479bc7dc64a244b69dbe211e 100644 (file)
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -20,6 +20,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
                <flag name="capi">Enable ISDN support via CAPI</flag>
                <flag name="custom-cflags">Bypass strip-flags; use at your own peril</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-staging/wine-staging-3.12.ebuild b/app-emulation/wine-staging/wine-staging-3.12.ebuild
index 54b66bc499b1e1d37e3b2328180fe40ffc8dc00e..2e47606ee4a5e3ea0b63684924b6001c1b45c1b0 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-3.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.12.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 +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 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 )
@@ -70,6 +70,7 @@ COMMON_DEPEND="
        alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
        capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
        cups? ( net-print/cups:=[${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}] )
@@ -436,6 +437,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-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 54b66bc499b1e1d37e3b2328180fe40ffc8dc00e..2e47606ee4a5e3ea0b63684924b6001c1b45c1b0 100644 (file)
--- 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 +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 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 )
@@ -70,6 +70,7 @@ COMMON_DEPEND="
        alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
        capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
        cups? ( net-print/cups:=[${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}] )
@@ -436,6 +437,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)