Version bump, wrt bug #481118

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 315 insertions, 9 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 99ef0470f5c3..1523474becf0 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.21 2013/09/02 08:10:12 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.22 2013/09/02 08:11:58 pinkbyte Exp $
+
+*mpv-0.1.4 (02 Sep 2013)
+
+  02 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> +mpv-0.1.4.ebuild:
+  Version bump, wrt bug #481118
 
   02 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> mpv-9999.ebuild,
   metadata.xml:
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 860144213424..b505a9db6bf3 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA256
 
 DIST mpv-0.1.3.tar.gz 1650206 SHA256 5f06cf484f0826fe3829563d98fff5ebfd2385beed617dcf7be4d1f38373083c SHA512 0867efd92f32fabd6410e88bf1f441ed2b33d5b705550cf3fc2d6d4ecc72d79f97ed0dfcec1a4bae4f9a1701d740c0e08b3453c2816b68c9d72e8b1037b6002f WHIRLPOOL a9cb967b9cbd03e31f2c1fffdf05968e5c876ea68c411887e5dfcab26755cd1312fa689b9a4f84d3db5c42b4f6c0475b2157584e846d34da602c87beaf7143ad
+DIST mpv-0.1.4.tar.gz 1650525 SHA256 ec4a6093b33ed00d3f64a97e2eabbbf45b8e511929c98f3b8043f5effbe8cae7 SHA512 a462bba4f0f1f0394f040877e99d9dd1d5b26f031b5ee6db0cf3f00fb124527d65f2a6d9ef64e8e144c68a5cab92aeaaee75a6321f9024c505ae150f24def991 WHIRLPOOL 332e1449d2ebfdcc87313022df73606ed692e994719e49e5c0540a64ac4d5261ef1cfcef14cb432305d66b42bb695beba2b1e27110461e6259c6ae5f6af203bc
 EBUILD mpv-0.1.3.ebuild 7815 SHA256 85faf33dc18484049dbfd6836338938e7a2af32634a904274c9abf87d08a98ff SHA512 ced28f7e4d1fe643cf8e2cdf02ed0c1e9521811c01a1977f165b8a901ad7a6f55199269482b41947a76bc571c83bb5392a9dab9971ee79acf2bb28590ad9b65a WHIRLPOOL ff70724a0d5984b69abbe5552058345f14b3ca19e6497826d5e2e4d3501214ab5547b0cf7036f56cd03cedb59e47cad9f6c0b27375ca43e9a4b77fc2837489f7
+EBUILD mpv-0.1.4.ebuild 7814 SHA256 241d12d3ba3c1381c45e00da730ec4f9fd898d5bbf5fa42c7c3cdcb26268ae36 SHA512 90417ec158c951bb8ea1838ed344fb16ee497aaca06393587e83f14f06fc2cbb81bf55ba9a4daa8f923700c11d55dd948eed9df96559e26dae31c2266c581579 WHIRLPOOL 7f9b81d7ba254ab3f895a21d45eccafb9d8fabba0ecf0432c4839696e1637c47998ca1eea2e94123520542610b6080bf537827a36aeaa3464c43f7d98b4f32f1
 EBUILD mpv-9999.ebuild 7895 SHA256 39fed1f7007409060f6dca0bb696933c3f8faed43c71a956ffb040cc47e75014 SHA512 415e07b47e35dcc8bc77d596b00e8f8a615a2282f6236840534d5a5c27839efa728105307703e4b19cc4c7ef73905a40d6141973867e3fd2d49c4614fa41a673 WHIRLPOOL b9c1bb076c7b70587d5d26e94331c7ebc2caaf66792f9d3afeecd90fbab14eb00d2b6eaffb32148f197e308190f57afb8203ae3eabbb052776544ca036811247
