diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2015-05-02 06:28:37 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2015-05-02 06:28:37 +0000 |
| commit | 6697ec5c43c959f0f741d8047ad35592a62248c0 (patch) | |
| tree | 0264a37cc90c34ece4be010c19a17d89dfd07d67 /media-video/vlc | |
| parent | Minor maintenance release (diff) | |
| download | gentoo-2-6697ec5c43c959f0f741d8047ad35592a62248c0.tar.gz gentoo-2-6697ec5c43c959f0f741d8047ad35592a62248c0.tar.bz2 gentoo-2-6697ec5c43c959f0f741d8047ad35592a62248c0.zip | |
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)
Diffstat (limited to 'media-video/vlc')
| -rw-r--r-- | media-video/vlc/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/vlc/vlc-2.2.0.ebuild | 8 | ||||
| -rw-r--r-- | media-video/vlc/vlc-2.2.1.ebuild | 8 |
3 files changed, 16 insertions, 7 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index a8eb70c24ce7..1f39ef70d3c4 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -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 <idella4@gentoo.org> 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 <jer@gentoo.org> vlc-2.2.1.ebuild: Marked ~ppc64 (bug #489436). diff --git a/media-video/vlc/vlc-2.2.0.ebuild b/media-video/vlc/vlc-2.2.0.ebuild index 1b2d5019dcc5..0181526c4cc3 100644 --- a/media-video/vlc/vlc-2.2.0.ebuild +++ b/media-video/vlc/vlc-2.2.0.ebuild @@ -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 @@ src_configure() { 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 \ diff --git a/media-video/vlc/vlc-2.2.1.ebuild b/media-video/vlc/vlc-2.2.1.ebuild index 993059ac72e3..7b55e00efe88 100644 --- a/media-video/vlc/vlc-2.2.1.ebuild +++ b/media-video/vlc/vlc-2.2.1.ebuild @@ -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 @@ src_configure() { 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 \ |