diff options
author | 2014-07-09 16:27:38 +0000 | |
---|---|---|
committer | 2014-07-09 16:27:38 +0000 | |
commit | cbadfb2995ad283eaaaf0ded4dcd852d5f0a6e8e (patch) | |
tree | ff3a8a5cc27a075d4f14f18078dc4809d0ee70ad /media-video/mpv | |
parent | Mask mpv-0.4.0 due to libav-10 mask, mask >=mpv-0.4.0[doc-pdf] on alpha,arm,p... (diff) | |
download | gentoo-2-cbadfb2995ad283eaaaf0ded4dcd852d5f0a6e8e.tar.gz gentoo-2-cbadfb2995ad283eaaaf0ded4dcd852d5f0a6e8e.tar.bz2 gentoo-2-cbadfb2995ad283eaaaf0ded4dcd852d5f0a6e8e.zip |
Bump to 0.4.0, bug #516458, add libmpv use flag, bug #516742. Thanks to Nikoli.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
Diffstat (limited to 'media-video/mpv')
-rw-r--r-- | media-video/mpv/ChangeLog | 11 | ||||
-rw-r--r-- | media-video/mpv/files/mpv-0.3.11-libav-9.patch | 12 | ||||
-rw-r--r-- | media-video/mpv/metadata.xml | 1 | ||||
-rw-r--r-- | media-video/mpv/mpv-0.3.11.ebuild | 250 | ||||
-rw-r--r-- | media-video/mpv/mpv-0.4.0.ebuild | 241 | ||||
-rw-r--r-- | media-video/mpv/mpv-9999.ebuild | 7 |
6 files changed, 516 insertions, 6 deletions
diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog index 5e6f15ed3ab1..bce40579b6d5 100644 --- a/media-video/mpv/ChangeLog +++ b/media-video/mpv/ChangeLog @@ -1,6 +1,15 @@ # 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.82 2014/07/08 18:16:27 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.83 2014/07/09 16:27:38 maksbotan Exp $ + +*mpv-0.4.0 (09 Jul 2014) +*mpv-0.3.11 (09 Jul 2014) + + 09 Jul 2014; Maxim Koltsov <maksbotan@gentoo.org> + +files/mpv-0.3.11-libav-9.patch, +mpv-0.3.11.ebuild, +mpv-0.4.0.ebuild, + metadata.xml, mpv-9999.ebuild: + Bump to 0.4.0, bug #516458, add libmpv use flag, bug #516742. Thanks to + Nikoli. 08 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> mpv-0.3.10.ebuild: amd64 stable wrt bug #514906 diff --git a/media-video/mpv/files/mpv-0.3.11-libav-9.patch b/media-video/mpv/files/mpv-0.3.11-libav-9.patch new file mode 100644 index 000000000000..7ab6516ebf90 --- /dev/null +++ b/media-video/mpv/files/mpv-0.3.11-libav-9.patch @@ -0,0 +1,12 @@ +diff --git a/demux/demux.c b/demux/demux.c +index 0649175..bd16a7a 100644 +--- a/demux/demux.c ++++ b/demux/demux.c +@@ -43,6 +43,7 @@ + #include "audio/format.h" + + #include <libavcodec/avcodec.h> ++#include <libavutil/mem.h> + + // Demuxer list + extern const struct demuxer_desc demuxer_desc_edl;
\ No newline at end of file diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml index 5fb8b8dae633..872433c8ce03 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -19,6 +19,7 @@ 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="libmpv">Build libmpv 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 diff --git a/media-video/mpv/mpv-0.3.11.ebuild b/media-video/mpv/mpv-0.3.11.ebuild new file mode 100644 index 000000000000..c74be5b59e79 --- /dev/null +++ b/media-video/mpv/mpv-0.3.11.ebuild @@ -0,0 +1,250 @@ +# 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.3.11.ebuild,v 1.1 2014/07/09 16:27:38 maksbotan 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.7.15" + +DESCRIPTION="Video player based on MPlayer/mplayer2" +HOMEPAGE="http://mpv.io/" +SRC_URI="https://waf.googlecode.com/files/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 -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick +jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl +oss portaudio +postproc pulseaudio pvr +quvi -radio samba sdl selinux +shm v4l vaapi vcd vdpau +vf-dlopen wayland +X xinerama +xscreensaver +xv" + +REQUIRED_USE=" + dvdnav? ( dvd ) + enca? ( iconv ) + lcms? ( opengl ) + libguess? ( iconv ) + luajit? ( lua ) + opengl? ( || ( wayland X ) ) + pvr? ( v4l ) + radio? ( v4l || ( alsa oss ) ) + vaapi? ( X ) + vdpau? ( X ) + wayland? ( opengl ) + xinerama? ( X ) + xscreensaver? ( X ) + xv? ( X ) +" + +RDEPEND+=" + || ( + >=media-video/libav-9.10:=[encode?,threads,vaapi?,vdpau?] + >=media-video/ffmpeg-1.2.4:0=[encode?,threads,vaapi?,vdpau?] + ) + sys-libs/ncurses + sys-libs/zlib + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm + opengl? ( virtual/opengl ) + lcms? ( media-libs/lcms:2 ) + vaapi? ( >=x11-libs/libva-0.34.0[X(+)] ) + 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.2.1 ) + 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 + >=media-video/ffmpeg-1.2:0[encode?,threads,vaapi?,vdpau?] + ) + ) + pulseaudio? ( media-sound/pulseaudio ) + quvi? ( + >=media-libs/libquvi-0.4.1:= + || ( + >=media-video/libav-9.10[network] + >=media-video/ffmpeg-1.2.4:0[network] + ) + ) + samba? ( net-fs/samba ) + sdl? ( media-libs/libsdl2[threads] ) + selinux? ( sec-policy/selinux-mplayer ) + v4l? ( media-libs/libv4l ) + wayland? ( + >=dev-libs/wayland-1.3.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-texlive/texlive-latex + dev-texlive/texlive-latexrecommended + dev-texlive/texlive-latexextra + dev-tex/xcolor + ) + X? ( + x11-proto/videoproto + x11-proto/xf86vidmodeproto + xinerama? ( x11-proto/xineramaproto ) + xscreensaver? ( x11-proto/scrnsaverproto ) + ) +" +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 "${FILESDIR}/${P}-libav-9.patch" + epatch_user +} + +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 + waf-utils_src_configure \ + --disable-build-date \ + --disable-debug-build \ + --disable-sdl \ + $(use_enable sdl sdl2) \ + --disable-rsound \ + $(use_enable encode encoding) \ + $(use_enable joystick) \ + $(use_enable bluray libbluray) \ + $(use_enable vcd) \ + $(use_enable quvi libquvi) \ + $(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 dvb) \ + $(use_enable pvr) \ + $(use_enable v4l libv4l2) \ + $(use_enable v4l tv) \ + $(use_enable v4l tv-v4l2) \ + $(use_enable radio) \ + $(use_enable radio radio-capture) \ + $(use_enable radio radio-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 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} +} + +src_install() { + waf-utils_src_install + + if 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 +} diff --git a/media-video/mpv/mpv-0.4.0.ebuild b/media-video/mpv/mpv-0.4.0.ebuild new file mode 100644 index 000000000000..0e44a5ea6543 --- /dev/null +++ b/media-video/mpv/mpv-0.4.0.ebuild @@ -0,0 +1,241 @@ +# 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.4.0.ebuild,v 1.1 2014/07/09 16:27:38 maksbotan 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.7.16" + +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 -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick +jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl +oss portaudio postproc pulseaudio pvr +quvi samba sdl selinux +shm v4l vaapi vdpau +vf-dlopen wayland +X xinerama +xscreensaver +xv" + +REQUIRED_USE=" + dvdnav? ( dvd ) + 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/ncurses + sys-libs/zlib + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm + opengl? ( virtual/opengl ) + lcms? ( >=media-libs/lcms-2.6:2 ) + vaapi? ( >=x11-libs/libva-0.34.0[X(+)] ) + 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 ) + quvi? ( + >=media-libs/libquvi-0.4.1:= + || ( + >=media-video/libav-10[network] + >=media-video/ffmpeg-2.1.4:0[network] + ) + ) + samba? ( net-fs/samba ) + sdl? ( media-libs/libsdl2[threads] ) + selinux? ( sec-policy/selinux-mplayer ) + v4l? ( media-libs/libv4l ) + wayland? ( + >=dev-libs/wayland-1.3.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 + x11-proto/xf86vidmodeproto + xinerama? ( x11-proto/xineramaproto ) + xscreensaver? ( x11-proto/scrnsaverproto ) + ) +" +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() { + # 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-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 quvi libquvi) \ + $(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 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 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} +} + +src_install() { + waf-utils_src_install + + if 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 +} diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index a0857eaec704..a4f0d29cd528 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -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.52 2014/06/20 09:48:36 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.53 2014/07/09 16:27:38 maksbotan Exp $ EAPI=5 @@ -21,7 +21,7 @@ LICENSE="GPL-2" 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 examples +iconv jack -joystick +IUSE="+alsa bluray bs2b cdio -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl oss portaudio postproc pulseaudio pvr +quvi samba sdl selinux +shm v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv" @@ -29,7 +29,6 @@ vf-dlopen wayland +X xinerama +xscreensaver +xv" REQUIRED_USE=" dvdnav? ( dvd ) enca? ( iconv ) - examples? ( lua ) lcms? ( opengl ) libguess? ( iconv ) luajit? ( lua ) @@ -170,8 +169,6 @@ src_configure() { $(use_enable sdl sdl2) \ --disable-rsound \ --disable-vapoursynth \ - $(use_enable examples libmpv-shared) \ - $(use_enable examples client-api-examples) \ $(use_enable encode encoding) \ $(use_enable joystick) \ $(use_enable bluray libbluray) \ |