maksbotan 15/03/31 20:23:31 Modified: metadata.xml mpv-9999.ebuild ChangeLog Log: Ebuild update by Nikoli: cosmetic fixes, added useflag for raspberry pi. Added myself to metadata to make it clear that package is maintained in close collaboration. (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
Revision Changes Path 1.24 media-video/mpv/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/metadata.xml?rev=1.24&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/metadata.xml?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/metadata.xml?r1=1.23&r2=1.24 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/metadata.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- metadata.xml 19 Mar 2015 11:24:39 -0000 1.23 +++ metadata.xml 31 Mar 2015 20:23:31 -0000 1.24 @@ -2,6 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <maintainer> + <email>[email protected]</email> +</maintainer> +<maintainer> <email>[email protected]</email> </maintainer> <maintainer> @@ -26,6 +29,7 @@ <flag name="mpg123">Enable support for mp3 decoding via <pkg>media-sound/mpg123</pkg> instead of relying on ffmpeg support</flag> <flag name="postproc">Enable image post-processing via libpostproc</flag> <flag name="pvr">Enable Video4Linux2 MPEG PVR</flag> + <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag> <flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag> <flag name="quvi">Enable support for streaming sites using <pkg>media-libs/libquvi</pkg></flag> <flag name="radio">Enable V4L2 radio interface and support</flag> 1.70 media-video/mpv/mpv-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?rev=1.70&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?rev=1.70&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?r1=1.69&r2=1.70 Index: mpv-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- mpv-9999.ebuild 28 Mar 2015 01:53:34 -0000 1.69 +++ mpv-9999.ebuild 31 Mar 2015 20:23:31 -0000 1.70 @@ -1,36 +1,34 @@ # 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-9999.ebuild,v 1.69 2015/03/28 01:53:34 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.70 2015/03/31 20:23:31 maksbotan Exp $ EAPI=5 + +EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"; + 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 +[[ ${PV} == *9999* ]] && inherit git-r3 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 - KEYWORDS="" -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 +[[ ${PV} == *9999* ]] || \ +SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" # See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC. LICENSE="GPL-2+ BSD ISC" SLOT="0" +[[ ${PV} == *9999* ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" IUSE="+alsa bluray bs2b cdio +cli doc-pdf dvb +dvd dvdnav egl +enca encode +iconv jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit -openal +opengl oss pulseaudio pvr rubberband samba sdl selinux v4l vaapi vdpau -vf-dlopen wayland +X xinerama +xscreensaver xv" +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 ) @@ -123,29 +121,51 @@ RDEPEND+=" selinux? ( sec-policy/selinux-mplayer ) " +DOCS=( Copyright README.md etc/example.conf etc/input.conf ) +[[ ${PV} == *9999* ]] || \ +DOCS+=( RELEASE_NOTES ) pkg_setup() { - if ! use libass; then + if use !libass; then + ewarn ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed." + ewarn + fi + + if use openal; then + ewarn + ewarn "You've enabled the openal audio output which is fallback and is disabled by upstream." + ewarn 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. For more information see:" - einfo " https://github.com/mpv-player/mpv/wiki/FFmpeg-versus-Libav"; + if use sdl; then + ewarn + ewarn "You've enabled the sdl video and audio outputs which are fallbacks and are disabled by upstream." + ewarn 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" + einfo " media-video/libav or media-video/ffmpeg" + einfo + einfo "Selected provider will affect mpv features and behaviour:" + einfo " https://github.com/mpv-player/mpv/wiki/FFmpeg-versus-Libav"; python-any-r1_pkg_setup } -src_prepare() { +src_unpack() { + if [[ ${PV} == *9999* ]]; then + git-r3_src_unpack + else + default_src_unpack + fi + cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die chmod 0755 "${S}"/waf || die +} + +src_prepare() { epatch_user } @@ -216,6 +236,8 @@ $(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx') $(use_enable libcaca caca) $(use_enable jpeg) + $(use_enable raspberry-pi rpi) + $(use_enable raspberry-pi rpi-gles) # hwaccels $(use_enable vaapi vaapi-hwaccel) 1.126 media-video/mpv/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?rev=1.126&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?rev=1.126&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?r1=1.125&r2=1.126 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- ChangeLog 28 Mar 2015 01:53:34 -0000 1.125 +++ ChangeLog 31 Mar 2015 20:23:31 -0000 1.126 @@ -1,6 +1,12 @@ # 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.125 2015/03/28 01:53:34 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.126 2015/03/31 20:23:31 maksbotan Exp $ + + 31 Mar 2015; Maxim Koltsov <[email protected]> metadata.xml, + mpv-9999.ebuild: + Ebuild update by Nikoli: cosmetic fixes, added useflag for raspberry pi. Added + myself to metadata to make it clear that package is maintained in close + collaboration. 28 Mar 2015; Ben de Groot <[email protected]> -mpv-0.8.0.ebuild, -mpv-0.8.2.ebuild, mpv-0.7.3.ebuild, mpv-0.8.3.ebuild, mpv-9999.ebuild:
