aballier 15/02/18 10:44:02 Modified: ffmpeg-9999.ebuild ChangeLog Log: Do not enable old xlib based x11grab when xcb is used. xcb based grabber is LGPL. Signed-off-by: aball...@gentoo.org (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path 1.180 media-video/ffmpeg/ffmpeg-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.180&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.180&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.179&r2=1.180 Index: ffmpeg-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- ffmpeg-9999.ebuild 18 Feb 2015 10:36:21 -0000 1.179 +++ ffmpeg-9999.ebuild 18 Feb 2015 10:44:02 -0000 1.180 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.179 2015/02/18 10:36:21 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.180 2015/02/18 10:44:02 aballier Exp $ EAPI="5" @@ -184,10 +184,10 @@ X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] + !xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] ) >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] ) - xcb? ( x11-libs/libxcb[${MULTILIB_USEDEP}] ) + xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) !media-video/qt-faststart @@ -224,7 +224,7 @@ x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) - X? ( gpl ) + X? ( !xcb? ( gpl ) ) ) " # faac is license-incompatible with ffmpeg @@ -293,7 +293,8 @@ for i in alsa oss jack ; do use ${i} || myconf+=( --disable-indev=${i} ) done - ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab ) + ffuse+=( libv4l:libv4l2 pulseaudio:libpulse ) + use xcb || ffuse+=( X:x11grab ) # Outdevs for i in alsa oss sdl ; do 1.831 media-video/ffmpeg/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.831&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.831&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.830&r2=1.831 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v retrieving revision 1.830 retrieving revision 1.831 diff -u -r1.830 -r1.831 --- ChangeLog 18 Feb 2015 10:36:21 -0000 1.830 +++ ChangeLog 18 Feb 2015 10:44:02 -0000 1.831 @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.830 2015/02/18 10:36:21 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.831 2015/02/18 10:44:02 aballier Exp $ + + 18 Feb 2015; Alexis Ballier <aball...@gentoo.org> ffmpeg-9999.ebuild: + Do not enable old xlib based x11grab when xcb is used. xcb based grabber is + LGPL. 18 Feb 2015; Alexis Ballier <aball...@gentoo.org> ffmpeg-9999.ebuild, metadata.xml:
