Version bump to 0.1.7, proxied commit for Nikoli.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 315 insertions, 9 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index ffbede8ae622..aefd08ce6604 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.26 2013/09/21 13:19:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.27 2013/09/22 20:05:49 tomwij Exp $
+
+*mpv-0.1.7 (22 Sep 2013)
+
+  22 Sep 2013; Tom Wijsman <TomWij@gentoo.org> +mpv-0.1.7.ebuild:
+  Version bump to 0.1.7, proxied commit for Nikoli.
 
   21 Sep 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml, mpv-9999.ebuild:
   Added doc-pdf USE flag and removed aqua USE flag, proxied commit for Nikoli.
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 8a623a2b935e..b0637a5f9e40 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA256
 
 DIST mpv-0.1.6.tar.gz 1650956 SHA256 dc9dda1e340e32f3af155fea4f626378008405df36af21d244cedd90a790d569 SHA512 4f27f3028d421cd234202a2abc50bc5ebaddabf345cf13b924f240d2bad195ebfd097e64212ebdcb6e5572d32ab355da550f6af2174f55bb5d9800eb5077ef7b WHIRLPOOL 0a85384dc7374d75b8972ee957cdd6e8346b628ac569291f870af2508d9f745130e0597b7c9ca166b951bc9db73f6b9ae1474653901ea05b7425c80c3e04d277
+DIST mpv-0.1.7.tar.gz 1651651 SHA256 989cb7518baf3ee641748bf1f7f335cf68730943b0dd77490170a5ceb36a63e1 SHA512 17a9a98f4cf47f604851cedd74bb86f8b3d6553b1906d198bcc430419b27cf038729b091df318c6db3fbf4b64f40758c4f79da7212c585d878aff77a25105790 WHIRLPOOL 21ea955e0e212536ae7e76c2f03bdc057b4cf4c4214df80ea9ab8ec6f6ffcae1fa4cdb4bb7f6ece85aa6c0a4430c2d0255f79bf9bec51ad919c508c7fdcdafb7
 EBUILD mpv-0.1.6.ebuild 7815 SHA256 d280d5fa9c1988b53fcf594ce652fcd050980810a65550d3c650dcf102185d11 SHA512 0071534e38a23675e0ce272a3a9831c03b7c2e487466f585d1cb0c75a829e328d44f6cbd0896c90e9ab0b154e26b2622cf3e4e43317682017a81895227be10ca WHIRLPOOL a23cc8fd6931ae34f86cad82c8cbee77bf39f51a3a7c35c4d0a7c8f33438158f8b4ac24123ffd5aa931a7d7b1fab2fc3db42c1e187994ba4e6f30c39312c009b
+EBUILD mpv-0.1.7.ebuild 7812 SHA256 520c9bcd3b7b7aaef3222a4b731be43132af211c4fecd04e52ee39282adae1a9 SHA512 2b991b664636bfdea521549e78e0c27edb5b91f797f902edf06e3b81c3702fdfc8a2952f2379ba4aa2b202eb476f311108576651948a136d33383765cf250eb6 WHIRLPOOL e8c1e1b08de0fc13a6faca13d96203bf5adf68e1ccee4386d203741808890df8bd02d85c29c1fb7ab5fb272d13faabba0ca63176186324094d2c23a702efb3e3
 EBUILD mpv-9999.ebuild 7972 SHA256 41cab9c3248f987e9bb16df7351f09e44dee44dc0a93e16416a387091ad5885e SHA512 a88b7a5c198760dfa7ccf763fda07112653974b0b57abf2754a8a3f4ec4f2715a29af4e5f5f362b58dc780f8ab091330b8f254b7ce048aeeb936d4498812f31f WHIRLPOOL a48a11e71d78a81d091e925ded1f1f867bb60c9c5bd1aec42bdaaab0ce1ce9b81ca43d690abe7d253097ef3ad1535601a694425ac9cc0810a377cf8502af922c
