version bump

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

3 files changed, 291 insertions, 6 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index c57b5b5eecc6..7284db43a5e5 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.136 2015/05/17 20:11:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.137 2015/05/19 12:46:19 yngwin Exp $
+
+*mpv-0.9.2 (19 May 2015)
+
+  19 May 2015; Ben de Groot <yngwin@gentoo.org> +mpv-0.9.2.ebuild:
+  version bump
 
   17 May 2015; Pacho Ramos <pacho@gentoo.org> mpv-0.8.3.ebuild:
   ppc64 stable wrt bug #525148
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 03647ebddb0b..4bac0e55cb3b 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -5,18 +5,32 @@ AUX mpv-0.3.11-libav-9.patch 291 SHA256 971cdcaf866fcb5f1a93663357c582b474480f5f
 DIST mpv-0.3.10.tar.gz 2520710 SHA256 ec1d9751f9c43f66e13a988c94748ee2e1d8188498001f905213c9ccdf573fce SHA512 fdf84439747e24b4278f09427fc22d6497d2105cf94cd3c45dfb134af917f81c4748d618e962fb13a9db2b7a260a88a409590d10aae71ac987831bc3d293196e WHIRLPOOL d9a4eb6f01ee965b915e9064d75f710dd922a0db1e8a6b9655c844548bbde37c1cca1efd495c5d0f160b4b3823947c13e08e4634c6907fbd44abe758d0a6c552
 DIST mpv-0.8.3.tar.gz 2664730 SHA256 091038c802866848e3647f2a50215fa64ead0dc36f9114457db8b353528689cf SHA512 6b0e1f86032f4f594cee7af7ee7bd577821e948ace442987747a089d32374495abb5cf6bb88c4a1a63db8a36bb4182b30a728f976224263b6a9b4d51e62b1a40 WHIRLPOOL e6de6ff24a0e07cc1dc08f0de585aeb8ef44d1d01d729e088f7d9402b82b5e5318b958083781168ae3e7cc67fce13125d41d79fac997bff5d5888268a52480ba
 DIST mpv-0.9.1.tar.gz 2698031 SHA256 5d23688575d2cc4484f7feef628c690f68016e385622201894d02cb238ea179e SHA512 8abba7e3b2e9f2bf71edc0d772a1910b29f6acdd9c2d33de34ef4ee3fe4b57f3a145aff9dadfe9d9806059cc022fd19237a25e5a3976b8a7c01f8915f020c86b WHIRLPOOL ce35c41a3e2956ba43e8a906992c515722eb7708d7403741ab0099ce9110895b7b62e8b0952a0fbb6e2cc5cf3102ec93c8e2974f2fec6af06bf6bbd80f66dafc
+DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
 DIST waf-1.7.15 90909 SHA256 e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6 SHA512 5d6f75a7a81d369512c6bf70ae14c5275cfdc2b273a5801d7ee928a829ca472aac5ee9f9f2542af6369f34c1648dd12e42112efc29d602527b9ba58a311b4c17 WHIRLPOOL 84048737d1ba746454212e13696ba34d9fc722c74823f719503e29123e33869a49742fba02e24212e3f67e045c5499cf1893bbd191bf8df1dd5cae05a517a17c
 DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e
 EBUILD mpv-0.3.10.ebuild 6420 SHA256 08c56a8e201a818067b041f6d8a7d1a4c2658c0887f595fc3e3d2944241359fa SHA512 d6b92efcfb388a3d92109247b2fc50effbe94f78c0e420004d646f3101689f85138eef568a1d53ee4c6098161fd1effba97173cfff1bfa59a278b4d343312357 WHIRLPOOL 576f26fbac334b0447c84af43e4e54cdd1e8360ffad8aedffa0ab2c534a44382b5d5f127680ee41c3671d53333aa2c15f79f237922db3a9b418b544ca5cb4e54
 EBUILD mpv-0.8.3.ebuild 6868 SHA256 3d83f5b7affcbec564f6a9b5ff25775fb1385506a0b6a2f04bbd4daaabef9fcd SHA512 cbe1db83d67e01c9c3e53c71529a9f4e9138fe66fded8c49f76dcfed489784ea3554677789f7bb43e7af4b658ae1a37af8a92031bbbcf4cf4250fb6a94a4825c WHIRLPOOL 5732a2de4ac9da8bee3f4c181b10ba861faa78bfd40d8049d4b5a473a3b4f8fff69c164af6d21be26d2ebfdffc700ec7901a2167f930b5df5df0d49a2f78cd45
 EBUILD mpv-0.9.1.ebuild 7214 SHA256 7d4c90b6f8e47b8c60a911621267150557373035ea08cc52ca0e291b68a8125b SHA512 01e7dda0c197618e30c2e3d206f4d4a839d9505a2bde5df28172810778ffaa904b1c826450d467cb27040c9526a3bfd2396c10e4f9834fa38a7f12b8df728a29 WHIRLPOOL 4910f6120b9ff5c6cfc6dd30f7bbe98247b1438846b0ad021d49a124656a6d802935d6c0c11fa1841781d3236f0263189ffa10beb6f2c7639c0967f23706d1ea
