commit: 96e577c5839c2fddcddfb0c1d876ba174e6dafd5 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Jan 23 19:11:20 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Jan 23 19:17:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96e577c5
media-video/ffmpeg: Drop IUSE=xcb Closes: https://bugs.gentoo.org/705442 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-video/ffmpeg/ffmpeg-4.2.2.ebuild | 5 ++--- media-video/ffmpeg/ffmpeg-9999.ebuild | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild index 6d69c547734..96cd4122b9f 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild @@ -70,7 +70,7 @@ FFMPEG_FLAG_MAP=( +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp +gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau - X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib # libavdevice options cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl @@ -254,8 +254,8 @@ RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) - xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) @@ -301,7 +301,6 @@ GPL_REQUIRED_USE=" x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) - X? ( !xcb? ( gpl ) ) ) " REQUIRED_USE=" diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 69bdf4e82ba..b0f17391612 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -70,7 +70,7 @@ FFMPEG_FLAG_MAP=( +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp +gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau - X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib # libavdevice options cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl @@ -254,8 +254,8 @@ RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) - xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) @@ -301,7 +301,6 @@ GPL_REQUIRED_USE=" x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) - X? ( !xcb? ( gpl ) ) ) " REQUIRED_USE="
