summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-01-23 11:11:20 -0800
committerMatt Turner <mattst88@gentoo.org>2020-01-23 11:17:59 -0800
commit96e577c5839c2fddcddfb0c1d876ba174e6dafd5 (patch)
treee6fe39901a32903da00278dfcafce219e16da485 /media-video
parentmedia-video/peek: Drop old versions (diff)
downloadgentoo-96e577c5839c2fddcddfb0c1d876ba174e6dafd5.tar.gz
gentoo-96e577c5839c2fddcddfb0c1d876ba174e6dafd5.tar.bz2
gentoo-96e577c5839c2fddcddfb0c1d876ba174e6dafd5.zip
media-video/ffmpeg: Drop IUSE=xcb
Closes: https://bugs.gentoo.org/705442 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ffmpeg-4.2.2.ebuild5
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild5
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 6d69c5477349..96cd4122b9ff 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 69bdf4e82bac..b0f173916123 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="