idella4 15/05/02 06:28:37 Modified: vlc-2.2.0.ebuild vlc-2.2.1.ebuild ChangeLog Log: reset configure options to cater to either qt4 or qt5, fixes bug #548360 by Toralf Förster (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path 1.12 media-video/vlc/vlc-2.2.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild?r1=1.11&r2=1.12 Index: vlc-2.2.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vlc-2.2.0.ebuild 30 Apr 2015 16:44:32 -0000 1.11 +++ vlc-2.2.0.ebuild 2 May 2015 06:28:37 -0000 1.12 @@ -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/vlc/vlc-2.2.0.ebuild,v 1.11 2015/04/30 16:44:32 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.12 2015/05/02 06:28:37 idella4 Exp $ EAPI="5" @@ -306,8 +306,10 @@ fi local qt_flag="" - if use qt4 || use qt5 ; then - qt_flag="--enable-qt" + if use qt4 ; then + qt_flag="--enable-qt=4" + elif use qt5 ; then + qt_flag="--enable-qt=5" fi econf \ 1.7 media-video/vlc/vlc-2.2.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild?r1=1.6&r2=1.7 Index: vlc-2.2.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- vlc-2.2.1.ebuild 1 May 2015 18:54:21 -0000 1.6 +++ vlc-2.2.1.ebuild 2 May 2015 06:28:37 -0000 1.7 @@ -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/vlc/vlc-2.2.1.ebuild,v 1.6 2015/05/01 18:54:21 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v 1.7 2015/05/02 06:28:37 idella4 Exp $ EAPI="5" @@ -309,8 +309,10 @@ fi local qt_flag="" - if use qt4 || use qt5 ; then - qt_flag="--enable-qt" + if use qt4 ; then + qt_flag="--enable-qt=4" + elif use qt5 ; then + qt_flag="--enable-qt=5" fi econf \ 1.956 media-video/vlc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.956&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.956&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.955&r2=1.956 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v retrieving revision 1.955 retrieving revision 1.956 diff -u -r1.955 -r1.956 --- ChangeLog 1 May 2015 18:54:21 -0000 1.955 +++ ChangeLog 2 May 2015 06:28:37 -0000 1.956 @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.955 2015/05/01 18:54:21 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.956 2015/05/02 06:28:37 idella4 Exp $ + + 02 May 2015; Ian Delaney <[email protected]> vlc-2.2.0.ebuild, + vlc-2.2.1.ebuild: + reset configure options to cater to either qt4 or qt5, fixes bug #548360 by + Toralf Förster 01 May 2015; Jeroen Roovers <[email protected]> vlc-2.2.1.ebuild: Marked ~ppc64 (bug #489436).
