commit: 1b4324c1643ddd0385eb674c1356642f74a2110a
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 09:14:39 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 09:22:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b4324c1
media-video/vlc: Update 9999. Fix bug #571568, add chromecast, restrict ffmpeg
Also removed deprecated configure flags.
Added chromecast support. To use, run -sout="#chromecast{ip=xxx.xxx.xxx.xxx}"
Restrict ffmpeg versions to <ffmpeg-2.8 for hwaccel via vaapi and vdpau
Proxied commit for Nick Andrade (SDNick484)
Package-Manager: portage-2.2.26
Signed-off-by: NP-Hardass <NP-Hardass <AT> gentoo.org>
media-video/vlc/metadata.xml | 2 ++
media-video/vlc/vlc-9999.ebuild | 47 +++++++++++++++++++----------------------
2 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index a9878a3..458ad8e 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -15,6 +15,7 @@
<flag name="avformat">Enables libformat support for reading and
writing various media containers. libavformat is part of FFmpeg.</flag>
<flag name="bluray">Enables libbluray for Blu-ray disc
support.</flag>
<flag name="chromaprint">Enables libchromaprint for Chromaprint
based audio fingerprinter support.</flag>
+ <flag name="chromecast">Enable experimental support for Google
Chromecast.</flag>
<flag name="dc1394">Enables IIDC cameras support.</flag>
<flag name="dirac">Enable Dirac video support (an advanced
royalty-free video compression format) via the reference library: dirac.</flag>
<flag name="directx">Enable Win32 DirectX support.</flag>
@@ -40,6 +41,7 @@
<flag name="macosx-audio">Enables Mac OS X audio module.</flag>
<flag name="macosx-dialog-provider">Enables Mac OS X dialog
module.</flag>
<flag name="macosx-eyetv">Enables Mac OS X EyeTV (TNT Tuner)
module.</flag>
+ <flag name="macosx-notifications">Enables Mac OS X
notifications module (formerly growl).</flag>
<flag name="macosx-quartztext">Enables Mac OS X quartz text
module.</flag>
<flag name="macosx-qtkit">Enables Mac OS X qtkit module:
qtcapture (video) and qtsound (audio) module.</flag>
<flag name="macosx-vout">Enables Mac OS X video output
module.</flag>
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index e4d7563..1ebdcad 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -38,18 +38,18 @@ if [[ ${PV} != *9999 ]] ; then
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
fi
-IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
- +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
+IUSE="a52 aalib alsa altivec +audioqueue +avcodec
+ +avformat bidi bluray cddb chromaprint chromecast dbus dc1394 debug
directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
- fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
- growl httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify
+ fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnutls httpd
+ ieee1394 jack jpeg kate kde libass libav libcaca libnotify
+libsamplerate libtiger linsys libtar lirc live lua
- macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
- matroska media-library cpu_flags_x86_mmx modplug mp3 mpeg
- mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
+ macosx-dialog-provider macosx-eyetv macosx-notifications
macosx-quartztext macosx-qtkit
+ matroska media-library cpu_flags_x86_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
schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse
svg +swscale
- taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
+ taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau
vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi zeroconf"
RDEPEND="
@@ -73,6 +73,7 @@ RDEPEND="
bluray? ( >=media-libs/libbluray-0.3:0 )
cddb? ( >=media-libs/libcddb-1.2:0 )
chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+ chromecast? ( >=dev-libs/protobuf-2.5.0 )
dbus? ( >=sys-apps/dbus-1.6:0 )
dc1394? ( >=sys-libs/libraw1394-2.0.1:0
>=media-libs/libdc1394-2.1:2 )
directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
@@ -87,7 +88,6 @@ RDEPEND="
fontconfig? ( media-libs/fontconfig:1.0 )
gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
gme? ( media-libs/game-music-emu:0 )
- gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
gnutls? ( >=net-libs/gnutls-3.0.20:0 )
ieee1394? ( >=sys-libs/libraw1394-2.0.1:0
>=sys-libs/libavc1394-0.5.3:0 )
jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
@@ -149,10 +149,10 @@ RDEPEND="
v4l? ( media-libs/libv4l:0 )
vaapi? (
x11-libs/libva:0[X,drm]
- !libav? ( media-video/ffmpeg:0=[vaapi] )
+ !libav? ( <media-video/ffmpeg-2.9:0=[vaapi] )
libav? ( media-video/libav:0=[vaapi] )
)
- vcdx? ( >=dev-libs/libcdio-0.78.2:0
>=media-video/vcdimager-0.7.22:0 )
+ vcd? ( >=dev-libs/libcdio-0.78.2:0 )
zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
"
@@ -161,7 +161,10 @@ RDEPEND="
RDEPEND="${RDEPEND}
vdpau? (
>=x11-libs/libvdpau-0.6:0
- !libav? ( >=media-video/ffmpeg-2.2:0= )
+ !libav? (
+ >=media-video/ffmpeg-2.2:0=
+ <media-video/ffmpeg-2.9:0=
+ )
libav? ( >=media-video/libav-10:0= )
)
vnc? ( >=net-libs/libvncserver-0.9.9:0 )
@@ -187,7 +190,6 @@ DEPEND="${RDEPEND}
REQUIRED_USE="
aalib? ( X )
bidi? ( truetype )
- cddb? ( cdda )
dvb? ( dvbpsi )
dxva2? ( avcodec )
ffmpeg? ( avcodec avformat swscale postproc )
@@ -315,15 +317,14 @@ src_configure() {
$(use_enable aalib aa) \
$(use_enable alsa) \
$(use_enable altivec) \
- $(use_enable atmo) \
$(use_enable audioqueue) \
$(use_enable avcodec) \
$(use_enable avformat) \
$(use_enable bidi fribidi) \
$(use_enable bluray) \
- $(use_enable cdda vcd) \
$(use_enable cddb libcddb) \
$(use_enable chromaprint) \
+ $(use_enable chromecast) \
$(use_enable dbus) \
$(use_enable directfb) \
$(use_enable directx) \
@@ -341,9 +342,7 @@ src_configure() {
$(use_enable fontconfig) \
$(use_enable gcrypt libgcrypt) \
$(use_enable gme) \
- $(use_enable gnome gnomevfs) \
$(use_enable gnutls) \
- $(use_enable growl) \
$(use_enable httpd) \
$(use_enable ieee1394 dv1394) \
$(use_enable jack) \
@@ -362,6 +361,7 @@ src_configure() {
$(use_enable lua) \
$(use_enable macosx-dialog-provider) \
$(use_enable macosx-eyetv) \
+ $(use_enable macosx-notifications osx-notifications) \
$(use_enable macosx-qtkit) \
$(use_enable macosx-quartztext) \
$(use_enable matroska mkv) \
@@ -373,11 +373,10 @@ src_configure() {
$(use_enable musepack mpc) \
$(use_enable ncurses) \
$(use_enable neon) \
- $(use_enable ogg) $(use_enable ogg mux_ogg) \
+ $(use_enable ogg) $(use_enable ogg) \
$(use_enable omxil) \
$(use_enable omxil omxil-vout) \
$(use_enable opencv) \
- $(use_enable opengl glspectrum) \
$(use_enable opus) \
$(use_enable optimisememory optimize-memory) \
$(use_enable png) \
@@ -410,7 +409,7 @@ src_configure() {
$(use_enable upnp) \
$(use_enable v4l v4l2) \
$(use_enable vaapi libva) \
- $(use_enable vcdx) \
+ $(use_enable vcd) \
$(use_enable vdpau) \
$(use_enable vlm) \
$(use_enable vnc) \
@@ -438,8 +437,7 @@ src_configure() {
--disable-maintainer-mode \
--disable-merge-ffmpeg \
--disable-mfx \
- --disable-mmal-codec \
- --disable-mmal-vout \
+ --disable-mmal \
--disable-opensles \
--disable-oss \
--disable-quicktime \
@@ -462,7 +460,7 @@ src_test() {
Xemake check-TESTS
}
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
+DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt"
src_install() {
default
@@ -474,7 +472,6 @@ src_install() {
pkg_postinst() {
if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ;
then
einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on
/usr/$(get_libdir)/vlc/plugins/"
- "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f
"/usr/$(get_libdir)/vlc/plugins/"
else
ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
