yngwin 15/03/19 11:14:36 Modified: mpv-0.8.3.ebuild mpv-9999.ebuild ChangeLog Log: Add message about upstream recommendation for ffmpeg. Add more license information (bug #506946). Remove useless - for doc-pdf useflag again. Reformat lines for live ebuild. Move some stuff from src_unpack to src_prepare. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)
Revision Changes Path 1.2 media-video/mpv/mpv-0.8.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-0.8.3.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-0.8.3.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-0.8.3.ebuild?r1=1.1&r2=1.2 Index: mpv-0.8.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.8.3.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mpv-0.8.3.ebuild 19 Mar 2015 02:56:40 -0000 1.1 +++ mpv-0.8.3.ebuild 19 Mar 2015 11:14:36 -0000 1.2 @@ -1,30 +1,33 @@ # 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.8.3.ebuild,v 1.1 2015/03/19 02:56:40 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.8.3.ebuild,v 1.2 2015/03/19 11:14:36 yngwin 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}"; -[[ ${PV} == *9999* ]] || \ -SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" +DOCS=( README.md etc/example.conf etc/input.conf ) -LICENSE="GPL-2" +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 + +# 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 +IUSE="+alsa bluray bs2b cdio +cli doc-pdf dvb +dvd dvdnav egl +enca encode +iconv jack -joystick jpeg ladspa lcms +libass libav libcaca libguess libmpv lirc lua luajit +mpg123 -openal +opengl oss pulseaudio pvr samba -sdl selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv" @@ -121,35 +124,29 @@ 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 - ewarn + if ! use libass; then ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed." 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"; + 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" + einfo " media-video/ffmpeg or media-video/libav" python-any-r1_pkg_setup } -src_unpack() { - if [[ ${PV} == *9999* ]]; then - git-r3_src_unpack - else - default_src_unpack - fi - +src_prepare() { cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die chmod 0755 "${S}"/waf || die -} - -src_prepare() { epatch_user } 1.68 media-video/mpv/mpv-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?rev=1.68&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?rev=1.68&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?r1=1.67&r2=1.68 Index: mpv-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- mpv-9999.ebuild 19 Mar 2015 02:56:40 -0000 1.67 +++ mpv-9999.ebuild 19 Mar 2015 11:14:36 -0000 1.68 @@ -1,30 +1,33 @@ # 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.67 2015/03/19 02:56:40 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.68 2015/03/19 11:14:36 yngwin 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}"; -[[ ${PV} == *9999* ]] || \ -SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" +DOCS=( README.md etc/example.conf etc/input.conf ) -LICENSE="GPL-2" +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 + +# 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 +IUSE="+alsa bluray bs2b cdio +cli doc-pdf dvb +dvd dvdnav egl +enca encode +iconv jack -joystick jpeg ladspa lcms +libass libav libcaca libguess libmpv lirc lua luajit +mpg123 -openal +opengl oss pulseaudio pvr rubberband samba -sdl selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv" @@ -122,35 +125,29 @@ 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 - ewarn + if ! use libass; then ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed." 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"; + 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" + einfo " media-video/ffmpeg or media-video/libav" python-any-r1_pkg_setup } -src_unpack() { - if [[ ${PV} == *9999* ]]; then - git-r3_src_unpack - else - default_src_unpack - fi - +src_prepare() { cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die chmod 0755 "${S}"/waf || die -} - -src_prepare() { epatch_user } 1.123 media-video/mpv/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?rev=1.123&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?rev=1.123&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?r1=1.122&r2=1.123 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- ChangeLog 19 Mar 2015 02:56:40 -0000 1.122 +++ ChangeLog 19 Mar 2015 11:14:36 -0000 1.123 @@ -1,6 +1,13 @@ # 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.122 2015/03/19 02:56:40 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.123 2015/03/19 11:14:36 yngwin Exp $ + + 19 Mar 2015; Ben de Groot <[email protected]> mpv-0.8.3.ebuild, + mpv-9999.ebuild: + Add message about upstream recommendation for ffmpeg. Add more license + information (bug #506946). Remove useless - for doc-pdf useflag again. + Reformat lines for live ebuild. Move some stuff from src_unpack to + src_prepare. *mpv-0.8.3 (19 Mar 2015)
