commit: bc2597dccc6486ba9e8f1de563eeafe34bef75f7 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> AuthorDate: Sun Dec 4 20:52:41 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Mon Dec 5 22:48:35 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc2597dc
media-video/mpv: optionally install extra tools. Gentoo-Bug: https://bugs.gentoo.org/601210 Package-Manager: portage-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/3015 media-video/mpv/metadata.xml | 1 + media-video/mpv/{mpv-9999.ebuild => mpv-0.22.0-r1.ebuild} | 14 +++++++++++--- media-video/mpv/mpv-9999.ebuild | 14 +++++++++++--- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml index 589e664..e03b973 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -35,6 +35,7 @@ <flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag> <flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs (Note: these outputs exist for compatibility reasons only, avoid if possible)</flag> + <flag name="tools">Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv</flag> <flag name="uchardet">Enable subtitles charset discovery via <pkg>dev-libs/uchardet</pkg></flag> <flag name="vf-dlopen">Install additional video filters to be used with -vf dlopen</flag> </use> diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-0.22.0-r1.ebuild similarity index 95% copy from media-video/mpv/mpv-9999.ebuild copy to media-video/mpv/mpv-0.22.0-r1.ebuild index 7d7ee53..7e85cb4 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-0.22.0-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)' WAF_PV=1.8.12 -inherit gnome2-utils pax-utils python-any-r1 toolchain-funcs versionator waf-utils xdg-utils +inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils DESCRIPTION="Media player based on MPlayer and mplayer2" HOMEPAGE="https://mpv.io/"; @@ -31,7 +31,7 @@ SLOT="0" IUSE="aqua +alsa archive bluray cdda +cli coreaudio doc drm dvb dvd +egl +enca encode gbm +iconv jack jpeg lcms +libass libav libcaca libguess libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba -sdl - selinux test +uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama + selinux test tools +uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv zsh-completion" REQUIRED_USE=" @@ -43,6 +43,7 @@ REQUIRED_USE=" lcms? ( || ( opengl egl ) ) libguess? ( iconv ) luajit? ( lua ) + tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) @@ -124,6 +125,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} selinux? ( sec-policy/selinux-mplayer ) + tools? ( ${PYTHON_DEPS} ) " PATCHES=( "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" ) @@ -140,7 +142,7 @@ pkg_pretend() { pkg_setup() { mpv_check_compiler - python-any-r1_pkg_setup + [[ ${MERGE_TYPE} != "binary" ]] && python_setup } src_prepare() { @@ -279,6 +281,12 @@ src_install() { if use cli && use luajit; then pax-mark -m "${ED}"usr/bin/${PN} fi + + if use tools; then + dobin TOOLS/{mpv_identify.sh,umpv} + newbin TOOLS/idet.sh mpv_idet.sh + python_replicate_script "${ED}"usr/bin/umpv + fi } pkg_preinst() { diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 7d7ee53..7e85cb4 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)' WAF_PV=1.8.12 -inherit gnome2-utils pax-utils python-any-r1 toolchain-funcs versionator waf-utils xdg-utils +inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils DESCRIPTION="Media player based on MPlayer and mplayer2" HOMEPAGE="https://mpv.io/"; @@ -31,7 +31,7 @@ SLOT="0" IUSE="aqua +alsa archive bluray cdda +cli coreaudio doc drm dvb dvd +egl +enca encode gbm +iconv jack jpeg lcms +libass libav libcaca libguess libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba -sdl - selinux test +uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama + selinux test tools +uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv zsh-completion" REQUIRED_USE=" @@ -43,6 +43,7 @@ REQUIRED_USE=" lcms? ( || ( opengl egl ) ) libguess? ( iconv ) luajit? ( lua ) + tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) @@ -124,6 +125,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} selinux? ( sec-policy/selinux-mplayer ) + tools? ( ${PYTHON_DEPS} ) " PATCHES=( "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" ) @@ -140,7 +142,7 @@ pkg_pretend() { pkg_setup() { mpv_check_compiler - python-any-r1_pkg_setup + [[ ${MERGE_TYPE} != "binary" ]] && python_setup } src_prepare() { @@ -279,6 +281,12 @@ src_install() { if use cli && use luajit; then pax-mark -m "${ED}"usr/bin/${PN} fi + + if use tools; then + dobin TOOLS/{mpv_identify.sh,umpv} + newbin TOOLS/idet.sh mpv_idet.sh + python_replicate_script "${ED}"usr/bin/umpv + fi } pkg_preinst() {
