| 1 |
idella4 15/05/02 06:28:37 |
| 2 |
|
| 3 |
Modified: vlc-2.2.0.ebuild vlc-2.2.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
reset configure options to cater to either qt4 or qt5, fixes bug #548360 by Toralf Förster |
| 6 |
|
| 7 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.12 media-video/vlc/vlc-2.2.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild?rev=1.12&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild?rev=1.12&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild?r1=1.11&r2=1.12 |
| 15 |
|
| 16 |
Index: vlc-2.2.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v |
| 19 |
retrieving revision 1.11 |
| 20 |
retrieving revision 1.12 |
| 21 |
diff -u -r1.11 -r1.12 |
| 22 |
--- vlc-2.2.0.ebuild 30 Apr 2015 16:44:32 -0000 1.11 |
| 23 |
+++ vlc-2.2.0.ebuild 2 May 2015 06:28:37 -0000 1.12 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2015 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.11 2015/04/30 16:44:32 idella4 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.12 2015/05/02 06:28:37 idella4 Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -306,8 +306,10 @@ |
| 33 |
fi |
| 34 |
|
| 35 |
local qt_flag="" |
| 36 |
- if use qt4 || use qt5 ; then |
| 37 |
- qt_flag="--enable-qt" |
| 38 |
+ if use qt4 ; then |
| 39 |
+ qt_flag="--enable-qt=4" |
| 40 |
+ elif use qt5 ; then |
| 41 |
+ qt_flag="--enable-qt=5" |
| 42 |
fi |
| 43 |
|
| 44 |
econf \ |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.7 media-video/vlc/vlc-2.2.1.ebuild |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild?rev=1.7&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild?rev=1.7&content-type=text/plain |
| 52 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild?r1=1.6&r2=1.7 |
| 53 |
|
| 54 |
Index: vlc-2.2.1.ebuild |
| 55 |
=================================================================== |
| 56 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v |
| 57 |
retrieving revision 1.6 |
| 58 |
retrieving revision 1.7 |
| 59 |
diff -u -r1.6 -r1.7 |
| 60 |
--- vlc-2.2.1.ebuild 1 May 2015 18:54:21 -0000 1.6 |
| 61 |
+++ vlc-2.2.1.ebuild 2 May 2015 06:28:37 -0000 1.7 |
| 62 |
@@ -1,6 +1,6 @@ |
| 63 |
# Copyright 1999-2015 Gentoo Foundation |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v 1.6 2015/05/01 18:54:21 jer Exp $ |
| 66 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v 1.7 2015/05/02 06:28:37 idella4 Exp $ |
| 67 |
|
| 68 |
EAPI="5" |
| 69 |
|
| 70 |
@@ -309,8 +309,10 @@ |
| 71 |
fi |
| 72 |
|
| 73 |
local qt_flag="" |
| 74 |
- if use qt4 || use qt5 ; then |
| 75 |
- qt_flag="--enable-qt" |
| 76 |
+ if use qt4 ; then |
| 77 |
+ qt_flag="--enable-qt=4" |
| 78 |
+ elif use qt5 ; then |
| 79 |
+ qt_flag="--enable-qt=5" |
| 80 |
fi |
| 81 |
|
| 82 |
econf \ |
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
1.956 media-video/vlc/ChangeLog |
| 87 |
|
| 88 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.956&view=markup |
| 89 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.956&content-type=text/plain |
| 90 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.955&r2=1.956 |
| 91 |
|
| 92 |
Index: ChangeLog |
| 93 |
=================================================================== |
| 94 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v |
| 95 |
retrieving revision 1.955 |
| 96 |
retrieving revision 1.956 |
| 97 |
diff -u -r1.955 -r1.956 |
| 98 |
--- ChangeLog 1 May 2015 18:54:21 -0000 1.955 |
| 99 |
+++ ChangeLog 2 May 2015 06:28:37 -0000 1.956 |
| 100 |
@@ -1,6 +1,11 @@ |
| 101 |
# ChangeLog for media-video/vlc |
| 102 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 103 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.955 2015/05/01 18:54:21 jer Exp $ |
| 104 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.956 2015/05/02 06:28:37 idella4 Exp $ |
| 105 |
+ |
| 106 |
+ 02 May 2015; Ian Delaney <idella4@g.o> vlc-2.2.0.ebuild, |
| 107 |
+ vlc-2.2.1.ebuild: |
| 108 |
+ reset configure options to cater to either qt4 or qt5, fixes bug #548360 by |
| 109 |
+ Toralf Förster |
| 110 |
|
| 111 |
01 May 2015; Jeroen Roovers <jer@g.o> vlc-2.2.1.ebuild: |
| 112 |
Marked ~ppc64 (bug #489436). |
Archives