+EBUILD mpv-0.9.2.ebuild 7214 SHA256 5e582e15f56ada02b2620c9713f0df4a75a995b50ffa1731c709ecadebdba51d SHA512 bb33834b922c43f96c1050c9f787f5e2047e9e6b31dc055be42c9ab832def7d82717c362df0a7b3dfc057be803bb435cd5edabd5fcbd7428016b67dfde3d55a7 WHIRLPOOL a95b1c4013207756d3ee72f93932b2c03dc09eb1b1e19ab0edf825cde1e344df7191f01951ec3d7ef4e7519201a14d3d7a12760bfabf87824d0e71cf482a5c5b
 EBUILD mpv-9999.ebuild 7214 SHA256 791baa350b08a3ada32f8dd4fb7d74a85259493275d9cb3464a0c2ebefb8727f SHA512 f2b0da86285601548c68ce77f914dd7c1ce15cd3ea259465dd4e52bb7fcc0129d82b465a480491e0ca7f87a1fbee4b586bc77e309b8fb5642ba7c11a551e2a2a WHIRLPOOL 8f0f6012799a1fb8e674327412429071702f3d05512f93eea242a5872d4049fdd2f0110bc0143eeec3ab91ae2558410fad32c0fc5b3337450b06b4ea16926ac6
