First snapshot and live ebuild update thanks to Nikoli

Package-Manager: portage-2.1.12.12/cvs/Linux x86_64

4 files changed, 317 insertions, 26 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 699d2dd888a0..e4a16bc43d13 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2013/07/09 16:38:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.15 2013/07/15 08:38:08 lu_zero Exp $
+
+*mpv-0_p20130715 (15 Jul 2013)
+
+  15 Jul 2013; Luca Barbato <lu_zero@gentoo.org> +mpv-0_p20130715.ebuild,
+  mpv-9999.ebuild:
+  First snapshot and live ebuild update thanks to Nikoli
 
   09 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
   Do not enable debug by default. Patch from Nikoli.
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 703cbd7178df..334ed547eeb3 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,23 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-EBUILD mpv-9999.ebuild 7651 SHA256 fc346f3d67bdd6b141f323db751f2b4a1529871dc51ddbe70a213439bd027b31 SHA512 db492431eeab4d128048809d77898173b355d79a733eedca824bcedc6a6fab6b6461563b242c51530665efce72e743e32c2d4294b0f5e8053da8ee2aab0a2edb WHIRLPOOL ef6289ae2267f4630b467a53fe38b8ae601291a3b1762e3635a907664a2d20e77fb3d1c2f7c08479ff1cc986c32c3d23b4f33d96997f11a84cd299f7d0e49f96
-MISC ChangeLog 2372 SHA256 b3b8f7151e549b59c7a6a4e08e384f25f9ce66e65d6eefbc4293642027a7d838 SHA512 604a07a0285b462aed4815991555767638ac3f291c9e261ba5adaf4cbd31a1e2bfc3f00ffab838b5611de8b5257c0f778b1616642a2d598e1f1d688ef3efa19b WHIRLPOOL b88a1fe27bc2568ef1140037a2f00f5de24e76d238bfe36b8e729107a53ed47a3964c7904ff3664d152f51c726542ae67cde884fbf2b0972b80c0137ef924c7b
+DIST mpv-0_p20130715.tar.xz 1221104 SHA256 9aacae31549f052e7a5a4abb0a42e527c6ab0ba54a6c0b49f225d7b64eeb268e SHA512 c158322cc39d02a7f0fbdade6ec13ea180edbd93214122c2ae108844639ef3e47347666f4fbe71e024f98894c1f0f5441e1dac2a4ac37b430b96f8aa6cff0028 WHIRLPOOL f1dc2f564629e28c90996a0385d9d3515c0b1241c437dce736f614deb1421f615ec4e8c3d2c3a99ae9955775c4c0db8f7561971d2a2f13ac1e1bf913fca1f41c
+EBUILD mpv-0_p20130715.ebuild 7760 SHA256 1b94202796b56393b29504dc35a6aff6fdad6ab0c447cc2479dc4f9197528092 SHA512 90dc6ffd90fb4264eb88634c8c52b8e9f63e8729dd1467addf1f759f9d07305bf835e645b50df3bc175c57617aa59d2a327b47040efee3d629db2d1411674452 WHIRLPOOL e5712033c073e85b2cafaa3ccfe955ac62cffe324b5da9dc4892e611db38af10ad7d55819963efc764eed6245f0f6e81a8d050f2e74b5248baba766efef637f0
+EBUILD mpv-9999.ebuild 7765 SHA256 522ad6cd04de4fe6ae4ecb537f70fefe3a567be79ac7b59ed4431cee0400ae32 SHA512 adb3a37f60f5716cef001990f301bda25b2dcbef8c5e261db771c9e8548cac4382f3a23146c6e5b50712ffba0d7a6659e8936c515fdf7bb085a7c33abb28d191 WHIRLPOOL 0be80801334a2b7126a6f23765edae8c4c8698ae07f9e519a1ac4e2df1d016195737a4641eea7bfdcd2ebaa2dcff200b08b90b07216dfb1815cf8bf77baaf0da
+MISC ChangeLog 2553 SHA256 ef3fab1ba8da3c8982836dafa37b712a40669308d08e5cac765209606e936a16 SHA512 01a2bf650037b7af9f1027426a86a2886138983ff1c0bf09853601271993c430c5ea4b3706425ebd6d03334166117d1a9c1b2279f5d05e26d913a68ab2da12a7 WHIRLPOOL 2fa1a55abc8aeb4bcf5827690a82f4431bcf052d5e023c7ffc8a7fd061f3ebdab64a010536bccc12b0abccdee635031d03be710e850782840505017d72cdc769
 MISC metadata.xml 1446 SHA256 22b32d5c86ce09604f020f15829f1c893a00aee53be5c708287537cad04dfbe9 SHA512 6f0abee3fcf19cb4d12aa96eded06fbe87a5c3367be8695fb33305e1d5e8da80d912e55f15236f82f44459a80c8e68ceef04e15d01f8d68ed36be23d02b993d5 WHIRLPOOL efa5d3d7d199a8462f01395e640422c3defeff1672e79065685f85dc3d2678de8f69c55d7ea01ecd78719c39aa0aff13d86bffba79dc5e87c6608a0a451e3c7e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCAAGBQJR3Dx4AAoJEOSiRoyO7jvoFuYQAKH+EHDA50s/Rl33vId/tJnc
