Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

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