Update 9999 and 0.9.1 ebuild, add drm USE flag. Thanks to Nikoli.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 157ff2637acf8ede38b03e6a68360e431357a9f3..5f4769aeed0f77737ff85b97997095bcf487876b 100644 (file)
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -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 <maksbotan@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 <jer@gentoo.org> mpv-0.9.1.ebuild:
   Mark ~hppa (bug #548446).

diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index a4a877104b6c858d78743c1681ed77ed68553ea6..fcd670e8f2fd97a28b91c1ca501cd0faf0e29725 100644 (file)
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -9,14 +9,18 @@ DIST waf-1.7.15 90909 SHA256 e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e
 DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e
 EBUILD mpv-0.3.10.ebuild 6420 SHA256 08c56a8e201a818067b041f6d8a7d1a4c2658c0887f595fc3e3d2944241359fa SHA512 d6b92efcfb388a3d92109247b2fc50effbe94f78c0e420004d646f3101689f85138eef568a1d53ee4c6098161fd1effba97173cfff1bfa59a278b4d343312357 WHIRLPOOL 576f26fbac334b0447c84af43e4e54cdd1e8360ffad8aedffa0ab2c534a44382b5d5f127680ee41c3671d53333aa2c15f79f237922db3a9b418b544ca5cb4e54
 EBUILD mpv-0.8.3.ebuild 6969 SHA256 6c0e6d47ee7652404515fc3883347e6400b2664dbe37c32dad5b1dc42f48ed82 SHA512 baf645f2a94fa8da0465d1e2677baad4f35ba3ed6ea036ecb16a60ec94651f1db795809e0c86357f99595a69b06acee9bed63fb5c0fbdc7902c33c953969d476 WHIRLPOOL 3f453f220b9ab5ec77f4f72310bf01e2b9a23d7bb4acf047d8e4e2840523b04f1faaeed4081e97387c5acf0c89acd8465c2c943d289385b4dbb1166d032642b2
-EBUILD mpv-0.9.1.ebuild 7161 SHA256 36873709a727fd403c41e172480c65a1204ce1f5d6be700d8532f3a123d2c3f0 SHA512 277af598edec94f7e60cc58750695438ef611be4e3bdabd175c04eb3684d694c12cecbfea02c9980858b0c39203862f5ea54f09f0b43a3598bf2338afcfc4f97 WHIRLPOOL 01a936f8c680936a7b3153db18eedf94eefb9b515283bde046327e6da80f597b6709ac5268cf95df63638504921e1dbe85e7cfd8a9353e987803f50279a5ef2c
-EBUILD mpv-9999.ebuild 7274 SHA256 a7cc1a13c893f23f2d95b34063c9e89d04c69077dd065ebe0473fd12d19b75b2 SHA512 22d5590dfc50391217871882b9847685c00cae06210cedc000c960155d082f4ab1126e1b112dd8f7cb25d731986dc7065ba991a18f7b582c039eb76f392bd88f WHIRLPOOL e61858cb23433dcbe54da03cfd33a0395f196f15ed7acaf376fd6c9cce7e65b2ca6b390b336aa82fc86d15ceb8cae9feba83aeadf30649b97b68ac7c660f07c7
-MISC ChangeLog 20665 SHA256 a0679799679203be5755d852b1dfea73030ec38e12c4ff6e5e8ca4df25e90539 SHA512 f571e3ac70bbfb05d16d9a8bea80b026c1f3a3dcfb2f19a907929fdbfd7d89970f3c0544401010be3cd984b81699b93321aaf6019f0d96a7303e2617f67b9520 WHIRLPOOL 6a470881b04934acc0afc2049ac375fa79c7905cef4f6c442c05f5b0276ec15c4076c8f40b97470e8f3bd6cdd7b737dc5c2928b46fcc6f388faf521251cfa020
-MISC metadata.xml 2322 SHA256 5ebf44b42ec1ae05c0cb88684b1489bf7d8f471fc74bd5499518ad1383f7d603 SHA512 f36362cc378db09e387e0f2e97662993e1ef94a9ffce80aab94113040b6fb5ea245d7111cd0ac2fd2eb993e84de98a0374994226ea09d8beb897b094fb1f2959 WHIRLPOOL cf6f9257748d46cd494b99837e18cda80810e7e2a76f45d43431f0e2ef3d5551d4473d5bc133e46916de7205265892447646370d264e84c9b17efad9e02cdf9c
+EBUILD mpv-0.9.1.ebuild 7316 SHA256 a678f480e95a1a7cc6d4308364ee63b620b8c9a16c5271e186c3e05af3b6b711 SHA512 cff01b6fc713e21e30d99f07a420d3fdc35e859c47d7c738e972d1b5a28145458137b2c2b00ca5c521dcf870fbdac02b146a3a3f343866b315adc68cef323804 WHIRLPOOL f2ac7c210039bb70829bfbcc844040b342e7552d741f0c49e89ed65e8066b7bf37e874a624b40549bdda4e8b96c1561ef4028393afa049b7fbefdad9efc28c1c
+EBUILD mpv-9999.ebuild 7316 SHA256 403a88dc5893c1be9f503a07486a25b5670d7e53170b8765340ee316977282a3 SHA512 22bfe45646c4172056258c910fb224a4e18fe8e17151076eea741696dcfe58f3fca38354bc3cccac43170c2fcbadd3959143e8a2009f95351ccbc8aa8ac2e099 WHIRLPOOL 7edd44df991c92d18d7a3e74dd2d449808e68fe8f2e6e85a7ba3d8d91db0e35b57752d50cd1dbe3150b29be19943ecf5a25a3758e45947e9d5712cf773e16ef6
+MISC ChangeLog 20843 SHA256 45ff9b729cb4758002270a24ffe99047216200afca96b2bcf0dbcbe5ddfe0586 SHA512 41456766e8c541cc28052aa80fa01dbbed4309181a1576a58015202c0f3edd8f8c1c496dbb4348ca285b9ed61a299c099e5aee9725828f55bd4e64d3685f087d WHIRLPOOL 7198fe27526a5ab2a4a4000f7435fd72f06d64e99ae319e98de62c1d03dcaa01d48189601c199791cc5c9777335ff005c941280251c2cbbdf652daea44505144
+MISC metadata.xml 2420 SHA256 2f1aed0d12795edd2b5abc0e22578606cd8ad9013e7f8d7c0ee6708305275582 SHA512 08e0f2a7f68c83baf945d8e5f0b4c558fd71a94182a85436219e3df4c4b39dcd8ab6bb49e631348a842ea53b8b5c19c9900c4e6eaf8267c798486fbe50a28774 WHIRLPOOL 4bad5cde76b9d9e1385a59c04bc15c9b7926523b863c6c24575933629e02b579463335997963e27a772920ed9f710aeeb0d020ef0b879161736b025ec68d6f2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVF3IIACgkQVWmRsqeSphPrvACeN+PVUVBVpTHlmyMf7aFLSLSo
-hRkAnjBx19u3P8JmQv24LOT5QfN3mAoe
-=QIpN
+iQEcBAEBCAAGBQJVRpUjAAoJEAmJmMX429reaYQIAKsU2FGDBftXnl4ZzPGwRS+7
+Dpief4NaZylAr5Iu8+K31vtMrKpv4ZEowT8F3pS/lsqbn9ebeoipJFD7lRCoUis7
+vuijsFi0S5zxby96PwFqE5AwhV9YOu6WMRJEYlXcHJFCoDUBiYWoxvKWxyduKjxi
+5fH3Gc3WG9NJF5G9wuYSADD2CoW/0cs5zkGDBjNPHk/6DHnlNhRpdb95b6R3p5B0
+fUGlTKR02uq6gW1fDgEBtejRhqxG9BajWWGLf6XdlD1VjOevpjz6j7IlnyxYGO8W
+rLIg/7SduAYmwsZMtDzv1pvrzKGD++kUpJpvhVEqSO7uxOOUy84NtguzhAaFbtE=
+=43bk
 -----END PGP SIGNATURE-----

diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 2a332e434dd6e1fd5db4a92fdbfef181abb19a77..43e1aeaaf23f4d2cada98fb06287b25844a4686c 100644 (file)
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -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>

diff --git a/media-video/mpv/mpv-0.9.1.ebuild b/media-video/mpv/mpv-0.9.1.ebuild
index 975803f3b7a0ac6d297a7290ee0b112e39bfa9f1..5a7474e5064505179253a80b4f4f50cabac2c19f 100644 (file)
--- a/media-video/mpv/mpv-0.9.1.ebuild
+++ b/media-video/mpv/mpv-0.9.1.ebuild
@@ -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 @@ RDEPEND="
                        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 @@ RDEPEND="
                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 @@ RDEPEND="
        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 @@ DEPEND="${RDEPEND}
 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 @@ src_configure() {
                $(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)

diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 6b8918d00c65c9a2429043f28efe5c4593b2dc1b..ac5dcf4433ebc918a9f36e3bb3923d68bf000b0e 100644 (file)
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -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 @@ 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 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 @@ RDEPEND="
                        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 @@ RDEPEND="
                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 @@ pkg_setup() {
 
        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 @@ src_configure() {
                $(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)