-2cNU9lqUmQH7Xq49048PG/jO8x3uwTI4Yl3nidmFIgrTPp/eFomnRvaYNvi3RUjT
-QjWA1GPQwUM4ZmyIzJhLTw/9fErxHiwXJ1vG6Q6ypyI12rQC9WObfpu5qnkJWzqs
-CojO7HDpf3hporY6z8LmVE268sHOAqOdeHVAPxpDBfPalBC0t5aY9Kkz2GtL6UVj
-/750jIH3MClrxEH11/+F4r8aaSSfIo1UsgWtR8jZpj4A07DfgHIxsmTkJHDrNzCT
-gQwJnbskzfkp6mn1yIZh4lcTCkKFc+ckN0tPC45ffafVdAk67b77eQb/YNiKrsuk
-CxTLJ8lO0TBknZkz3X7BMZYXlGFwHR2odYdsAIn8qP0EB0zGCIXI6jwYKpZAPEXw
-nqqyQknB8nrwaTh72FmZjWMv0BQ2ky0po7Or2T3PWOU9qesuctXJU3B0OYqEsaLl
-1oWURfFzZVNqZqjRnW02ro+v1xWwm2PPcgrueYp5h5qfUptmQTf7c1E/LPi0bQzL
-71z8mM3CEeexQG7qkLiTu2lP5rb9Flh+0YTLDUCm4H9txH64VHNpgsi4M/UxET2H
-60evC3adVwQpnrXB+JN6S7V/y/bq1PNR/YagRBlKslNp+aj7mZP2KkJUj3B4Ff0g
-qyI467ThqVefW8h2ux1I
-=S7es
------END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0_p20130715.ebuild b/media-video/mpv/mpv-0_p20130715.ebuild
new file mode 100644
index 000000000000..95e82994ad8d
--- /dev/null
+++ b/media-video/mpv/mpv-0_p20130715.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_p20130715.ebuild,v 1.1 2013/07/15 08:38:08 lu_zero 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="http://dev.gentoo.org/~lu_zero/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~alpha ~amd64 ~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[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
+		)
+	)
+	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
+}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 984c0d67527f..9176edef5526 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.12 2013/07/09 16:38:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.13 2013/07/15 08:38:08 lu_zero Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ inherit toolchain-funcs flag-o-matic multilib base
 DESCRIPTION="Video player based on MPlayer/mplayer2"
 HOMEPAGE="http://mpv.io/"
 [[ ${PV} == *9999* ]] || \
-SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz"
+SRC_URI="http://dev.gentoo.org/~lu_zero/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -136,7 +136,8 @@ pkg_setup() {
 		ewarn "and makes them fail silently."
 	fi
 
-	einfo "For various format support you need to enable the support on your ffmpeg package:"
+	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"
 }
 
@@ -233,6 +234,9 @@ src_configure() {
 	####################
 	# Advanced Options #
 	####################
+	# keep build reproducible
+	myconf+=" --disable-build-date"
+	# do not add -g to CFLAGS
 	myconf+=" --disable-debug"
 	use threads || myconf+=" --disable-pthreads"