-MISC ChangeLog 3800 SHA256 e0d568ac25d887e84d9e494976dde3333d2088c9961614fd72d2bd078a884e85 SHA512 fc7b2590358ade5ce254fa1d1d3d03bd9409cf683ad084b8a5ab1cb27a83fcdf46507dd28486f8ad03c5031ee770f5a37e48f3e604942a703ef09d5db9b97f69 WHIRLPOOL f62c0870b703c0f3081f03a9dd22d0d85e7a1a29948b8dd77c26acec9a64133517cbcb5f23317095f69ea4b7d2edbe3ed99d4d740bb197c4cac3f42b573f1a57
+MISC ChangeLog 3928 SHA256 183fabc9cecfa57dc4711590913ef7fb894d69e713ba243f2684a9163c320475 SHA512 a9dff1bc7a61354d86b75dda9e083c217cd51e34aa50d842da15f2c546c51d9f9da83bb5c039cb290c1d6f41e062b05a036c29a6f0affebf2a2d780822dc4e62 WHIRLPOOL 00ed4624d19168faed9195b44ca3e77331b90fcb09599e6645fca66f1c13917975ed72f46ce1e19174ec1ca44fd2f2bee365a30af98cde714c22c50e682ea59e
 MISC metadata.xml 1408 SHA256 0ddd7b21997148e1b3d0184573553f5406442bee5e907ee841908e7d069e07d8 SHA512 5572a3f43400a83f36b58e4cd276e0092984a304d821471b7aad9df597711be7d407aff65b6382f9e6afe1708140c658d9502aa6ce70f564524cc5b62d184f9e WHIRLPOOL e1917c2e7b7090697a93f0b736d03cfb58da6da731b010e3584ba2dd537650a9b6da883a57ef5b0bcf7069cd13056e9b33d342b02cdf9c28b71ae2a3ce02ceb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSJEeHAAoJECo/aRed9267dAEH/3eVZvGdr/4FBBgXvlwwu1hr