-MISC ChangeLog 21592 SHA256 d9e957a86ad171d204bf42519afbbb8e87226414afd8e079f5eeb5f3c19d3400 SHA512 f509120f7a703bbee8d5582af5e3cbe70e04a99fcef26d1db00f002a80278bb24b0fefaeb364f3681d5882dc0f9257cdb4f592fd02b9cd2f0e7938882c3ec724 WHIRLPOOL 05acb3f5682dd72fb76255745e8e26c3448494134210f7a20082235ccfd0dc1872879dd1483e00f000c0877f0204262bd361d8ba3aea686783ef3d2f5478b087
+MISC ChangeLog 21702 SHA256 4717cf497cd88c5bc93012b186c40a52482b16310fbb51d89bee5fa422ed8a97 SHA512 a8fc8a72013d54dff31062964dbc900627875e7e6461243847e88c4ea21f283b2868d9c43eb0be1490d3188ded69a75086f3e8417c8a993782f30d31fadc9f03 WHIRLPOOL 20d9523a9f10957b84b89a1104b1ba72053568a2f7673b3546e17019d5b623807c1f8c250a2380fa210f1e385a97eefea0bbb24469b516b41ab7e432d65bf35b
 MISC metadata.xml 2467 SHA256 4c5bc9b0c5b81f14901795d8acc1444b208ad8a746c3c54a97a9515b1610d692 SHA512 2c9197f8a75501acbf07e3c017e64857d69873697fc61e870a9a552769e3df6a546c06cee48cab509bdda6bfedf128f6d5b325282de20a90a79d397f4daaad87 WHIRLPOOL 1646ea6ff0bd42d9182cd795510417f813b9ed00c914468f087a0061023b031e98882a311ab917e07dc3779e4a45b9728151d7056a74a47326cb9d0eeb488479
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVY9fIACgkQCaWpQKGI+9QMKACcCnB++NH26y6YhRexunGsoDFP
-KCMAn2BrC7RgsOdhvfExJI8vZn3VR5Ec
-=0PFZ
+iQJ7BAEBCABmBQJVWzCeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOs3oP9R7JKtxmYCyH14KSowdMTNUs
+Y1Kmwfk6z3sAUslyEQQjKpI666z/TDtJ/fSd9xK/EjuQdwIgHW/POcqRQyCaQtKS
+CJE48LhAuXJLLRVufZFFqc+Jf6hoJxj0i/RBqFjzAMCB8F87sILli1M2NSBvnV6A
+ThAL9AYDeSChYEMDBqsXp+soOBEd1/kkO8XVvL+dQ7qB5zrg3NX4XTsN4EYA8som
+BB5esesWM8YgTmkTX4JWuXOfsr3GqkxmTWEWRXHgrsc3HXB/Kx4MNxNm161NYv2F
++YvC5JamLXgHvpj7ZfDfziUJASTHu4zsUOzrqoOtt3L8pe8qca7nhag6TDVPGEFh
+Z87y41e/+edmMArLQnPIBaf7V3E04Rb9RujYxhMpyImWP7fR6iL7pQgxtSwL6g2M
+A7jwOe7NP9W+3ppfIoT5vNWXAGjzhCqN846Vblk00c1GGKdgqALip34lg0lTrMLU
+EltS600mDQFpMs1DxWDo9Hg9QcLXX9zndpxkqNa6YnteHmW4mMKg12UtO913ai3a
+gxJzp5McX0BcV/kdL3/QpY8xDi72s+Ox/U39lzORbiUtbzM3liGK46nc7W/Znuh7
+31+bvOMvgEg+ctATDHOwaw3zGElUqPg+uzqU7rnvFWR1ixaQ1QFBW2e4/OROd7b5
+t66Qkw80/4p89Dv+pVA=
+=LaiB
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.9.2.ebuild b/media-video/mpv/mpv-0.9.2.ebuild
new file mode 100644
index 000000000000..b4dfe930e806
--- /dev/null
+++ b/media-video/mpv/mpv-0.9.2.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.9.2.ebuild,v 1.1 2015/05/19 12:46:19 yngwin Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+inherit eutils python-any-r1 waf-utils pax-utils fdo-mime gnome2-utils
+
+WAF_V="1.8.4"
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="http://mpv.io/"
+SRC_URI="http://ftp.waf.io/pub/release/waf-${WAF_V}"
+DOCS=( README.md etc/example.conf etc/input.conf )
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+else
+	SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	DOCS+=( RELEASE_NOTES )
+fi
+
+# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
+LICENSE="GPL-2+ BSD ISC"
+SLOT="0"
+IUSE="+alsa bluray bs2b cdio +cli doc-pdf drm dvb +dvd dvdnav egl +enca encode
++iconv jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit
+openal +opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l
+vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	dvdnav? ( dvd )
+	egl? ( opengl X )
+	enca? ( iconv )
+	lcms? ( opengl )
+	libguess? ( iconv )
+	luajit? ( lua )
+	opengl? ( || ( wayland X ) )
+	pvr? ( v4l )
+	vaapi? ( X )
+	vdpau? ( X )
+	wayland? ( opengl )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+"
+
+RDEPEND="
+	libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
+	!libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] )
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.2.0
+		opengl? (
+			virtual/opengl
+			egl? ( media-libs/mesa[egl] )
+		)
+		lcms? ( >=media-libs/lcms-2.6:2 )
+		vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
+		vdpau? ( >=x11-libs/libvdpau-0.2 )
+		xinerama? ( x11-libs/libXinerama )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		xv? ( x11-libs/libXv )
+	)
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	bluray? ( >=media-libs/libbluray-0.3.0 )
+	bs2b? ( media-libs/libbs2b )
+	cdio? (
+		dev-libs/libcdio
+		dev-libs/libcdio-paranoia
+	)
+	drm? ( x11-libs/libdrm )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? (
+		>=media-libs/libdvdread-4.1.3
+		dvdnav? ( >=media-libs/libdvdnav-4.2.0 )
+	)
+	enca? ( app-i18n/enca )
+	iconv? ( virtual/libiconv )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg:0 )
+	ladspa? ( media-libs/ladspa-sdk )
+	libass? (
+		>=media-libs/libass-0.12.1:=[enca?,fontconfig]
+		virtual/ttf-fonts
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	libguess? ( >=app-i18n/libguess-1.0 )
+	lua? (
+		!luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[threads] )
+	v4l? ( media-libs/libv4l )
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		media-libs/mesa[egl,wayland]
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	>=dev-lang/perl-5.8
+	dev-python/docutils
+	doc-pdf? ( dev-python/rst2pdf )
+	X? (
+		x11-proto/videoproto
+		xinerama? ( x11-proto/xineramaproto )
+		xscreensaver? ( x11-proto/scrnsaverproto )
+	)
+"
+RDEPEND+="
+	selinux? ( sec-policy/selinux-mplayer )
+"
+
+pkg_setup() {
+	if ! use libass; then
+		ewarn "You have disabled the libass flag. No OSD or subtitles will be displayed."
+	fi
+
+	if use openal; then
+		ewarn "You have enabled the openal audio output which is a fallback"
+		ewarn "and disabled by upstream."
+	fi
+
+	if use sdl; then
+		ewarn "You have enabled the sdl video and audio outputs which are fallbacks"
+		ewarn "and disabled by upstream."
+	fi
+
+	if use libav; then
+		einfo "You have enabled media-video/libav instead of media-video/ffmpeg."
+		einfo "Upstream recommends media-video/ffmpeg, as some functionality is not"
+		einfo "provided by media-video/libav."
+	fi
+
+	einfo "For additional format support you need to enable the support on your"
+	einfo "libavcodec/libavformat provider:"
+	einfo "    media-video/ffmpeg or media-video/libav"
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die
+	chmod 0755 "${S}"/waf || die
+	epatch_user
+}
+
+src_configure() {
+	local mywafargs=(
+		--confdir="${EPREFIX}"/etc/${PN}
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+		--disable-libmpv-static
+		--disable-build-date	# keep build reproducible
+		--disable-optimize	# do not add '-O2' to CFLAGS
+		--disable-debug-build	# do not add '-g' to CFLAGS
+		--disable-test		# avoid dev-util/cmocka automagic
+		$(use_enable doc-pdf pdf-build)
+		$(use_enable vf-dlopen vf-dlopen-filters)
+		$(use_enable cli zsh-comp)
+
+		# optional features
+		$(use_enable iconv)
+		$(use_enable libguess)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable encode encoding)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvdnav)
+		$(use_enable cdio cdda)
+		$(use_enable enca)
+		$(use_enable ladspa)
+		$(use_enable rubberband)
+		$(use_enable bs2b libbs2b)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth	# vapoursynth is not packaged
+		--disable-vapoursynth-lazy
+		--enable-libavfilter
+		--enable-libavdevice
+		$(usex luajit '--lua=luajit' '')
+
+		# audio outputs
+		$(use_enable sdl sdl2)	# SDL output is fallback for platforms where nothing better is available
+		--disable-sdl1
+		$(use_enable oss oss-audio)
+		--disable-rsound	# media-sound/rsound is in pro-audio overlay only
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		$(use_enable alsa)
+
+		# video outputs
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xscreensaver xss)
+		$(use_enable X xext)
+		$(use_enable xv)
+		$(use_enable xinerama)
+		$(use_enable X xrandr)
+		$(usex X "$(use_enable opengl gl-x11)" '--disable-gl-x11')
+		$(use_enable egl egl-x11)
+		$(usex wayland "$(use_enable opengl gl-wayland)" '--disable-gl-wayland')
+		$(use_enable opengl gl)
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi)
+		$(use_enable vaapi vaapi-vpp)
+		$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
+		$(use_enable libcaca caca)
+		$(use_enable drm)
+		$(use_enable jpeg)
+		$(use_enable raspberry-pi rpi)
+		$(use_enable raspberry-pi rpi-gles)
+
+		# hwaccels
+		$(use_enable vaapi vaapi-hwaccel)
+		$(use_enable vdpau vdpau-hwaccel)
+
+		# tv features
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable pvr)
+		$(use_enable dvb dvbin)
+	)
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}"usr/bin/mpv
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}