maksbotan 15/05/03 21:38:11
Modified: mpv-0.9.1.ebuild metadata.xml mpv-9999.ebuild
ChangeLog
Log:
Update 9999 and 0.9.1 ebuild, add drm USE flag. Thanks to Nikoli.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
F8DBDADE)
Revision Changes Path
1.3 media-video/mpv/mpv-0.9.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-0.9.1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-0.9.1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-0.9.1.ebuild?r1=1.2&r2=1.3
Index: mpv-0.9.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.9.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpv-0.9.1.ebuild 3 May 2015 08:29:53 -0000 1.2
+++ mpv-0.9.1.ebuild 3 May 2015 21:38:11 -0000 1.3
@@ -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-0.9.1.ebuild,v 1.2
2015/05/03 08:29:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.9.1.ebuild,v 1.3
2015/05/03 21:38:11 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="~hppa"
-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"
-IUSE="+alsa bluray bs2b cdio +cli doc-pdf dvb +dvd dvdnav egl +enca encode
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="+alsa bluray bs2b cdio +cli doc-pdf drm dvb +dvd dvdnav egl +enca encode
+iconv jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit
-openal +opengl oss pulseaudio pvr raspberry-pi 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 )
@@ -63,7 +61,7 @@
egl? ( media-libs/mesa[egl] )
)
lcms? ( >=media-libs/lcms-2.6:2 )
- vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] )
+ vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
vdpau? ( >=x11-libs/libvdpau-0.2 )
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
@@ -76,6 +74,7 @@
dev-libs/libcdio
dev-libs/libcdio-paranoia
)
+ drm? ( x11-libs/libdrm )
dvb? ( virtual/linuxtv-dvb-headers )
dvd? (
>=media-libs/libdvdread-4.1.3
@@ -93,7 +92,7 @@
libcaca? ( >=media-libs/libcaca-0.99_beta18 )
libguess? ( >=app-i18n/libguess-1.0 )
lua? (
- !luajit? ( =dev-lang/lua-5.1*:= )
+ !luajit? ( >=dev-lang/lua-5.1:= )
luajit? ( dev-lang/luajit:2 )
)
openal? ( >=media-libs/openal-1.13 )
@@ -123,38 +122,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."
- 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."
+ ewarn
fi
if use openal; then
- ewarn "You have enabled the openal audio output which is a
fallback"
- ewarn "and disabled by upstream."
+ ewarn
+ ewarn "You've enabled the openal audio output which is fallback
and is disabled by upstream."
+ ewarn
fi
if use sdl; then
- ewarn "You have enabled the sdl video and audio outputs which
are fallbacks"
- ewarn "and are disabled by upstream."
+ 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
+ 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
}
@@ -224,6 +236,7 @@
$(use_enable vaapi vaapi-vpp)
$(usex vaapi "$(use_enable opengl vaapi-glx)"
'--disable-vaapi-glx')
$(use_enable libcaca caca)
+ $(use_enable drm)
$(use_enable jpeg)
$(use_enable raspberry-pi rpi)
$(use_enable raspberry-pi rpi-gles)
1.25 media-video/mpv/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/metadata.xml?rev=1.25&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/metadata.xml?rev=1.25&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/metadata.xml?r1=1.24&r2=1.25
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/metadata.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- metadata.xml 31 Mar 2015 20:23:31 -0000 1.24
+++ metadata.xml 3 May 2015 21:38:11 -0000 1.25
@@ -18,6 +18,7 @@
<flag name="cli">Build mpv CLI player</flag>
<flag name="cdio">Enable CDDA support via
<pkg>dev-libs/libcdio-paranoia</pkg></flag>
<flag name="doc-pdf">Build documentation in pdf format</flag>
+ <flag name="drm">Enable Kernel Mode Setting / Direct Rendering Manager
based video output</flag>
<flag name="dvdnav">Enable support for DVD navigation using
<pkg>media-libs/libdvdnav</pkg></flag>
<flag name="egl">Enable EGL backend for X11 OpenGL video output
(experimental)</flag>
<flag name="enca">Enable support for charset discovery and conversion
using <pkg>app-i18n/enca</pkg></flag>
1.71 media-video/mpv/mpv-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?rev=1.71&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?rev=1.71&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?r1=1.70&r2=1.71
Index: mpv-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- mpv-9999.ebuild 31 Mar 2015 20:23:31 -0000 1.70
+++ mpv-9999.ebuild 3 May 2015 21:38:11 -0000 1.71
@@ -1,6 +1,6 @@
# 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.70
2015/03/31 20:23:31 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.71
2015/05/03 21:38:11 maksbotan Exp $
EAPI=5
@@ -25,7 +25,7 @@
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 drm dvb +dvd dvdnav egl +enca encode
+iconv jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit
openal +opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l
vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
@@ -61,7 +61,7 @@
egl? ( media-libs/mesa[egl] )
)
lcms? ( >=media-libs/lcms-2.6:2 )
- vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] )
+ vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
vdpau? ( >=x11-libs/libvdpau-0.2 )
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
@@ -74,6 +74,7 @@
dev-libs/libcdio
dev-libs/libcdio-paranoia
)
+ drm? ( x11-libs/libdrm )
dvb? ( virtual/linuxtv-dvb-headers )
dvd? (
>=media-libs/libdvdread-4.1.3
@@ -146,7 +147,7 @@
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"
einfo
einfo "Selected provider will affect mpv features and behaviour:"
einfo " https://github.com/mpv-player/mpv/wiki/FFmpeg-versus-Libav";
@@ -235,6 +236,7 @@
$(use_enable vaapi vaapi-vpp)
$(usex vaapi "$(use_enable opengl vaapi-glx)"
'--disable-vaapi-glx')
$(use_enable libcaca caca)
+ $(use_enable drm)
$(use_enable jpeg)
$(use_enable raspberry-pi rpi)
$(use_enable raspberry-pi rpi-gles)
1.130 media-video/mpv/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?rev=1.130&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?rev=1.130&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?r1=1.129&r2=1.130
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- ChangeLog 3 May 2015 08:29:53 -0000 1.129
+++ ChangeLog 3 May 2015 21:38:11 -0000 1.130
@@ -1,6 +1,10 @@
# 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.129
2015/05/03 08:29:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.130
2015/05/03 21:38:11 maksbotan Exp $
+
+ 03 May 2015; Maxim Koltsov <maksbo...@gentoo.org> metadata.xml,
+ mpv-0.9.1.ebuild, mpv-9999.ebuild:
+ Update 9999 and 0.9.1 ebuild, add drm USE flag. Thanks to Nikoli.
03 May 2015; Jeroen Roovers <j...@gentoo.org> mpv-0.9.1.ebuild:
Mark ~hppa (bug #548446).
