summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2014-05-17 20:58:32 +0000
committerLuca Barbato <lu_zero@gentoo.org>2014-05-17 20:58:32 +0000
commit3b5ef227b3e5526c10263ebda19db62a01fb006a (patch)
treee98fc1428ad8ee8899835ab66c233be60253d3f8 /media-video
parentfix build failure wrt #510474 (diff)
downloadgentoo-2-3b5ef227b3e5526c10263ebda19db62a01fb006a.tar.gz
gentoo-2-3b5ef227b3e5526c10263ebda19db62a01fb006a.tar.bz2
gentoo-2-3b5ef227b3e5526c10263ebda19db62a01fb006a.zip
Update from Nikoli
(Portage version: 2.2.8-prefix/cvs/Darwin i386, unsigned Manifest commit)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mpv/ChangeLog5
-rw-r--r--media-video/mpv/mpv-9999.ebuild14
2 files changed, 15 insertions, 4 deletions
diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 983aa39abeef..20de6b5d4386 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mpv
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.74 2014/04/30 18:34:39 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.75 2014/05/17 20:58:32 lu_zero Exp $
+
+ 17 May 2014; Luca Barbato <lu_zero@gentoo.org> mpv-9999.ebuild:
+ Update from Nikoli
*mpv-0.3.9 (30 Apr 2014)
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 63b76d6e47dd..196824eebde2 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -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/mpv/mpv-9999.ebuild,v 1.48 2014/04/25 14:42:44 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.49 2014/05/17 20:58:32 lu_zero Exp $
EAPI=5
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
SLOT="0"
[[ ${PV} == *9999* ]] || \
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick
+IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd dvdnav +enca encode examples +iconv jack -joystick
jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl
oss portaudio postproc pulseaudio pvr +quvi samba sdl selinux +shm v4l vaapi vcd vdpau
vf-dlopen wayland +X xinerama +xscreensaver +xv"
@@ -29,6 +29,7 @@ vf-dlopen wayland +X xinerama +xscreensaver +xv"
REQUIRED_USE="
dvdnav? ( dvd )
enca? ( iconv )
+ examples? ( lua )
lcms? ( opengl )
libguess? ( iconv )
luajit? ( lua )
@@ -92,7 +93,12 @@ RDEPEND+="
mpg123? ( >=media-sound/mpg123-1.14.0 )
openal? ( >=media-libs/openal-1.13 )
portaudio? ( >=media-libs/portaudio-19_pre20111121 )
- postproc? ( >=media-video/ffmpeg-2.1.4:0 )
+ postproc? (
+ || (
+ >=media-libs/libpostproc-10.20140517
+ >=media-video/ffmpeg-2.1.4:0
+ )
+ )
pulseaudio? ( media-sound/pulseaudio )
quvi? (
>=media-libs/libquvi-0.4.1:=
@@ -164,6 +170,8 @@ src_configure() {
$(use_enable sdl sdl2) \
--disable-rsound \
--disable-vapoursynth \
+ $(use_enable examples libmpv-shared) \
+ $(use_enable examples client-api-examples) \
$(use_enable encode encoding) \
$(use_enable joystick) \
$(use_enable bluray libbluray) \