-MISC ChangeLog 4529 SHA256 1d7dc1917aee61f1fc2447546180b8111e5d609a52ff82ed5083a0c6351598ef SHA512 634644dda02a9640904d6266af9e3ed9d17a7de7d50884ed959a3bec45be31be3593a16582f6c8dea32f8d72511eb70198138ff9c5181cf8e8bc30cfe350faa7 WHIRLPOOL 64ae723a5bccb6ff4dc79c02f1157e09430d98c1ff72a41e4e726a118cd06cbe0af8ec6c842727c69bd9599f3ef20084c3c5ff229c3837a7537c6bb23cea88e6
+MISC ChangeLog 4674 SHA256 a394d1d582a89a3a816b50d2d190ec44afe759b345457ef6a0094f199c4d7520 SHA512 5a64b5dd9c9276d37134643f49a86c58ec9e77906157fca7d85fe4bb54387485713ca829a2866589cfe22e312b8a15591a12b59b7f5223703ab21c4b8c1c4643 WHIRLPOOL 455a46f7534388065d200df6ae6601a52a6a2f9569191a6f3f0d69b07c9870eefa4f0ab0b707b790c2975567babc168b7984990edc866ec6be8663891bff0770
 MISC metadata.xml 1466 SHA256 60c040133a66b37261a1051cb4c6dd6d4c10c3c53b81c4b17cc7566b7bbde4f2 SHA512 9b9ff40837ee91aa27fd66870dcc1a4ff8f72f58fd0b788596df85d8abc7599f04b3f6ccd526831eb5ab1e4ab201e26b656a26ae44451aacf9ddafc57eb2570f WHIRLPOOL 96b08f73c3f8d84702e21c9b2260981cd70bd9dc3843f0894fff573d0ac8b4d2bbfc44f2a267f40667806c0643ec8d9acf15daa3d256b166943b9d1065933c72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSPZvGAAoJEJWyH81tNOV9pYoH/R9mGv6ipiwhSeDwsz7LR7X2
-dEPjIhuUUSxeU9BHGylfnFrrnWYw72ZyOBmU/eqk/c0HpoH4lfTec24UYF/b1C7q
-oYJkbYTJ0kOBzTQbn+l9k0qsBDG4DLvVUuqDmETlFTxUEdmBIOTyzg8RB810WAbP
-7D82sAMHxGL9npeeBuwkSlAXjTUhsjtMnPmgeZ2EgERZmfb2aAHtUlYqD0WbezlS
-2NocIg4WXHO6n+/O6McG7YN/C/QdTAt5scXI7bmde2q+oZnSFfgf0jNoop/3k5f5
-ncs/+04ublwqpYP/MQQ26P+XNFmvatQvbQKIeOSu6WdBwpuFJJqxWZV8PGJ32Gs=
-=FTck
+iQEcBAEBCAAGBQJSP0xqAAoJEJWyH81tNOV9rRoH/i5u1peHevWHqFIHDYjuGp/e
+w65WR5mTuAuBPPoYsa6jzAqR5rMNBrqpBtEXsL/p1UdQpFvIE+oDJFfAIA1UWNPq
+TYxbEwrzPadnUIH7W4f9lC+CNsRFiWQ/f2NohzuR0qS4ACframfiYRWPhzvkIftw
+gl9l2oraajYKEfLGECPA4W0s+uAV4cDbX2e04JXzuhS1WHQ6muk0xNYzmJOeFCym
+G+Q0V/ey2bcXee+wNPnuwMywxSg79nLPiazSBJqqEofis148wkuc5bK5UeXAygPu
+LZXfCcz+mih6cLtKiZxtLeiNkqAK7BERuOeDMymoYk78tyKNBDpf9IW0AEiNJlk=
+=gdTK
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0.1.7.ebuild b/media-video/mpv/mpv-0.1.7.ebuild
new file mode 100644
index 000000000000..fbc9d9feefbf
--- /dev/null
+++ b/media-video/mpv/mpv-0.1.7.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.7.ebuild,v 1.1 2013/09/22 20:05:49 tomwij 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
+}