summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idella4@gentoo.org>2015-05-12 06:33:07 +0000
committerIan Delaney <idella4@gentoo.org>2015-05-12 06:33:07 +0000
commit16476e368bf4dd67b1197813384d759b0473e88f (patch)
tree403fdbb5516cbd5c9f557c998e2ac085d2dae2ed /media-video/vlc
parentbup (diff)
downloadgentoo-2-16476e368bf4dd67b1197813384d759b0473e88f.tar.gz
gentoo-2-16476e368bf4dd67b1197813384d759b0473e88f.tar.bz2
gentoo-2-16476e368bf4dd67b1197813384d759b0473e88f.zip
finalise config option for qt in src_configure, fixes bug #549212
(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/ChangeLog6
-rw-r--r--media-video/vlc/vlc-2.2.0.ebuild4
-rw-r--r--media-video/vlc/vlc-2.2.1.ebuild4
3 files changed, 11 insertions, 3 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 109b96735279..aeb53e5a71c0 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
# 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.957 2015/05/08 09:19:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.958 2015/05/12 06:33:07 idella4 Exp $
+
+ 12 May 2015; Ian Delaney <idella4@gentoo.org> vlc-2.2.0.ebuild,
+ vlc-2.2.1.ebuild:
+ finalise config option for qt in src_configure, fixes bug #549212
08 May 2015; Agostino Sarubbo <ago@gentoo.org> -vlc-2.1.2.ebuild:
Drop 2.1.2 and on behalf of the alpha team, we are dropping the support on vlc
diff --git a/media-video/vlc/vlc-2.2.0.ebuild b/media-video/vlc/vlc-2.2.0.ebuild
index 0181526c4cc3..899aac87479a 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.12 2015/05/02 06:28:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.13 2015/05/12 06:33:07 idella4 Exp $
EAPI="5"
@@ -310,6 +310,8 @@ src_configure() {
qt_flag="--enable-qt=4"
elif use qt5 ; then
qt_flag="--enable-qt=5"
+ elif ! use qt4 && ! use qt5; then
+ qt_flag="--disable-qt"
fi
econf \
diff --git a/media-video/vlc/vlc-2.2.1.ebuild b/media-video/vlc/vlc-2.2.1.ebuild
index 7b55e00efe88..817859873af8 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.7 2015/05/02 06:28:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v 1.8 2015/05/12 06:33:07 idella4 Exp $
EAPI="5"
@@ -313,6 +313,8 @@ src_configure() {
qt_flag="--enable-qt=4"
elif use qt5 ; then
qt_flag="--enable-qt=5"
+ elif ! use qt4 && ! use qt5; then
+ qt_flag="--disable-qt"
fi
econf \