dlan 14/11/16 14:37:22
Modified: vlc-2.1.5.ebuild vlc-9999.ebuild vlc-2.1.2.ebuild
vlc-2.1.9999.ebuild vlc-2.2.9999.ebuild
vlc-2.1.4.ebuild ChangeLog metadata.xml
Log:
proxy for maintainer, fix bug 525004, 506322, 489508, 499996
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
0xAABEFD55)
Revision Changes Path
1.4 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.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild?r1=1.3&r2=1.4
Index: vlc-2.1.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vlc-2.1.5.ebuild 15 Nov 2014 11:56:20 -0000 1.3
+++ vlc-2.1.5.ebuild 16 Nov 2014 14:37:22 -0000 1.4
@@ -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.3
2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.4
2014/11/16 14:37:22 dlan Exp $
EAPI="5"
@@ -49,7 +49,7 @@
+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
- png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+ png +postproc projectm pulseaudio +qt4 rdp rtsp run-as-root samba
schroedinger sdl sdl-image sftp shout sid skins speex sse svg +swscale
taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
vlm vnc vorbis wma-fixed +X x264 +xcb xml xv zvbi"
@@ -119,7 +119,6 @@
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 )
- qt5? ( >=dev-qt/qtgui-5.1.0:5 >=dev-qt/qtcore-5.1.0:5
dev-qt/qtwidgets:5 )
rdp? ( net-misc/freerdp: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 )
@@ -175,10 +174,9 @@
libcaca? ( X )
libtar? ( skins )
libtiger? ( kate )
- qt4? ( X !qt5 )
- qt5? ( X !qt4 )
+ qt4? ( X )
sdl? ( X )
- skins? ( truetype X ^^ ( qt4 qt5 ) )
+ skins? ( truetype X qt4 )
vaapi? ( avcodec X )
vlm? ( encode )
xv? ( xcb )
@@ -203,12 +201,6 @@
}
src_prepare() {
- # Support for Qt5.
- if use qt5 ; then
- export UIC="/usr/lib64/qt5/bin/uic"
- export MOC="/usr/lib64/qt5/bin/moc"
- fi
-
# Remove unnecessary warnings about unimplemented pragmas on gcc for
now.
# Need to recheck this with gcc 4.9 and every subsequent minor bump of
gcc.
#
@@ -242,7 +234,9 @@
epatch
"${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
# Disable avcodec checks when avcodec is not used.
- sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/'
modules/codec/avcodec/fourcc.c || die
+ if ! use avcodec; then
+ sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/'
modules/codec/avcodec/fourcc.c || die
+ fi
# Don't use --started-from-file when not using dbus.
if ! use dbus ; then
@@ -250,9 +244,7 @@
fi
# Disable a bogus check
- if ! use avcodec; then
- sed -i "s:libavcodec < 56:libavcodec < 57:g" configure.ac || die
- fi
+ sed -i "s:libavcodec < 56:libavcodec < 57:g" configure.ac || die
eautoreconf
@@ -264,6 +256,10 @@
# Compatibility fix for Samba 4.
use samba && append-cppflags "-I/usr/include/samba-4.0"
+ # We need to disable -fstack-check if use >=gcc 4.8.0.
+ # See bug #499996
+ use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
# Needs libresid-builder from libsidplay:2 which is in another
directory...
# FIXME!
append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
@@ -276,11 +272,6 @@
--with-default-monospace-font-family=Monospace"
fi
- local qt_flag=""
- if use qt4 || use qt5 ; then
- qt_flag="--enable-qt"
- fi
-
econf \
${myconf} \
--enable-vlc \
@@ -369,7 +360,7 @@
$(use_enable postproc) \
$(use_enable projectm) \
$(use_enable pulseaudio pulse) \
- ${qt_flag} \
+ $(use_enable qt4 qt) \
$(use_enable rdp libfreerdp) \
$(use_enable rtsp realrtsp) \
$(use_enable run-as-root) \
1.227 media-video/vlc/vlc-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.227&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.227&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.226&r2=1.227
Index: vlc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- vlc-9999.ebuild 15 Nov 2014 11:56:20 -0000 1.226
+++ vlc-9999.ebuild 16 Nov 2014 14:37:22 -0000 1.227
@@ -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.226
2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.227
2014/11/16 14:37:22 dlan Exp $
EAPI="5"
@@ -116,7 +116,7 @@
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
pulseaudio? ( >=media-sound/pulseaudio-1:0 )
qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 )
- qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5
dev-qt/qtwidgets:5 )
+ qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5
>=dev-qt/qtwidgets-5.1:5 >=dev-qt/qtx11extras-5.1:5 )
rdp? ( >=net-misc/freerdp-1.0.1:0= )
samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient]
>=net-fs/samba-4:0[client] ) )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
@@ -246,11 +246,6 @@
# Fix up broken audio when skipping using a fixed reversed bisected
commit.
epatch
"${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
- # Disable avcodec checks when avcodec is not used.
- if ! use avcodec; then
- sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/'
modules/codec/avcodec/fourcc.c || die
- fi
-
# Don't use --started-from-file when not using dbus.
if ! use dbus ; then
sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
@@ -266,6 +261,10 @@
# Compatibility fix for Samba 4.
use samba && append-cppflags "-I/usr/include/samba-4.0"
+ # We need to disable -fstack-check if use >=gcc 4.8.0.
+ # See bug #499996
+ use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
# Needs libresid-builder from libsidplay:2 which is in another
directory...
# FIXME!
append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
1.16 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.16&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild?rev=1.16&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild?r1=1.15&r2=1.16
Index: vlc-2.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vlc-2.1.2.ebuild 15 Nov 2014 11:56:20 -0000 1.15
+++ vlc-2.1.2.ebuild 16 Nov 2014 14:37:22 -0000 1.16
@@ -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.15
2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.16
2014/11/16 14:37:22 dlan Exp $
EAPI="5"
@@ -49,7 +49,7 @@
+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
- png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+ png +postproc projectm pulseaudio +qt4 rdp rtsp run-as-root samba
schroedinger sdl sdl-image sftp shout sid skins speex sse svg +swscale
taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
vlm vorbis wma-fixed +X x264 +xcb xml xv zvbi"
@@ -119,7 +119,6 @@
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 )
- qt5? ( >=dev-qt/qtgui-5.1.0:5 >=dev-qt/qtcore-5.1.0:5
dev-qt/qtwidgets:5 )
rdp? ( net-misc/freerdp: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 )
@@ -174,10 +173,9 @@
libcaca? ( X )
libtar? ( skins )
libtiger? ( kate )
- qt4? ( X !qt5 )
- qt5? ( X !qt4 )
+ qt4? ( X )
sdl? ( X )
- skins? ( truetype X ^^ ( qt4 qt5 ) )
+ skins? ( truetype X qt4 )
vaapi? ( avcodec X )
vlm? ( encode )
xv? ( xcb )
@@ -202,12 +200,6 @@
}
src_prepare() {
- # Support for Qt5.
- if use qt5 ; then
- export UIC="/usr/lib64/qt5/bin/uic"
- export MOC="/usr/lib64/qt5/bin/moc"
- fi
-
# Remove unnecessary warnings about unimplemented pragmas on gcc for
now.
# Need to recheck this with gcc 4.9 and every subsequent minor bump of
gcc.
#
@@ -260,6 +252,10 @@
# Compatibility fix for Samba 4.
use samba && append-cppflags "-I/usr/include/samba-4.0"
+ # We need to disable -fstack-check if use >=gcc 4.8.0.
+ # See bug #499996
+ use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
# Needs libresid-builder from libsidplay:2 which is in another
directory...
# FIXME!
append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
@@ -272,11 +268,6 @@
--with-default-monospace-font-family=Monospace"
fi
- local qt_flag=""
- if use qt4 || use qt5 ; then
- qt_flag="--enable-qt"
- fi
-
econf \
${myconf} \
--enable-vlc \
@@ -363,7 +354,7 @@
$(use_enable postproc) \
$(use_enable projectm) \
$(use_enable pulseaudio pulse) \
- ${qt_flag} \
+ $(use_enable qt4 qt) \
$(use_enable rdp libfreerdp) \
$(use_enable rtsp realrtsp) \
$(use_enable run-as-root) \
1.26 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.26&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?rev=1.26&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?r1=1.25&r2=1.26
Index: vlc-2.1.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- vlc-2.1.9999.ebuild 15 Nov 2014 11:56:20 -0000 1.25
+++ vlc-2.1.9999.ebuild 16 Nov 2014 14:37:22 -0000 1.26
@@ -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.25
2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.26
2014/11/16 14:37:22 dlan Exp $
EAPI="5"
@@ -49,7 +49,7 @@
+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
- png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+ png +postproc projectm pulseaudio +qt4 rdp rtsp run-as-root samba
schroedinger sdl sdl-image sftp shout sid skins speex sse svg +swscale
taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
vlm vnc vorbis wma-fixed +X x264 +xcb xml xv zvbi"
@@ -119,7 +119,6 @@
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 )
- qt5? ( >=dev-qt/qtgui-5.1.0:5 >=dev-qt/qtcore-5.1.0:5
dev-qt/qtwidgets:5 )
rdp? ( net-misc/freerdp: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 )
@@ -175,10 +174,9 @@
libcaca? ( X )
libtar? ( skins )
libtiger? ( kate )
- qt4? ( X !qt5 )
- qt5? ( X !qt4 )
+ qt4? ( X )
sdl? ( X )
- skins? ( truetype X ^^ ( qt4 qt5 ) )
+ skins? ( truetype X qt4 )
vaapi? ( avcodec X )
vlm? ( encode )
xv? ( xcb )
@@ -203,12 +201,6 @@
}
src_prepare() {
- # Support for Qt5.
- if use qt5 ; then
- export UIC="/usr/lib64/qt5/bin/uic"
- export MOC="/usr/lib64/qt5/bin/moc"
- fi
-
# Remove unnecessary warnings about unimplemented pragmas on gcc for
now.
# Need to recheck this with gcc 4.9 and every subsequent minor bump of
gcc.
#
@@ -261,6 +253,10 @@
# Compatibility fix for Samba 4.
use samba && append-cppflags "-I/usr/include/samba-4.0"
+ # We need to disable -fstack-check if use >=gcc 4.8.0.
+ # See bug #499996
+ use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
# Needs libresid-builder from libsidplay:2 which is in another
directory...
# FIXME!
append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
@@ -273,11 +269,6 @@
--with-default-monospace-font-family=Monospace"
fi
- local qt_flag=""
- if use qt4 || use qt5 ; then
- qt_flag="--enable-qt"
- fi
-
econf \
${myconf} \
--enable-vlc \
@@ -366,7 +357,7 @@
$(use_enable postproc) \
$(use_enable projectm) \
$(use_enable pulseaudio pulse) \
- ${qt_flag} \
+ $(use_enable qt4 qt) \
$(use_enable rdp libfreerdp) \
$(use_enable rtsp realrtsp) \
$(use_enable run-as-root) \
1.4 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.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild?r1=1.3&r2=1.4
Index: vlc-2.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vlc-2.2.9999.ebuild 15 Nov 2014 11:56:20 -0000 1.3
+++ vlc-2.2.9999.ebuild 16 Nov 2014 14:37:22 -0000 1.4
@@ -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.3
2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v 1.4
2014/11/16 14:37:22 dlan Exp $
EAPI="5"
@@ -116,7 +116,7 @@
projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
pulseaudio? ( >=media-sound/pulseaudio-1:0 )
qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 )
- qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5
dev-qt/qtwidgets:5 )
+ qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5
>=dev-qt/qtwidgets-5.1:5 >=dev-qt/qtx11extras-5.1:5 )
rdp? ( >=net-misc/freerdp-1.0.1:0= )
samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient]
>=net-fs/samba-4:0[client] ) )
schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
@@ -246,11 +246,6 @@
# Fix up broken audio when skipping using a fixed reversed bisected
commit.
epatch
"${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
- # Disable avcodec checks when avcodec is not used.
- if ! use avcodec; then
- sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/'
modules/codec/avcodec/fourcc.c || die
- fi
-
# Don't use --started-from-file when not using dbus.
if ! use dbus ; then
sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
@@ -266,6 +261,10 @@
# Compatibility fix for Samba 4.
use samba && append-cppflags "-I/usr/include/samba-4.0"
+ # We need to disable -fstack-check if use >=gcc 4.8.0.
+ # See bug #499996
+ use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
# Needs libresid-builder from libsidplay:2 which is in another
directory...
# FIXME!
append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
1.11 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.11&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild?rev=1.11&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild?r1=1.10&r2=1.11
Index: vlc-2.1.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vlc-2.1.4.ebuild 15 Nov 2014 11:56:20 -0000 1.10
+++ vlc-2.1.4.ebuild 16 Nov 2014 14:37:22 -0000 1.11
@@ -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.10
2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.11
2014/11/16 14:37:22 dlan Exp $
EAPI="5"
@@ -49,7 +49,7 @@
+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
- png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+ png +postproc projectm pulseaudio +qt4 rdp rtsp run-as-root samba
schroedinger sdl sdl-image sftp shout sid skins speex sse svg +swscale
taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
vlm vnc vorbis wma-fixed +X x264 +xcb xml xv zvbi"
@@ -119,7 +119,6 @@
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 )
- qt5? ( >=dev-qt/qtgui-5.1.0:5 >=dev-qt/qtcore-5.1.0:5
dev-qt/qtwidgets:5 )
rdp? ( net-misc/freerdp: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 )
@@ -175,10 +174,9 @@
libcaca? ( X )
libtar? ( skins )
libtiger? ( kate )
- qt4? ( X !qt5 )
- qt5? ( X !qt4 )
+ qt4? ( X )
sdl? ( X )
- skins? ( truetype X ^^ ( qt4 qt5 ) )
+ skins? ( truetype X qt4 )
vaapi? ( avcodec X )
vlm? ( encode )
xv? ( xcb )
@@ -203,12 +201,6 @@
}
src_prepare() {
- # Support for Qt5.
- if use qt5 ; then
- export UIC="/usr/lib64/qt5/bin/uic"
- export MOC="/usr/lib64/qt5/bin/moc"
- fi
-
# Remove unnecessary warnings about unimplemented pragmas on gcc for
now.
# Need to recheck this with gcc 4.9 and every subsequent minor bump of
gcc.
#
@@ -261,6 +253,10 @@
# Compatibility fix for Samba 4.
use samba && append-cppflags "-I/usr/include/samba-4.0"
+ # We need to disable -fstack-check if use >=gcc 4.8.0.
+ # See bug #499996
+ use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
# Needs libresid-builder from libsidplay:2 which is in another
directory...
# FIXME!
append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
@@ -273,11 +269,6 @@
--with-default-monospace-font-family=Monospace"
fi
- local qt_flag=""
- if use qt4 || use qt5 ; then
- qt_flag="--enable-qt"
- fi
-
econf \
${myconf} \
--enable-vlc \
@@ -366,7 +357,7 @@
$(use_enable postproc) \
$(use_enable projectm) \
$(use_enable pulseaudio pulse) \
- ${qt_flag} \
+ $(use_enable qt4 qt) \
$(use_enable rdp libfreerdp) \
$(use_enable rtsp realrtsp) \
$(use_enable run-as-root) \
1.919 media-video/vlc/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.919&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.919&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.918&r2=1.919
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
retrieving revision 1.918
retrieving revision 1.919
diff -u -r1.918 -r1.919
--- ChangeLog 15 Nov 2014 11:56:20 -0000 1.918
+++ ChangeLog 16 Nov 2014 14:37:22 -0000 1.919
@@ -1,6 +1,26 @@
# 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.918
2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.919
2014/11/16 14:37:22 dlan Exp $
+
+ 16 Nov 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,
+ metadata.xml:
+ proxy for maintainer, fix bug 525004, 506322, 489508, 499996
+ 5) Add missing qtx11extras dependency for Qt5.
+ Fixes 525004 and unreported issue that VLC opens separate window for movie
+ when Qt5 X11 Extras are not found by configure script.
+ Although it is possible to use Qt5 with Wayland instead of X11, it is not
+ well supported by VLC, yet (WiP). Ebuild does not support wayland output,
yet.
+ 4) Removed workaround for avcodec use flag disabled.
+ It is not needed anymore starting with version 2.2
+ 3) Corrected bugfix for bug 506322 - ebuild for version 2.1.5 was improperly
fixed.
+ 2) Drop support for Qt5 in VLC 2.1.x branch.
+ Fixes bug 489508. qt5 use flag was buggy, and this configuration was not
very well
+ supported by upstream. Since Qt5 is still masked in portage tree, there is
+ a big chance that first VLC 2.2.x release will be before Qt5 is unmasked.
+ 1) Disable fstack-check on x86 (enabled on hardened configurations by
default)
+ because of registers shortage.
+ Fixes bug 499996 reported by Bertrand Jacquin and patch submitted by Anthony
Basile.
15 Nov 2014; Markos Chandras <[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,
1.83 media-video/vlc/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/metadata.xml?rev=1.83&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/metadata.xml?rev=1.83&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/metadata.xml?r1=1.82&r2=1.83
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/metadata.xml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- metadata.xml 14 Nov 2014 02:13:20 -0000 1.82
+++ metadata.xml 16 Nov 2014 14:37:22 -0000 1.83
@@ -51,7 +51,8 @@
<flag name="opus">Support opus decoding via libopus.</flag>
<flag name="postproc">Enables image post-processing via
libpostproc (part of FFmpeg).</flag>
<flag name="projectm">Enables the projectM visualization
plugin.</flag>
- <flag name="qt4" restrict=">=media-video/vlc-0.9">Builds a
<pkg>x11-libs/qt</pkg> based frontend, a graphical interface.</flag>
+ <flag name="qt4" restrict=">=media-video/vlc-0.9">Builds a
Qt4 based frontend, a graphical interface.</flag>
+ <flag name="qt5" restrict=">=media-video/vlc-2.2">Builds a
Qt5 based frontend, a graphical interface.</flag>
<flag name="rdp">Enables freerdp for RDP/Remote Desktop client
support</flag>
<flag name="rtsp">Enables real audio and RTSP modules.</flag>
<flag name="run-as-root">Allows vlc to start for root. Don't
enable this unless you have a very specific (e.g. embedded) need for it!</flag>
