| 1 |
commit: e50baa314243cde515281fe51502abb8bec04996 |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 1 13:18:21 2019 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 1 13:18:21 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50baa31 |
| 7 |
|
| 8 |
app-emulation/wine-staging: Sync with ::wine |
| 9 |
|
| 10 |
app-emulation/wine-staging: remove ffmpeg USE-flag from v4.13+ |
| 11 |
Package-Manager: Portage-2.3.80, Repoman-2.3.19 |
| 12 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
| 13 |
|
| 14 |
app-emulation/wine-staging/metadata.xml | 1 - |
| 15 |
app-emulation/wine-staging/wine-staging-4.18.ebuild | 5 +---- |
| 16 |
app-emulation/wine-staging/wine-staging-4.19.ebuild | 5 +---- |
| 17 |
app-emulation/wine-staging/wine-staging-4.20.ebuild | 5 +---- |
| 18 |
app-emulation/wine-staging/wine-staging-4.21.ebuild | 5 +---- |
| 19 |
app-emulation/wine-staging/wine-staging-9999.ebuild | 5 +---- |
| 20 |
6 files changed, 5 insertions(+), 21 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml |
| 23 |
index 2021448c473..8a734247ae2 100644 |
| 24 |
--- a/app-emulation/wine-staging/metadata.xml |
| 25 |
+++ b/app-emulation/wine-staging/metadata.xml |
| 26 |
@@ -21,7 +21,6 @@ This variant of the Wine packaging includes the Wine-Staging patchset. |
| 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="faudio">Pull in <pkg>app-emulation/faudio</pkg> to provide XAudio2 functionality</flag> |
| 30 |
- <flag name="ffmpeg">Use <pkg>media-video/ffmpeg</pkg> to decode WMA formats</flag> |
| 31 |
<flag name="gecko">Add support for the Gecko engine when using iexplore</flag> |
| 32 |
<flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag> |
| 33 |
<flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag> |
| 34 |
|
| 35 |
diff --git a/app-emulation/wine-staging/wine-staging-4.18.ebuild b/app-emulation/wine-staging/wine-staging-4.18.ebuild |
| 36 |
index 2d1bd8b5970..4376738049f 100644 |
| 37 |
--- a/app-emulation/wine-staging/wine-staging-4.18.ebuild |
| 38 |
+++ b/app-emulation/wine-staging/wine-staging-4.18.ebuild |
| 39 |
@@ -44,11 +44,10 @@ fi |
| 40 |
|
| 41 |
LICENSE="LGPL-2.1" |
| 42 |
SLOT="${PV}" |
| 43 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio 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 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +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" |
| 45 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 46 |
X? ( truetype ) |
| 47 |
elibc_glibc? ( threads ) |
| 48 |
- ffmpeg? ( staging ) |
| 49 |
osmesa? ( opengl ) |
| 50 |
pipelight? ( staging ) |
| 51 |
test? ( abi_x86_32 ) |
| 52 |
@@ -73,7 +72,6 @@ COMMON_DEPEND=" |
| 53 |
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) |
| 54 |
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) |
| 55 |
faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) |
| 56 |
- ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) |
| 57 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
| 58 |
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
| 59 |
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
| 60 |
@@ -443,7 +441,6 @@ multilib_src_configure() { |
| 61 |
$(use_with ncurses curses) |
| 62 |
$(use_with udisks dbus) |
| 63 |
$(use_with faudio) |
| 64 |
- $(use_with ffmpeg) |
| 65 |
$(use_with fontconfig) |
| 66 |
$(use_with ssl gnutls) |
| 67 |
$(use_enable gecko mshtml) |
| 68 |
|
| 69 |
diff --git a/app-emulation/wine-staging/wine-staging-4.19.ebuild b/app-emulation/wine-staging/wine-staging-4.19.ebuild |
| 70 |
index 2d1bd8b5970..4376738049f 100644 |
| 71 |
--- a/app-emulation/wine-staging/wine-staging-4.19.ebuild |
| 72 |
+++ b/app-emulation/wine-staging/wine-staging-4.19.ebuild |
| 73 |
@@ -44,11 +44,10 @@ fi |
| 74 |
|
| 75 |
LICENSE="LGPL-2.1" |
| 76 |
SLOT="${PV}" |
| 77 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio 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" |
| 78 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +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" |
| 79 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 80 |
X? ( truetype ) |
| 81 |
elibc_glibc? ( threads ) |
| 82 |
- ffmpeg? ( staging ) |
| 83 |
osmesa? ( opengl ) |
| 84 |
pipelight? ( staging ) |
| 85 |
test? ( abi_x86_32 ) |
| 86 |
@@ -73,7 +72,6 @@ COMMON_DEPEND=" |
| 87 |
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) |
| 88 |
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) |
| 89 |
faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) |
| 90 |
- ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) |
| 91 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
| 92 |
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
| 93 |
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
| 94 |
@@ -443,7 +441,6 @@ multilib_src_configure() { |
| 95 |
$(use_with ncurses curses) |
| 96 |
$(use_with udisks dbus) |
| 97 |
$(use_with faudio) |
| 98 |
- $(use_with ffmpeg) |
| 99 |
$(use_with fontconfig) |
| 100 |
$(use_with ssl gnutls) |
| 101 |
$(use_enable gecko mshtml) |
| 102 |
|
| 103 |
diff --git a/app-emulation/wine-staging/wine-staging-4.20.ebuild b/app-emulation/wine-staging/wine-staging-4.20.ebuild |
| 104 |
index a2a1c5872a7..018e0d7d63f 100644 |
| 105 |
--- a/app-emulation/wine-staging/wine-staging-4.20.ebuild |
| 106 |
+++ b/app-emulation/wine-staging/wine-staging-4.20.ebuild |
| 107 |
@@ -44,11 +44,10 @@ fi |
| 108 |
|
| 109 |
LICENSE="LGPL-2.1" |
| 110 |
SLOT="${PV}" |
| 111 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio 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" |
| 112 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +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" |
| 113 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 114 |
X? ( truetype ) |
| 115 |
elibc_glibc? ( threads ) |
| 116 |
- ffmpeg? ( staging ) |
| 117 |
osmesa? ( opengl ) |
| 118 |
pipelight? ( staging ) |
| 119 |
test? ( abi_x86_32 ) |
| 120 |
@@ -73,7 +72,6 @@ COMMON_DEPEND=" |
| 121 |
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) |
| 122 |
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) |
| 123 |
faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) |
| 124 |
- ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) |
| 125 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
| 126 |
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
| 127 |
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
| 128 |
@@ -443,7 +441,6 @@ multilib_src_configure() { |
| 129 |
$(use_with ncurses curses) |
| 130 |
$(use_with udisks dbus) |
| 131 |
$(use_with faudio) |
| 132 |
- $(use_with ffmpeg) |
| 133 |
$(use_with fontconfig) |
| 134 |
$(use_with ssl gnutls) |
| 135 |
$(use_enable gecko mshtml) |
| 136 |
|
| 137 |
diff --git a/app-emulation/wine-staging/wine-staging-4.21.ebuild b/app-emulation/wine-staging/wine-staging-4.21.ebuild |
| 138 |
index a2a1c5872a7..018e0d7d63f 100644 |
| 139 |
--- a/app-emulation/wine-staging/wine-staging-4.21.ebuild |
| 140 |
+++ b/app-emulation/wine-staging/wine-staging-4.21.ebuild |
| 141 |
@@ -44,11 +44,10 @@ fi |
| 142 |
|
| 143 |
LICENSE="LGPL-2.1" |
| 144 |
SLOT="${PV}" |
| 145 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio 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" |
| 146 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +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" |
| 147 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 148 |
X? ( truetype ) |
| 149 |
elibc_glibc? ( threads ) |
| 150 |
- ffmpeg? ( staging ) |
| 151 |
osmesa? ( opengl ) |
| 152 |
pipelight? ( staging ) |
| 153 |
test? ( abi_x86_32 ) |
| 154 |
@@ -73,7 +72,6 @@ COMMON_DEPEND=" |
| 155 |
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) |
| 156 |
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) |
| 157 |
faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) |
| 158 |
- ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) |
| 159 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
| 160 |
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
| 161 |
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
| 162 |
@@ -443,7 +441,6 @@ multilib_src_configure() { |
| 163 |
$(use_with ncurses curses) |
| 164 |
$(use_with udisks dbus) |
| 165 |
$(use_with faudio) |
| 166 |
- $(use_with ffmpeg) |
| 167 |
$(use_with fontconfig) |
| 168 |
$(use_with ssl gnutls) |
| 169 |
$(use_enable gecko mshtml) |
| 170 |
|
| 171 |
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 172 |
index a2a1c5872a7..018e0d7d63f 100644 |
| 173 |
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 174 |
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 175 |
@@ -44,11 +44,10 @@ fi |
| 176 |
|
| 177 |
LICENSE="LGPL-2.1" |
| 178 |
SLOT="${PV}" |
| 179 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio 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" |
| 180 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +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" |
| 181 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 182 |
X? ( truetype ) |
| 183 |
elibc_glibc? ( threads ) |
| 184 |
- ffmpeg? ( staging ) |
| 185 |
osmesa? ( opengl ) |
| 186 |
pipelight? ( staging ) |
| 187 |
test? ( abi_x86_32 ) |
| 188 |
@@ -73,7 +72,6 @@ COMMON_DEPEND=" |
| 189 |
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) |
| 190 |
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) |
| 191 |
faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) |
| 192 |
- ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] ) |
| 193 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
| 194 |
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
| 195 |
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
| 196 |
@@ -443,7 +441,6 @@ multilib_src_configure() { |
| 197 |
$(use_with ncurses curses) |
| 198 |
$(use_with udisks dbus) |
| 199 |
$(use_with faudio) |
| 200 |
- $(use_with ffmpeg) |
| 201 |
$(use_with fontconfig) |
| 202 |
$(use_with ssl gnutls) |
| 203 |
$(use_enable gecko mshtml) |
Archives