-n/FquM4wZq8vYwhPuREzvcTcv3F0o+Ofbm/uv9eVL43ugf2bE0BnE5AO/XpxelfF
-Fq3beJqL+Lzbt2YIpQtuflQvA6BPVP2QBLetmEO4T07Snc7JTYCEuwA3ygvSlodt
-jfgRQNdy0E+woQyyY59RSW8VtD7GO5CnPMTgSCcS0loF15qY6U+5ojvsjL+jaJMW
-f9CA82YGy+6UR7VD9JrYYMDzf0SElqp6O8XVXW8/3yekPl0TlROVS6n1Scs59lue
-gI7NRlzFjBdDiwxYw7p+AEZAXJ43+X4Xsg/DHuHIdi9685XbjQp1X1FJ2rC3Kak=
-=sy7E
+iQEcBAEBCAAGBQJSJEfyAAoJECo/aRed9267QZ4H/RtOSgvQbgC6OfSSkNWtyEI1
+YgviA0NlUMA9cA7ACUX/8orQb/QnCjeRU5TMakQ6nkrLOItoE9a2HMDfabdjEV0o
+0LQ0p6evhZhM70GL2eu0k+YGwNC8x7gGuCkawGSuAc97QDvumRQtyAZ/BZX4DCyS
+lUE4PBQ3wD6gFTVTsKkgYfFCmSXut9yXBy5p4VEHqMm7dEgXNPPfNAIzU+VzHLc+
+0j5aKamGkDOSc+5xW8+eFe+3fQnKEn3c14R+LSKuxC3gxUf7vKdNtYBp65OPiu/I
+boQUhHj9j6mb+tRVjdrbXgmZ627GX+F3gGr+hBBwhy2FVuplWW/k+IfAsPMvCRk=
+=n7/L
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.1.4.ebuild b/media-video/mpv/mpv-0.1.4.ebuild
new file mode 100644
index 000000000000..18e6d263cd90
--- /dev/null
+++ b/media-video/mpv/mpv-0.1.4.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.1.4.ebuild,v 1.1 2013/09/02 08:11:58 pinkbyte Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/mpv-player/mpv.git"
+
+inherit toolchain-funcs flag-o-matic multilib base
+[[ ${PV} == *9999* ]] && inherit git-2
+
+DESCRIPTION="Video player based on MPlayer/mplayer2"
+HOMEPAGE="http://mpv.io/"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="+alsa aqua bluray bs2b +cdio dvb +dvd +enca encode +iconv jack joystick
+jpeg ladspa lcms +libass libcaca libguess lirc mng +mp3 -openal +opengl oss
+portaudio +postproc pulseaudio pvr +quvi radio samba +shm +threads v4l vcd
+vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
+
+REQUIRED_USE="
+	enca? ( iconv )
+	lcms? ( opengl )
+	libguess? ( iconv )
+	opengl? ( || ( aqua wayland X ) )
+	portaudio? ( threads )
+	pvr? ( v4l )
+	radio? ( v4l || ( alsa oss ) )
+	v4l? ( threads )
+	vdpau? ( X )
+	wayland? ( opengl )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+"
+
+RDEPEND+="
+	|| (
+		>=media-video/libav-9:=[encode?,threads?,vdpau?]
+		>=media-video/ffmpeg-1.2:0=[encode?,threads?,vdpau?]
+	)
+	sys-libs/ncurses
+	sys-libs/zlib
+	X? (
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		opengl? ( virtual/opengl )
+		lcms? ( media-libs/lcms:2 )
+		vdpau? ( x11-libs/libvdpau )
+		xinerama? ( x11-libs/libXinerama )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		xv? ( x11-libs/libXv )
+	)
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( media-libs/libbluray )
+	bs2b? ( media-libs/libbs2b )
+	cdio? (
+		|| (
+			dev-libs/libcdio-paranoia
+			<dev-libs/libcdio-0.90[-minimal]
+		)
+	)
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? ( >=media-libs/libdvdread-4.1.3 )
+	enca? ( app-i18n/enca )
+	iconv? ( virtual/libiconv )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg )
+	ladspa? ( media-libs/ladspa-sdk )
+	libass? (
+		>=media-libs/libass-0.9.10[enca?,fontconfig]
+		virtual/ttf-fonts
+	)
+	libcaca? ( media-libs/libcaca )
+	libguess? ( >=app-i18n/libguess-1.0 )
+	lirc? ( app-misc/lirc )
+	mng? ( media-libs/libmng )
+	mp3? ( media-sound/mpg123 )
+	openal? ( >=media-libs/openal-1.13 )
+	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
+	postproc? (
+		|| (
+			media-libs/libpostproc
+			>=media-video/ffmpeg-1.2:0[encode?,threads?,vdpau?]
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	quvi? ( >=media-libs/libquvi-0.4.1:= )
+	samba? ( net-fs/samba )
+	wayland? (
+		>=dev-libs/wayland-1.0.0
+		media-libs/mesa[egl,wayland]
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-lang/perl-5.8
+	dev-python/docutils
+	X? (
+		x11-proto/videoproto
+		x11-proto/xf86vidmodeproto
+		xinerama? ( x11-proto/xineramaproto )
+		xscreensaver? ( x11-proto/scrnsaverproto )
+	)
+	amd64? ( ${ASM_DEP} )
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
+"
+DOCS=( AUTHORS Copyright README.md etc/example.conf etc/input.conf etc/encoding-example-profiles.conf )
+
+pkg_setup() {
+	if [[ ${PV} == *9999* ]]; then
+		elog
+		elog "This is a live ebuild which installs the latest from upstream's"
+		elog "git repository, and is unsupported by Gentoo."
+		elog "Everything but bugs in the ebuild itself will be ignored."
+		elog
+	fi
+
+	if use !libass; then
+		ewarn
+		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
+	fi
+
+	if use openal; then
+		ewarn
+		ewarn "You've enabled the openal flag. OpenAL is disabled by default,"
+		ewarn "because it supposedly inteferes with some other configure tests"
+		ewarn "and makes them fail silently."
+	fi
+
+	einfo "For additional format support you need to enable the support on your"
+	einfo "libavcodec/libavformat provider:"
+	einfo "    media-video/libav or media-video/ffmpeg"
+}
+
+src_prepare() {
+	# fix path to bash executable in configure scripts
+	sed -i -e "1c\#!${EPREFIX}/bin/bash" \
+		configure version.sh || die
+
+	base_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+	local uses i
+
+	# ebuild uses "use foo || --disable-foo" to forcibly disable
+	# compilation in almost every situation. The reason for this is
+	# because if --enable is used, it will force the build of that option,
+	# regardless of whether the dependency is available or not.
+
+	#####################
+	# Optional features #
+	#####################
+	# SDL output is fallback for platforms where nothing better is available
+	myconf+=" --disable-sdl --disable-sdl2"
+	use encode || myconf+=" --disable-encoding"
+	myconf+=" $(use_enable joystick)"
+	uses="bluray vcd"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use quvi || myconf+=" --disable-libquvi4 --disable-libquvi9"
+	use samba || myconf+=" --disable-smb"
+	use lirc || myconf+=" --disable-lirc --disable-lircc"
+
+	########
+	# CDDA #
+	########
+	use cdio || myconf+=" --disable-libcdio"
+
+	############
+	# DVD read #
+	############
+	use dvd || myconf+=" --disable-dvdread"
+
+	#############
+	# Subtitles #
+	#############
+	uses="enca iconv libass libguess"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+
+	#####################################
+	# DVB / Video4Linux / Radio support #
+	#####################################
+	use dvb || myconf+=" --disable-dvb"
+	use pvr || myconf+=" --disable-pvr"
+	use v4l || myconf+=" --disable-tv --disable-tv-v4l2"
+	if use radio; then
+		myconf+=" --enable-radio --enable-radio-capture"
+	else
+		myconf+=" --disable-radio-v4l2"
+	fi
+
+	##########
+	# Codecs #
+	##########
+	use mp3 || myconf+=" --disable-mpg123"
+	uses="jpeg mng"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+
+	################
+	# Video Output #
+	################
+	use libcaca || myconf+=" --disable-caca"
+	use postproc || myconf+=" --disable-libpostproc"
+
+	################
+	# Audio Output #
+	################
+	myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
+	uses="alsa jack ladspa portaudio"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use bs2b || myconf+=" --disable-libbs2b"
+	use openal && myconf+=" --enable-openal"
+	use oss || myconf+=" --disable-ossaudio"
+	use pulseaudio || myconf+=" --disable-pulse"
+
+	####################
+	# Advanced Options #
+	####################
+	# keep build reproducible
+	myconf+=" --disable-build-date"
+	# do not add -g to CFLAGS
+	myconf+=" --disable-debug"
+	use threads || myconf+=" --disable-pthreads"
+
+	# Platform specific flags, hardcoded on amd64 (see below)
+	use shm || myconf+=" --disable-shm"
+
+	if use x86 && gcc-specs-pie; then
+		filter-flags -fPIC -fPIE
+		append-ldflags -nopie
+	fi
+
+	###########################
+	# X enabled configuration #
+	###########################
+	use X || myconf+=" --disable-x11"
+	uses="vdpau wayland xinerama xv"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use opengl || myconf+=" --disable-gl"
+	use lcms || myconf+=" --disable-lcms2"
+	use xscreensaver || myconf+=" --disable-xss"
+
+	############################
+	# OSX (aqua) configuration #
+	############################
+	use aqua && myconf+=" --enable-macosx-bundle"
+
+	CFLAGS= LDFLAGS= ./configure \
+		--cc="$(tc-getCC)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--pkg-config="$(tc-getPKG_CONFIG)" \
+		--prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--confdir="${EPREFIX}"/etc/${PN} \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--localedir="${EPREFIX}"/usr/share/locale \
+		${myconf} || die
+
+	MAKEOPTS+=" V=1"
+}
+
+src_compile() {
+	base_src_compile
+
+	if use vf-dlopen; then
+		tc-export CC
+		emake -C TOOLS/vf_dlopen
+	fi
+}
+
+src_install() {
+	base_src_install
+
+	if use vf-dlopen; then
+		exeinto /usr/$(get_libdir)/${PN}
+		doexe TOOLS/vf_dlopen/*.so
+	fi
+}