mrueg 15/01/06 19:41:55 Modified: avidemux-9999.ebuild avidemux-2.6.7.ebuild avidemux-2.6.5-r1.ebuild avidemux-2.6.5.ebuild avidemux-2.6.8.ebuild ChangeLog Log: Update xvba dependency to use bundled vaapi in x11-drivers/ati-drivers. See bug #534710 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key )
Revision Changes Path 1.6 media-video/avidemux/avidemux-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild?r1=1.5&r2=1.6 Index: avidemux-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- avidemux-9999.ebuild 10 Aug 2014 20:57:26 -0000 1.5 +++ avidemux-9999.ebuild 6 Jan 2015 19:41:55 -0000 1.6 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v 1.5 2014/08/10 20:57:26 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v 1.6 2015/01/06 19:41:55 mrueg Exp $ EAPI="5" @@ -33,8 +33,10 @@ opengl? ( virtual/opengl:0 ) qt4? ( >=dev-qt/qtgui-4.8.3:4 ) vaapi? ( x11-libs/libva:0 ) - video_cards_fglrx? ( x11-libs/xvba-video:0 ) -" + video_cards_fglrx? ( + || ( >=x11-drivers/ati-drivers-14.12-r3 + x11-libs/xvba-video:0 ) + )" RDEPEND="$DEPEND" PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]" 1.3 media-video/avidemux/avidemux-2.6.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.7.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.7.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.7.ebuild?r1=1.2&r2=1.3 Index: avidemux-2.6.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.7.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- avidemux-2.6.7.ebuild 10 Aug 2014 20:57:26 -0000 1.2 +++ avidemux-2.6.7.ebuild 6 Jan 2015 19:41:55 -0000 1.3 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.7.ebuild,v 1.2 2014/08/10 20:57:26 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.7.ebuild,v 1.3 2015/01/06 19:41:55 mrueg Exp $ EAPI="5" @@ -33,8 +33,10 @@ opengl? ( virtual/opengl:0 ) qt4? ( >=dev-qt/qtgui-4.8.3:4 ) vaapi? ( x11-libs/libva:0 ) - video_cards_fglrx? ( x11-libs/xvba-video:0 ) -" + video_cards_fglrx? ( + || ( >=x11-drivers/ati-drivers-14.12-r3 + x11-libs/xvba-video:0 ) + )" RDEPEND="$DEPEND" PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]" 1.3 media-video/avidemux/avidemux-2.6.5-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.5-r1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.5-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.5-r1.ebuild?r1=1.2&r2=1.3 Index: avidemux-2.6.5-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.5-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- avidemux-2.6.5-r1.ebuild 10 Aug 2014 20:57:26 -0000 1.2 +++ avidemux-2.6.5-r1.ebuild 6 Jan 2015 19:41:55 -0000 1.3 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.5-r1.ebuild,v 1.2 2014/08/10 20:57:26 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.5-r1.ebuild,v 1.3 2015/01/06 19:41:55 mrueg Exp $ EAPI="5" @@ -33,8 +33,10 @@ opengl? ( virtual/opengl:0 ) qt4? ( >=dev-qt/qtgui-4.8.3:4 ) vaapi? ( x11-libs/libva:0 ) - video_cards_fglrx? ( x11-libs/xvba-video:0 ) -" + video_cards_fglrx? ( + || ( >=x11-drivers/ati-drivers-14.12-r3 + x11-libs/xvba-video:0 ) + )" RDEPEND="$DEPEND" PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]" 1.3 media-video/avidemux/avidemux-2.6.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.5.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.5.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.5.ebuild?r1=1.2&r2=1.3 Index: avidemux-2.6.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.5.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- avidemux-2.6.5.ebuild 10 Aug 2014 20:57:26 -0000 1.2 +++ avidemux-2.6.5.ebuild 6 Jan 2015 19:41:55 -0000 1.3 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.5.ebuild,v 1.2 2014/08/10 20:57:26 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.5.ebuild,v 1.3 2015/01/06 19:41:55 mrueg Exp $ EAPI="5" @@ -33,8 +33,10 @@ opengl? ( virtual/opengl:0 ) qt4? ( >=dev-qt/qtgui-4.8.3:4 ) vaapi? ( x11-libs/libva:0 ) - video_cards_fglrx? ( x11-libs/xvba-video:0 ) -" + video_cards_fglrx? ( + || ( >=x11-drivers/ati-drivers-14.12-r3 + x11-libs/xvba-video:0 ) + )" RDEPEND="$DEPEND" PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]" 1.3 media-video/avidemux/avidemux-2.6.8.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.8.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.8.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.8.ebuild?r1=1.2&r2=1.3 Index: avidemux-2.6.8.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.8.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- avidemux-2.6.8.ebuild 10 Aug 2014 20:57:26 -0000 1.2 +++ avidemux-2.6.8.ebuild 6 Jan 2015 19:41:55 -0000 1.3 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.8.ebuild,v 1.2 2014/08/10 20:57:26 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.8.ebuild,v 1.3 2015/01/06 19:41:55 mrueg Exp $ EAPI="5" @@ -33,8 +33,10 @@ opengl? ( virtual/opengl:0 ) qt4? ( >=dev-qt/qtgui-4.8.3:4 ) vaapi? ( x11-libs/libva:0 ) - video_cards_fglrx? ( x11-libs/xvba-video:0 ) -" + video_cards_fglrx? ( + || ( >=x11-drivers/ati-drivers-14.12-r3 + x11-libs/xvba-video:0 ) + )" RDEPEND="$DEPEND" PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]" 1.232 media-video/avidemux/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?rev=1.232&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?rev=1.232&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?r1=1.231&r2=1.232 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- ChangeLog 12 Dec 2014 09:43:30 -0000 1.231 +++ ChangeLog 6 Jan 2015 19:41:55 -0000 1.232 @@ -1,6 +1,12 @@ # ChangeLog for media-video/avidemux -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.231 2014/12/12 09:43:30 pinkbyte Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.232 2015/01/06 19:41:55 mrueg Exp $ + + 06 Jan 2015; Manuel RĂ¼ger <mr...@gentoo.org> avidemux-2.6.5-r1.ebuild, + avidemux-2.6.5.ebuild, avidemux-2.6.7.ebuild, avidemux-2.6.8.ebuild, + avidemux-9999.ebuild: + Update xvba dependency to use bundled vaapi in x11-drivers/ati-drivers. See + bug #534710 12 Dec 2014; Sergey Popov <pinkb...@gentoo.org> metadata.xml: USE='vaapi' is now global, removing it's description from metadata