1 |
commit: c4d92d9667b6f74dbcf20600d8ec02a3f54e0b61 |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 15 15:18:28 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=c4d92d96 |
7 |
|
8 |
app-emulation/wine-any: 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-any/metadata.xml | 1 + |
15 |
app-emulation/wine-any/wine-any-3.12.ebuild | 4 +++- |
16 |
app-emulation/wine-any/wine-any-9999.ebuild | 4 +++- |
17 |
3 files changed, 7 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/app-emulation/wine-any/metadata.xml b/app-emulation/wine-any/metadata.xml |
20 |
index 928f2a8c2b6..ea740bb3f7a 100644 |
21 |
--- a/app-emulation/wine-any/metadata.xml |
22 |
+++ b/app-emulation/wine-any/metadata.xml |
23 |
@@ -27,6 +27,7 @@ This variant of the wine packaging allows for the use of the Wine-Staging patchs |
24 |
<flag name="d3d9">Apply highly experimental patches for Gallium Nine support. |
25 |
This patch may break some applications.</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-any/wine-any-3.12.ebuild b/app-emulation/wine-any/wine-any-3.12.ebuild |
33 |
index e713de98aba..d1e7371c75a 100644 |
34 |
--- a/app-emulation/wine-any/wine-any-3.12.ebuild |
35 |
+++ b/app-emulation/wine-any/wine-any-3.12.ebuild |
36 |
@@ -48,7 +48,7 @@ fi |
37 |
|
38 |
LICENSE="LGPL-2.1" |
39 |
SLOT="${PV}" |
40 |
-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" |
41 |
+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" |
42 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
43 |
X? ( truetype ) |
44 |
elibc_glibc? ( threads ) |
45 |
@@ -80,6 +80,7 @@ COMMON_DEPEND=" |
46 |
x11-libs/libXext[${MULTILIB_USEDEP}] |
47 |
x11-libs/libxcb[${MULTILIB_USEDEP}] |
48 |
) |
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 |
@@ -458,6 +459,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-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild |
63 |
index e713de98aba..d1e7371c75a 100644 |
64 |
--- a/app-emulation/wine-any/wine-any-9999.ebuild |
65 |
+++ b/app-emulation/wine-any/wine-any-9999.ebuild |
66 |
@@ -48,7 +48,7 @@ fi |
67 |
|
68 |
LICENSE="LGPL-2.1" |
69 |
SLOT="${PV}" |
70 |
-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" |
71 |
+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" |
72 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
73 |
X? ( truetype ) |
74 |
elibc_glibc? ( threads ) |
75 |
@@ -80,6 +80,7 @@ COMMON_DEPEND=" |
76 |
x11-libs/libXext[${MULTILIB_USEDEP}] |
77 |
x11-libs/libxcb[${MULTILIB_USEDEP}] |
78 |
) |
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 |
@@ -458,6 +459,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) |