zlogene 14/11/29 11:51:06 Modified: metadata.xml mpv-9999.ebuild ChangeLog Added: mpv-0.7.0.ebuild Log: Version bump wrt bug #530796; Thanks to Nikoli (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6)
Revision Changes Path 1.19 media-video/mpv/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/metadata.xml?rev=1.19&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/metadata.xml?rev=1.19&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/metadata.xml?r1=1.18&r2=1.19 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/metadata.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- metadata.xml 10 Jul 2014 08:57:47 -0000 1.18 +++ metadata.xml 29 Nov 2014 11:51:06 -0000 1.19 @@ -8,35 +8,26 @@ <herd>proxy-maintainers</herd> <use> <flag name="bluray">Enable playback of Blu-ray filesystems</flag> - <flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone - filter</flag> - <flag name="cdio">Use libcdio for CD support - (instead of cdparanoia)</flag> - <flag name='doc-pdf'>Build documentation in pdf format</flag> - <flag name='dvdnav'>Enable support for DVD navigation using - <pkg>media-libs/libdvdnav</pkg></flag> - <flag name="enca">Enables support for charset discovery and conversion - using <pkg>app-i18n/enca</pkg></flag> - <flag name="libguess">Enables support for charset discovery and - conversion using <pkg>app-i18n/libguess</pkg></flag> + <flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag> + <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="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> + <flag name="jpeg">Enable support for saving screenshots to JPEG format</flag> + <flag name="libguess">Enable support for charset discovery and conversion using <pkg>app-i18n/libguess</pkg></flag> <flag name="libmpv">Build mpv shared library</flag> - <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of - <pkg>dev-lang/lua</pkg></flag> - <flag name="mpg123">Enable support for mp3 decoding over - <pkg>media-sound/mpg123</pkg> instead of relying on ffmpeg - support.</flag> - <flag name="postproc">Enable image post-processing via - libpostproc</flag> + <flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag> + <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag> + <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="quvi">Enable support for streaming sites using - <pkg>media-libs/libquvi</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> - <flag name="sdl">Enable video and audio support via - <pkg>media-libs/libsdl2</pkg></flag> + <flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs</flag> <flag name="shm">Enable support for shm</flag> - <flag name="vaapi">Enable VAAPI (Video Acceleration API) for - hardware decoding</flag> - <flag name="vf-dlopen">Install additional video filters for using - with -vf dlopen</flag> + <flag name="vaapi">Enable VAAPI (Video Acceleration API) for hardware decoding</flag> + <flag name="vf-dlopen">Install additional video filters for using with -vf dlopen</flag> </use> </pkgmetadata> 1.60 media-video/mpv/mpv-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?rev=1.60&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?rev=1.60&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?r1=1.59&r2=1.60 Index: mpv-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- mpv-9999.ebuild 2 Nov 2014 12:07:03 -0000 1.59 +++ mpv-9999.ebuild 29 Nov 2014 11:51:06 -0000 1.60 @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.59 2014/11/02 12:07:03 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.60 2014/11/29 11:51:06 zlogene Exp $ EAPI=5 @@ -21,13 +21,15 @@ SLOT="0" [[ ${PV} == *9999* ]] || \ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" -IUSE="+alsa bluray bs2b cdio -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick -jpeg ladspa lcms +libass libcaca libguess libmpv lirc lua luajit +mpg123 -openal +opengl -oss portaudio postproc pulseaudio pvr samba sdl selinux +shm v4l vaapi vdpau vf-dlopen -wayland +X xinerama +xscreensaver +xv" +IUSE="+alsa bluray bs2b cdio +cli -doc-pdf dvb +dvd dvdnav egl +enca encode ++iconv jack -joystick jpeg ladspa lcms +libass libcaca libguess libmpv lirc lua +luajit +mpg123 -openal +opengl oss -portaudio postproc pulseaudio pvr samba -sdl +selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv" REQUIRED_USE=" + || ( cli libmpv ) dvdnav? ( dvd ) + egl? ( opengl X ) enca? ( iconv ) lcms? ( opengl ) libguess? ( iconv ) @@ -42,7 +44,7 @@ xv? ( X ) " -RDEPEND+=" +RDEPEND=" || ( >=media-video/libav-10:=[encode?,threads,vaapi?,vdpau?] >=media-video/ffmpeg-2.1.4:0=[encode?,threads,vaapi?,vdpau?] @@ -52,9 +54,12 @@ x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 - opengl? ( virtual/opengl ) + opengl? ( + virtual/opengl + egl? ( media-libs/mesa[egl] ) + ) lcms? ( >=media-libs/lcms-2.6:2 ) - vaapi? ( >=x11-libs/libva-0.34.0[X(+)] ) + vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) @@ -150,76 +155,94 @@ } src_configure() { - # keep build reproducible - # do not add -g to CFLAGS - # SDL output is fallback for platforms where nothing better is available - # media-sound/rsound is in pro-audio overlay only - # vapoursynth is not packaged - waf-utils_src_configure \ - --disable-build-date \ - --disable-optimize \ - --disable-debug-build \ - --disable-sdl1 \ - $(use_enable sdl sdl2) \ - --disable-rsound \ - --disable-vapoursynth \ - $(use_enable encode encoding) \ - $(use_enable joystick) \ - $(use_enable bluray libbluray) \ - $(use_enable samba libsmbclient) \ - $(use_enable lirc) \ - $(use_enable lua) \ - $(usex luajit '--lua=luajit' '') \ - $(use_enable doc-pdf pdf-build) \ - $(use_enable vf-dlopen vf-dlopen-filters) \ - $(use_enable cdio cdda) \ - $(use_enable dvd dvdread) \ - $(use_enable dvdnav) \ - $(use_enable enca) \ - $(use_enable iconv) \ - $(use_enable libass) \ - $(use_enable libguess) \ - $(use_enable libmpv libmpv-shared) \ - $(use_enable dvb) \ - $(use_enable pvr) \ - $(use_enable v4l libv4l2) \ - $(use_enable v4l tv) \ - $(use_enable v4l tv-v4l2) \ - $(use_enable mpg123) \ - $(use_enable jpeg) \ - $(use_enable libcaca caca) \ - $(use_enable postproc libpostproc) \ - $(use_enable alsa) \ - $(use_enable jack) \ - $(use_enable ladspa) \ - $(use_enable portaudio) \ - $(use_enable bs2b libbs2b) \ - $(use_enable openal) \ - $(use_enable oss oss-audio) \ - $(use_enable pulseaudio pulse) \ - $(use_enable shm) \ - $(use_enable X x11) \ - $(use_enable X xext) \ - $(use_enable X xrandr) \ - $(use_enable vaapi) \ - $(use_enable vdpau) \ - $(use_enable wayland) \ - $(use_enable xinerama) \ - $(use_enable xv) \ - $(use_enable opengl gl) \ - $(use_enable lcms lcms2) \ - $(use_enable xscreensaver xss) \ - --confdir="${EPREFIX}"/etc/${PN} \ - --mandir="${EPREFIX}"/usr/share/man \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --enable-zsh-comp \ - --zshdir="${EPREFIX}"/usr/share/zsh/site-functions + local mywafargs=( + --confdir="${EPREFIX}"/etc/${PN} + --docdir="${EPREFIX}"/usr/share/doc/${PF} + $(usex cli '' '--disable-cplayer') + $(use_enable libmpv libmpv-shared) + --disable-libmpv-static + --disable-build-date # keep build reproducible + --disable-optimize # do not add '-O2' to CFLAGS + --disable-debug-build # do not add '-g' to CFLAGS + $(use_enable doc-pdf pdf-build) + $(use_enable vf-dlopen vf-dlopen-filters) + $(use_enable cli zsh-comp) + + # optional features + $(use_enable iconv) + $(use_enable libguess) + $(use_enable samba libsmbclient) + $(use_enable lua) + $(use_enable libass) + $(use_enable libass libass-osd) + $(use_enable encode encoding) + $(use_enable joystick) + $(use_enable lirc) + $(use_enable bluray libbluray) + $(use_enable dvd dvdread) + $(use_enable dvdnav) + $(use_enable cdio cdda) + $(use_enable enca) + $(use_enable mpg123) + $(use_enable ladspa) + $(use_enable bs2b libbs2b) + $(use_enable lcms lcms2) + --disable-vapoursynth # vapoursynth is not packaged + --disable-vapoursynth-lazy + --enable-libavfilter + --enable-libavdevice + $(use_enable postproc libpostproc) + $(usex luajit '--lua=luajit' '') + + # audio outputs + $(use_enable sdl sdl2) # SDL output is fallback for platforms where nothing better is available + --disable-sdl1 + $(use_enable oss oss-audio) + --disable-rsound # media-sound/rsound is in pro-audio overlay only + $(use_enable pulseaudio pulse) + $(use_enable portaudio) + $(use_enable jack) + $(use_enable openal) + $(use_enable alsa) + + # video outputs + $(use_enable wayland) + $(use_enable X x11) + $(use_enable xscreensaver xss) + $(use_enable X xext) + $(use_enable xv) + $(use_enable xinerama) + $(use_enable X xrandr) + $(usex X "$(use_enable opengl gl-x11)" '--disable-gl-x11') + $(use_enable egl egl-x11) + $(usex wayland "$(use_enable opengl gl-wayland)" '--disable-gl-wayland') + $(use_enable opengl gl) + $(use_enable vdpau) + $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') + $(use_enable vaapi) + $(use_enable vaapi vaapi-vpp) + $(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx') + $(use_enable libcaca caca) + $(use_enable jpeg) + + # hwaccels + $(use_enable vaapi vaapi-hwaccel) + $(use_enable vdpau vdpau-hwaccel) + + # tv features + $(use_enable v4l tv) + $(use_enable v4l tv-v4l2) + $(use_enable v4l libv4l2) + $(use_enable pvr) + $(use_enable dvb dvbin) + ) + waf-utils_src_configure "${mywafargs[@]}" } src_install() { waf-utils_src_install - if use luajit; then + if use cli && use luajit; then pax-mark -m "${ED}"usr/bin/mpv fi } 1.106 media-video/mpv/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?rev=1.106&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?rev=1.106&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?r1=1.105&r2=1.106 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- ChangeLog 29 Nov 2014 11:39:05 -0000 1.105 +++ ChangeLog 29 Nov 2014 11:51:06 -0000 1.106 @@ -1,6 +1,12 @@ # ChangeLog for media-video/mpv # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.105 2014/11/29 11:39:05 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.106 2014/11/29 11:51:06 zlogene Exp $ + +*mpv-0.7.0 (29 Nov 2014) + + 29 Nov 2014; Mikle Kolyada <[email protected]> +mpv-0.7.0.ebuild, + metadata.xml, mpv-9999.ebuild: + Version bump wrt bug #530796; Thanks to Nikoli 29 Nov 2014; Mikle Kolyada <[email protected]> -mpv-0.4.2.ebuild, -mpv-0.5.4.ebuild: 1.1 media-video/mpv/mpv-0.7.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-0.7.0.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-0.7.0.ebuild?rev=1.1&content-type=text/plain Index: mpv-0.7.0.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.7.0.ebuild,v 1.1 2014/11/29 11:51:06 zlogene Exp $ EAPI=5 EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"; inherit eutils waf-utils pax-utils fdo-mime gnome2-utils [[ ${PV} == *9999* ]] && inherit git-r3 WAF_V="1.8.1" DESCRIPTION="Video player based on MPlayer/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" LICENSE="GPL-2" SLOT="0" [[ ${PV} == *9999* ]] || \ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" IUSE="+alsa bluray bs2b cdio +cli -doc-pdf dvb +dvd dvdnav egl +enca encode +iconv jack -joystick jpeg ladspa lcms +libass libcaca libguess libmpv lirc lua luajit +mpg123 -openal +opengl oss -portaudio postproc pulseaudio pvr samba -sdl selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv" REQUIRED_USE=" || ( cli libmpv ) dvdnav? ( dvd ) egl? ( opengl X ) enca? ( iconv ) lcms? ( opengl ) libguess? ( iconv ) luajit? ( lua ) opengl? ( || ( wayland X ) ) pvr? ( v4l ) vaapi? ( X ) vdpau? ( X ) wayland? ( opengl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) " RDEPEND=" || ( >=media-video/libav-10:=[encode?,threads,vaapi?,vdpau?] >=media-video/ffmpeg-2.1.4:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( virtual/opengl egl? ( media-libs/mesa[egl] ) ) lcms? ( >=media-libs/lcms-2.6:2 ) vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.3.0 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.2.0 ) ) enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:=[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) libguess? ( >=app-i18n/libguess-1.0 ) lirc? ( app-misc/lirc ) lua? ( !luajit? ( >=dev-lang/lua-5.1 ) luajit? ( dev-lang/luajit:2 ) ) mpg123? ( >=media-sound/mpg123-1.14.0 ) openal? ( >=media-libs/openal-1.13 ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( || ( >=media-libs/libpostproc-10.20140517 >=media-video/ffmpeg-2.1.4:0 ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[threads] ) v4l? ( media-libs/libv4l ) wayland? ( >=dev-libs/wayland-1.6.0 media-libs/mesa[egl,wayland] >=x11-libs/libxkbcommon-0.3.0 ) " DEPEND="${RDEPEND} virtual/pkgconfig >=dev-lang/perl-5.8 dev-python/docutils doc-pdf? ( dev-python/rst2pdf ) X? ( x11-proto/videoproto xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) ) " RDEPEND+=" selinux? ( sec-policy/selinux-mplayer ) " DOCS=( Copyright README.md etc/example.conf etc/input.conf ) pkg_setup() { if use !libass; then ewarn ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed." 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_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 } src_configure() { local mywafargs=( --confdir="${EPREFIX}"/etc/${PN} --docdir="${EPREFIX}"/usr/share/doc/${PF} $(usex cli '' '--disable-cplayer') $(use_enable libmpv libmpv-shared) --disable-libmpv-static --disable-build-date # keep build reproducible --disable-optimize # do not add '-O2' to CFLAGS --disable-debug-build # do not add '-g' to CFLAGS $(use_enable doc-pdf pdf-build) $(use_enable vf-dlopen vf-dlopen-filters) $(use_enable cli zsh-comp) # optional features $(use_enable iconv) $(use_enable libguess) $(use_enable samba libsmbclient) $(use_enable lua) $(use_enable libass) $(use_enable libass libass-osd) $(use_enable encode encoding) $(use_enable joystick) $(use_enable lirc) $(use_enable bluray libbluray) $(use_enable dvd dvdread) $(use_enable dvdnav) $(use_enable cdio cdda) $(use_enable enca) $(use_enable mpg123) $(use_enable ladspa) $(use_enable bs2b libbs2b) $(use_enable lcms lcms2) --disable-vapoursynth # vapoursynth is not packaged --disable-vapoursynth-lazy --enable-libavfilter --enable-libavdevice $(use_enable postproc libpostproc) $(usex luajit '--lua=luajit' '') # audio outputs $(use_enable sdl sdl2) # SDL output is fallback for platforms where nothing better is available --disable-sdl1 $(use_enable oss oss-audio) --disable-rsound # media-sound/rsound is in pro-audio overlay only $(use_enable pulseaudio pulse) $(use_enable portaudio) $(use_enable jack) $(use_enable openal) $(use_enable alsa) # video outputs $(use_enable wayland) $(use_enable X x11) $(use_enable xscreensaver xss) $(use_enable X xext) $(use_enable xv) $(use_enable xinerama) $(use_enable X xrandr) $(usex X "$(use_enable opengl gl-x11)" '--disable-gl-x11') $(use_enable egl egl-x11) $(usex wayland "$(use_enable opengl gl-wayland)" '--disable-gl-wayland') $(use_enable opengl gl) $(use_enable vdpau) $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') $(use_enable vaapi) $(use_enable vaapi vaapi-vpp) $(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx') $(use_enable libcaca caca) $(use_enable jpeg) # hwaccels $(use_enable vaapi vaapi-hwaccel) $(use_enable vdpau vdpau-hwaccel) # tv features $(use_enable v4l tv) $(use_enable v4l tv-v4l2) $(use_enable v4l libv4l2) $(use_enable pvr) $(use_enable dvb) $(use_enable dvb dvbin) ) waf-utils_src_configure "${mywafargs[@]}" } src_install() { waf-utils_src_install if use cli && use luajit; then pax-mark -m "${ED}"usr/bin/mpv fi } pkg_preinst() { gnome2_icon_savelist } pkg_postinst() { fdo-mime_desktop_database_update gnome2_icon_cache_update } pkg_postrm() { fdo-mime_desktop_database_update gnome2_icon_cache_update }
