| 1 |
commit: 93aa20963fd9e7633fa3a5d96ef62263763ac367 |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 15 15:17:35 2018 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 15 15:23:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93aa2096 |
| 7 |
|
| 8 |
app-emulation/wine-staging: Sync with ::wine |
| 9 |
|
| 10 |
Add ffmpeg USE |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.42, Repoman-2.3.9 |
| 13 |
|
| 14 |
app-emulation/wine-staging/metadata.xml | 1 + |
| 15 |
app-emulation/wine-staging/wine-staging-3.12.ebuild | 4 +++- |
| 16 |
app-emulation/wine-staging/wine-staging-9999.ebuild | 4 +++- |
| 17 |
3 files changed, 7 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml |
| 20 |
index da4de45bfb7..116d5656a6a 100644 |
| 21 |
--- a/app-emulation/wine-staging/metadata.xml |
| 22 |
+++ b/app-emulation/wine-staging/metadata.xml |
| 23 |
@@ -20,6 +20,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset. |
| 24 |
<flag name="capi">Enable ISDN support via CAPI</flag> |
| 25 |
<flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag> |
| 26 |
<flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag> |
| 27 |
+ <flag name="ffmpeg">Use <pkg>media-video/ffmpeg</pkg> to decode WMA formats</flag> |
| 28 |
<flag name="gecko">Add support for the Gecko engine when using iexplore</flag> |
| 29 |
<flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag> |
| 30 |
<flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag> |
| 31 |
|
| 32 |
diff --git a/app-emulation/wine-staging/wine-staging-3.12.ebuild b/app-emulation/wine-staging/wine-staging-3.12.ebuild |
| 33 |
index 54b66bc499b..2e47606ee4a 100644 |
| 34 |
--- a/app-emulation/wine-staging/wine-staging-3.12.ebuild |
| 35 |
+++ b/app-emulation/wine-staging/wine-staging-3.12.ebuild |
| 36 |
@@ -44,7 +44,7 @@ fi |
| 37 |
|
| 38 |
LICENSE="LGPL-2.1" |
| 39 |
SLOT="${PV}" |
| 40 |
-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" |
| 41 |
+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" |
| 42 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 43 |
X? ( truetype ) |
| 44 |
elibc_glibc? ( threads ) |
| 45 |
@@ -70,6 +70,7 @@ COMMON_DEPEND=" |
| 46 |
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) |
| 47 |
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) |
| 48 |
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) |
| 49 |
+ ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) |
| 50 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
| 51 |
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
| 52 |
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
| 53 |
@@ -436,6 +437,7 @@ multilib_src_configure() { |
| 54 |
$(use_with cups) |
| 55 |
$(use_with ncurses curses) |
| 56 |
$(use_with udisks dbus) |
| 57 |
+ $(use_with ffmpeg) |
| 58 |
$(use_with fontconfig) |
| 59 |
$(use_with ssl gnutls) |
| 60 |
$(use_enable gecko mshtml) |
| 61 |
|
| 62 |
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 63 |
index 54b66bc499b..2e47606ee4a 100644 |
| 64 |
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 65 |
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 66 |
@@ -44,7 +44,7 @@ fi |
| 67 |
|
| 68 |
LICENSE="LGPL-2.1" |
| 69 |
SLOT="${PV}" |
| 70 |
-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" |
| 71 |
+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" |
| 72 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 73 |
X? ( truetype ) |
| 74 |
elibc_glibc? ( threads ) |
| 75 |
@@ -70,6 +70,7 @@ COMMON_DEPEND=" |
| 76 |
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) |
| 77 |
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) |
| 78 |
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) |
| 79 |
+ ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) |
| 80 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
| 81 |
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
| 82 |
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
| 83 |
@@ -436,6 +437,7 @@ multilib_src_configure() { |
| 84 |
$(use_with cups) |
| 85 |
$(use_with ncurses curses) |
| 86 |
$(use_with udisks dbus) |
| 87 |
+ $(use_with ffmpeg) |
| 88 |
$(use_with fontconfig) |
| 89 |
$(use_with ssl gnutls) |
| 90 |
$(use_enable gecko mshtml) |
Archives