dlan 14/12/15 05:50:49
Modified: vlc-2.1.9999.ebuild vlc-2.1.5.ebuild
vlc-9999.ebuild vlc-2.1.2.ebuild
vlc-2.2.9999.ebuild vlc-2.1.4.ebuild ChangeLog
Log:
1) drop keywords=amd64-fbsd from live ebuild 2) vlc-2.1.*: Restricted
<net-misc/freerdp-1.2, bug 529640 3) Fixed qt* use flags when qtchooser and
both qt4 and qt5 are installed
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
0xAABEFD55)
Revision Changes Path
1.27 media-video/vlc/vlc-2.1.9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?rev=1.27&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?rev=1.27&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?r1=1.26&r2=1.27
Index: vlc-2.1.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vlc-2.1.9999.ebuild 16 Nov 2014 14:37:22 -0000 1.26
+++ vlc-2.1.9999.ebuild 15 Dec 2014 05:50:48 -0000 1.27
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.26
2014/11/16 14:37:22 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.27
2014/12/15 05:50:48 dlan Exp $
EAPI="5"
@@ -35,7 +35,7 @@
SLOT="0/5-7" # vlc - vlccore
if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~x86-fbsd"
else
KEYWORDS=""
fi
@@ -119,7 +119,7 @@
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )
- rdp? ( net-misc/freerdp:0= )
+ rdp? ( <net-misc/freerdp-1.2:0= )
samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient]
>=net-fs/samba-4.0.0:0[client] ) )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
sdl? ( >=media-libs/libsdl-1.2.10:0
@@ -247,6 +247,14 @@
# Disable automatic running of tests.
find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {}
\; || die
+
+ # If qtchooser is installed, it may break the build, because moc,rcc
and uic binaries for wrong qt version may be used.
+ # Setting QT_SELECT environment variable will enforce correct binaries.
+ if use qt4; then
+ export QT_SELECT=qt4
+ elif use qt5; then
+ export QT_SELECT=qt5
+ fi
}
src_configure() {
1.5 media-video/vlc/vlc-2.1.5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild?r1=1.4&r2=1.5
Index: vlc-2.1.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vlc-2.1.5.ebuild 16 Nov 2014 14:37:22 -0000 1.4
+++ vlc-2.1.5.ebuild 15 Dec 2014 05:50:48 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.4
2014/11/16 14:37:22 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.5
2014/12/15 05:50:48 dlan Exp $
EAPI="5"
@@ -119,7 +119,7 @@
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )
- rdp? ( net-misc/freerdp:0= )
+ rdp? ( <net-misc/freerdp-1.2:0= )
samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient]
>=net-fs/samba-4.0.0:0[client] ) )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
sdl? ( >=media-libs/libsdl-1.2.10:0
@@ -250,6 +250,14 @@
# Disable automatic running of tests.
find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {}
\; || die
+
+ # If qtchooser is installed, it may break the build, because moc,rcc
and uic binaries for wrong qt version may be used.
+ # Setting QT_SELECT environment variable will enforce correct binaries.
+ if use qt4; then
+ export QT_SELECT=qt4
+ elif use qt5; then
+ export QT_SELECT=qt5
+ fi
}
src_configure() {
1.228 media-video/vlc/vlc-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.228&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.228&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.227&r2=1.228
Index: vlc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- vlc-9999.ebuild 16 Nov 2014 14:37:22 -0000 1.227
+++ vlc-9999.ebuild 15 Dec 2014 05:50:48 -0000 1.228
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.227
2014/11/16 14:37:22 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.228
2014/12/15 05:50:48 dlan Exp $
EAPI="5"
@@ -35,7 +35,7 @@
SLOT="0/5-7" # vlc - vlccore
if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~x86-fbsd"
else
KEYWORDS=""
fi
@@ -255,6 +255,14 @@
# Disable automatic running of tests.
find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {}
\; || die
+
+ # If qtchooser is installed, it may break the build, because moc,rcc
and uic binaries for wrong qt version may be used.
+ # Setting QT_SELECT environment variable will enforce correct binaries.
+ if use qt4; then
+ export QT_SELECT=qt4
+ elif use qt5; then
+ export QT_SELECT=qt5
+ fi
}
src_configure() {
1.17 media-video/vlc/vlc-2.1.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild?rev=1.17&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild?rev=1.17&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild?r1=1.16&r2=1.17
Index: vlc-2.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vlc-2.1.2.ebuild 16 Nov 2014 14:37:22 -0000 1.16
+++ vlc-2.1.2.ebuild 15 Dec 2014 05:50:48 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.16
2014/11/16 14:37:22 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.17
2014/12/15 05:50:48 dlan Exp $
EAPI="5"
@@ -119,7 +119,7 @@
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )
- rdp? ( net-misc/freerdp:0= )
+ rdp? ( <net-misc/freerdp-1.2:0= )
samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient]
>=net-fs/samba-4.0.0:0[client] ) )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
sdl? ( >=media-libs/libsdl-1.2.10:0
@@ -246,6 +246,14 @@
# Disable automatic running of tests.
find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {}
\; || die
+
+ # If qtchooser is installed, it may break the build, because moc,rcc
and uic binaries for wrong qt version may be used.
+ # Setting QT_SELECT environment variable will enforce correct binaries.
+ if use qt4; then
+ export QT_SELECT=qt4
+ elif use qt5; then
+ export QT_SELECT=qt5
+ fi
}
src_configure() {
1.5 media-video/vlc/vlc-2.2.9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild?r1=1.4&r2=1.5
Index: vlc-2.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vlc-2.2.9999.ebuild 16 Nov 2014 14:37:22 -0000 1.4
+++ vlc-2.2.9999.ebuild 15 Dec 2014 05:50:48 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v 1.4
2014/11/16 14:37:22 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v 1.5
2014/12/15 05:50:48 dlan Exp $
EAPI="5"
@@ -35,7 +35,7 @@
SLOT="0/5-7" # vlc - vlccore
if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~x86-fbsd"
else
KEYWORDS=""
fi
@@ -255,6 +255,14 @@
# Disable automatic running of tests.
find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {}
\; || die
+
+ # If qtchooser is installed, it may break the build, because moc,rcc
and uic binaries for wrong qt version may be used.
+ # Setting QT_SELECT environment variable will enforce correct binaries.
+ if use qt4; then
+ export QT_SELECT=qt4
+ elif use qt5; then
+ export QT_SELECT=qt5
+ fi
}
src_configure() {
1.12 media-video/vlc/vlc-2.1.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild?rev=1.12&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild?rev=1.12&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild?r1=1.11&r2=1.12
Index: vlc-2.1.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vlc-2.1.4.ebuild 16 Nov 2014 14:37:22 -0000 1.11
+++ vlc-2.1.4.ebuild 15 Dec 2014 05:50:48 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.11
2014/11/16 14:37:22 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.12
2014/12/15 05:50:48 dlan Exp $
EAPI="5"
@@ -119,7 +119,7 @@
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )
- rdp? ( net-misc/freerdp:0= )
+ rdp? ( <net-misc/freerdp-1.2:0= )
samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient]
>=net-fs/samba-4.0.0:0[client] ) )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
sdl? ( >=media-libs/libsdl-1.2.10:0
@@ -247,6 +247,14 @@
# Disable automatic running of tests.
find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {}
\; || die
+
+ # If qtchooser is installed, it may break the build, because moc,rcc
and uic binaries for wrong qt version may be used.
+ # Setting QT_SELECT environment variable will enforce correct binaries.
+ if use qt4; then
+ export QT_SELECT=qt4
+ elif use qt5; then
+ export QT_SELECT=qt5
+ fi
}
src_configure() {
1.921 media-video/vlc/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.921&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.921&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.920&r2=1.921
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
retrieving revision 1.920
retrieving revision 1.921
diff -u -r1.920 -r1.921
--- ChangeLog 12 Dec 2014 10:41:52 -0000 1.920
+++ ChangeLog 15 Dec 2014 05:50:48 -0000 1.921
@@ -1,6 +1,12 @@
# ChangeLog for media-video/vlc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.920
2014/12/12 10:41:52 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.921
2014/12/15 05:50:48 dlan Exp $
+
+ 15 Dec 2014; Yixun Lan <[email protected]> vlc-2.1.2.ebuild, vlc-2.1.4.ebuild,
+ vlc-2.1.5.ebuild, vlc-2.1.9999.ebuild, vlc-2.2.9999.ebuild, vlc-9999.ebuild:
+ 1) drop keywords=amd64-fbsd from live ebuilds 2) vlc-2.1.*: Restricted
+ <net-misc/freerdp-1.2, bug 529640 3) Fixed qt* use flags when qtchooser and
+ both qt4 and qt5 are installed
12 Dec 2014; Sergey Popov <[email protected]> metadata.xml:
USE='vaapi' is now global, removing it's description from metadata
