diff options
author | Pavel Vinogradov | 2022-07-28 21:24:04 -0400 |
---|---|---|
committer | Pavel Vinogradov | 2022-07-28 22:12:29 -0400 |
commit | f76071225bd9523891cac46e89d797e3dfe66f37 (patch) | |
tree | 781b2bc1151a831547cc9b75c6b4724dbb757bd9 /video | |
parent | d118b42ff69be63e8e46b512782c293e50416399 (diff) |
video/mpv: added scm branch
Diffstat (limited to 'video')
-rwxr-xr-x | video/mpv/BUILD | 9 | ||||
-rwxr-xr-x | video/mpv/CONFIGURE | 44 | ||||
-rwxr-xr-x | video/mpv/DEPENDS | 408 | ||||
-rwxr-xr-x | video/mpv/DETAILS | 11 | ||||
-rw-r--r-- | video/mpv/HISTORY | 5 | ||||
-rwxr-xr-x | video/mpv/INSTALL | 13 | ||||
-rwxr-xr-x | video/mpv/PREPARE | 2 | ||||
-rwxr-xr-x | video/mpv/PRE_BUILD | 14 |
8 files changed, 360 insertions, 146 deletions
diff --git a/video/mpv/BUILD b/video/mpv/BUILD index bcb7248c8f..89571ac18b 100755 --- a/video/mpv/BUILD +++ b/video/mpv/BUILD @@ -18,5 +18,10 @@ if is_depends_enabled "${SPELL}" "smgl-gl_select"; then fi fi && -OPTS+=" --bindir=${INSTALL_ROOT}/usr/bin --confdir=${INSTALL_ROOT}/etc/mpv" && -waf_build +if [[ "${MPV_BRANCH}" == "scm" ]]; then + default_build +else + # remove on next release + OPTS+=" --bindir=${INSTALL_ROOT}/usr/bin --confdir=${INSTALL_ROOT}/etc/mpv" && + waf_build +fi diff --git a/video/mpv/CONFIGURE b/video/mpv/CONFIGURE index bae75f5fdf..a3649ac2f3 100755 --- a/video/mpv/CONFIGURE +++ b/video/mpv/CONFIGURE @@ -1,15 +1,43 @@ -default_configure && +if [[ "${MPV_BRANCH}" == "scm" ]]; then + . "${GRIMOIRE}/MESON_CONFIGURE" && -config_query_option MPV_OPTS "Enable DVB (Digital Video Broadcast) support?" y \ - "--enable-dvb" \ - "--disable-dvb" && + list_remove MPV_OPTS "--enable-dvb" && + list_remove MPV_OPTS "--disable-dvb" && + + list_remove MPV_OPTS "--enable-dvbin" && + list_remove MPV_OPTS "--disable-dvbin" && -if list_find "$MPV_OPTS" "--enable-dvb"; then config_query_option MPV_OPTS "Enable DVB input module?" y \ - "--enable-dvbin" \ - "--disable-dvbin" + "dvbin=enabled" \ + "dvbin=disabled" && + + config_query_option MPV_OPTS "Build GPLv2+ version of MPV?" n \ + "gpl=true" \ + "gpl=false" && + + config_query_option MPV_OPTS "Build libmpv library?" n \ + "libmpv=true" \ + "libmpv=false" else - list_add MPV_OPTS "--disable-dvbin" + # remove on next release + default_configure && + + list_remove MPV_OPTS "dvbin=enabled" && + list_remove MPV_OPTS "dvbin=disabled" && + list_remove MPV_OPTS "gpl=true" && + list_remove MPV_OPTS "gpl=false" && + list_remove MPV_OPTS "libmpv=true" && + list_remove MPV_OPTS "libmpv=false" && + + config_query_option MPV_OPTS "Enable DVB (Digital Video Broadcast) support?" y \ + "--enable-dvb" \ + "--disable-dvb --disable-dvbin" && + + if list_find "$MPV_OPTS" "--enable-dvb"; then + config_query_option MPV_OPTS "Enable DVB input module?" y \ + "--enable-dvbin" \ + "--disable-dvbin" + fi fi && list_remove MPV_OPTS "--enable-joystick" && diff --git a/video/mpv/DEPENDS b/video/mpv/DEPENDS index 6354202849..7bef65af2a 100755 --- a/video/mpv/DEPENDS +++ b/video/mpv/DEPENDS @@ -1,131 +1,287 @@ depends perl && -depends python3 && depends LIBAVCODEC && depends libass && -optional_depends luajit \ - "--enable-lua" \ - "--disable-lua" \ - "for Lua scripting support" && - -optional_depends docutils \ - "--enable-manpage-build" \ - "--disable-manpage-build" \ - "to build and install manpage" && - -# audio output -optional_depends alsa-lib \ - "--enable-alsa" \ - "--disable-alsa" \ - "for ALSA audio output" && - -optional_depends pulseaudio \ - "--enable-pulse" \ - "--disable-pulse" \ - "for Pulseaudio audio output" && - -optional_depends JACK-DRIVER \ - "--enable-jack" \ - "--disable-jack" \ - "for JACK audio output" && - -optional_depends openal \ - "--enable-openal" \ - "--disable-openal" \ - "for OpenAL audio output" && - -optional_depends sdl2 \ - "--enable-sdl2" \ - "--disable-sdl2" \ - "for SDL 2.0+ audio and video output" && - -# video output -optional_depends OPENGL \ - "--enable-gl" \ - "--disable-gl" \ - "for OpenGL video output" && - -optional_depends libcaca \ - "--enable-caca" \ - "--disable-caca" \ - "for CACA video output" && - -optional_depends libx11 \ - "--enable-x11" \ - "--disable-x11" \ - "for X11 video output" && - -if is_depends_enabled $SPELL libx11; then - depends libxext && - depends libxrandr && - depends libxscrnsaver && - depends libxinerama && - - optional_depends libvdpau \ - "--enable-vdpau" \ - "--disable-vdpau" \ - "for VDPAU acceleration" && - - optional_depends libxv \ - "--enable-xv" \ - "--disable-xv" \ - "for Xv video output" +if [[ "${MPV_BRANCH}" == "scm" ]]; then + . "${GRIMOIRE}/MESON_DEPENDS" && + + optional_depends LUA \ + "lua=enabled" \ + "lua=disabled" \ + "for Lua scripting support" && + + optional_depends docutils \ + "manpage-build=enabled" \ + "manpage-build=disabled" \ + "to build and install manpage" && + + # audio output + optional_depends alsa-lib \ + "alsa=enabled" \ + "alsa=disabled" \ + "for ALSA audio output" && + + optional_depends pipewire \ + "pipewire=enabled" \ + "pipewire=disabled" \ + "for Pipewire audio output" && + + optional_depends pulseaudio \ + "pulse=enabled" \ + "pulse=disabled" \ + "for Pulseaudio audio output" && + + optional_depends JACK-DRIVER \ + "jack=enabled" \ + "jack=disabled" \ + "for JACK audio output" && + + optional_depends openal \ + "openal=enabled" \ + "openal=disabled" \ + "for OpenAL audio output" && + + optional_depends sdl2 \ + "sdl2=enabled" \ + "sdl2=disabled" \ + "for SDL 2.0+ audio and video output" && + if is_depends_enabled "${SPELL}" sdl2; then + config_query_option MPV_OPTS "Enable SDL2 gamepad input?" n \ + "sdl2-gamepad=enabled" \ + "sdl2-gamepad=disabled" && + + config_query_option MPV_OPTS "Enable SDL2 audio?" y \ + "sdl2-audio=enabled" \ + "sdl2-audio=disabled" + fi && + + optional_depends sndio \ + "sndio=enabled" \ + "sndio=disabled" \ + "for sndio audio output" && + + # video output + optional_depends OPENGL \ + "gl=enabled" \ + "gl=disabled" \ + "for OpenGL video output" && + + optional_depends libcaca \ + "caca=enabled" \ + "caca=disabled" \ + "for CACA video output" && + +# optional_depends sixel \ +# "sixel=enabled" \ +# "sixel=disabled" \ +# "for Sixel support" && + + optional_depends libva \ + "vaapi=enabled" \ + "vaapi=disabled" \ + "for VAAPI video acceleration" && + + optional_depends wayland \ + "wayland=enabled" \ + "wayland=disabled" \ + "for Wayland support" && + + if list_find "$MPV_OPTS" "gpl=true"; then + optional_depends libx11 \ + "x11=enabled" \ + "x11=disabled" \ + "for X11 video output" && + if is_depends_enabled $SPELL libx11; then + depends libxext && + depends libxpresent && + depends libxrandr && + depends libxscrnsaver && + depends libxinerama && + + optional_depends libvdpau \ + "vdpau=enabled" \ + "vdpau=disabled" \ + "for VDPAU acceleration" && + + optional_depends libxv \ + "xv=enabled" \ + "xv=disabled" \ + "for Xv video output" + fi + fi && + + + # codecs + optional_depends JPEG \ + "jpeg=enabled" \ + "jpeg=disabled" \ + "for JPEG input/output support" && + + optional_depends libcdio-paranoia \ + "cdda=enabled" \ + "cdda=disabled" \ + "for cdda support" && + + # features + + optional_depends lcms2 \ + "lcms2=enabled" \ + "lcms2=disabled" \ + "for LCMS2 support" && + + optional_depends libbluray \ + "libbluray=enabled" \ + "libbluray=disabled" \ + "for Blu-ray support" && + + optional_depends libdvdnav \ + "dvdnav=enabled" \ + "dvdnav=disabled" \ + "for dvd navigation support" && + + optional_depends uchardet \ + "uchardet=enabled" \ + "uchardet=disabled" \ + "for charset discovery and conversion using uchardet" && + + optional_depends smgl-gl_select "" "" "to select OPENGL provider" && + + if is_depends_enabled "${SPELL}" "$(get_spell_provider ${SPELL} LUA)"; then + optional_depends youtube-dl "" "" "to watch Youtube videos" + fi && + + optional_depends libarchive \ + "libarchive=enabled" \ + "libarchive=disabled" \ + "to support reading zip files and more" else - list_add MPV_OPTS "--disable-xf86vm" && - list_add MPV_OPTS "--disable-vdpau" && - list_add MPV_OPTS "--disable-xv" && - list_remove MPV_OPTS "--disable-xinerama" && - list_remove MPV_OPTS "--disable-xext" -fi && - -# codecs -optional_depends JPEG \ - "--enable-jpeg" \ - "--disable-jpeg" \ - "for JPEG input/output support" && - -optional_depends libcdio-paranoia \ - "--enable-cdda" \ - "--disable-cdda" \ - "for cdda support" && - -# features -list_remove MPV_OPTS "--enable-radio-capture" && -list_remove MPV_OPTS "--disable-radio-capture" && -list_remove MPV_OPTS "--enable-pvr" && -list_remove MPV_OPTS "--disable-pvr" && - -if is_depends_enabled $SPELL samba; then - depends SSL -fi && - -optional_depends lcms2 \ - "--enable-lcms2" \ - "--disable-lcms2" \ - "for LCMS2 support" && - -optional_depends libbluray \ - "--enable-libbluray" \ - "--disable-libbluray" \ - "for Blu-ray support" && - -optional_depends libdvdnav \ - "--enable-dvdnav" \ - "--disable-dvdnav" \ - "for dvd navigation support" && - -optional_depends uchardet \ - "--enable-uchardet" \ - "--disable-uchardet" \ - "for charset discovery and conversion using uchardet" && - -optional_depends smgl-gl_select "" "" "to select OPENGL provider" && - -if is_depends_enabled $SPELL luajit; then - optional_depends youtube-dl "" "" "to watch Youtube videos" -fi && - -optional_depends libarchive \ - "--enable-libarchive" \ - "--disable-libarchive" \ - "to support reading zip files and more" + # remove on next release + depends python3 && + + optional_depends luajit \ + "--enable-lua" \ + "--disable-lua" \ + "for Lua scripting support" && + + optional_depends docutils \ + "--enable-manpage-build" \ + "--disable-manpage-build" \ + "to build and install manpage" && + + # audio output + optional_depends alsa-lib \ + "--enable-alsa" \ + "--disable-alsa" \ + "for ALSA audio output" && + + optional_depends pulseaudio \ + "--enable-pulse" \ + "--disable-pulse" \ + "for Pulseaudio audio output" && + + optional_depends JACK-DRIVER \ + "--enable-jack" \ + "--disable-jack" \ + "for JACK audio output" && + + optional_depends openal \ + "--enable-openal" \ + "--disable-openal" \ + "for OpenAL audio output" && + + optional_depends sdl2 \ + "--enable-sdl2" \ + "--disable-sdl2" \ + "for SDL 2.0+ audio and video output" && + + # video output + optional_depends OPENGL \ + "--enable-gl" \ + "--disable-gl" \ + "for OpenGL video output" && + + optional_depends libcaca \ + "--enable-caca" \ + "--disable-caca" \ + "for CACA video output" && + + optional_depends libx11 \ + "--enable-x11" \ + "--disable-x11" \ + "for X11 video output" && + + if is_depends_enabled $SPELL libx11; then + depends libxext && + depends libxrandr && + depends libxscrnsaver && + depends libxinerama && + + optional_depends libvdpau \ + "--enable-vdpau" \ + "--disable-vdpau" \ + "for VDPAU acceleration" && + + optional_depends libxv \ + "--enable-xv" \ + "--disable-xv" \ + "for Xv video output" + else + list_add MPV_OPTS "--disable-xf86vm" && + list_add MPV_OPTS "--disable-vdpau" && + list_add MPV_OPTS "--disable-xv" && + list_remove MPV_OPTS "--disable-xinerama" && + list_remove MPV_OPTS "--disable-xext" + fi && + + # codecs + optional_depends JPEG \ + "--enable-jpeg" \ + "--disable-jpeg" \ + "for JPEG input/output support" && + + optional_depends libcdio-paranoia \ + "--enable-cdda" \ + "--disable-cdda" \ + "for cdda support" && + + # features + list_remove MPV_OPTS "--enable-radio-capture" && + list_remove MPV_OPTS "--disable-radio-capture" && + list_remove MPV_OPTS "--enable-pvr" && + list_remove MPV_OPTS "--disable-pvr" && + + if is_depends_enabled $SPELL samba; then + depends SSL + fi && + + optional_depends lcms2 \ + "--enable-lcms2" \ + "--disable-lcms2" \ + "for LCMS2 support" && + + optional_depends libbluray \ + "--enable-libbluray" \ + "--disable-libbluray" \ + "for Blu-ray support" && + + optional_depends libdvdnav \ + "--enable-dvdnav" \ + "--disable-dvdnav" \ + "for dvd navigation support" && + + optional_depends uchardet \ + "--enable-uchardet" \ + "--disable-uchardet" \ + "for charset discovery and conversion using uchardet" && + + optional_depends smgl-gl_select "" "" "to select OPENGL provider" && + + if is_depends_enabled $SPELL luajit; then + optional_depends youtube-dl "" "" "to watch Youtube videos" + fi && + + optional_depends libarchive \ + "--enable-libarchive" \ + "--disable-libarchive" \ + "to support reading zip files and more" +fi diff --git a/video/mpv/DETAILS b/video/mpv/DETAILS index b00cbe8f63..981573f7fc 100755 --- a/video/mpv/DETAILS +++ b/video/mpv/DETAILS @@ -1,4 +1,14 @@ +. "${GRIMOIRE}/FUNCTIONS" SPELL="mpv" +if [[ "${MPV_BRANCH}" == "scm" ]]; then +. "${GRIMOIRE}/MESON_FUNCTIONS" + VERSION="$(get_scm_version)" + SOURCE="${SPELL}-git.tar.xz" + FORCE_DOWNLOAD="on" + SOURCE_URL[0]="git_http://github.com/${SPELL}-player/${SPELL}.git:${SPELL}-git" + SOURCE_IGNORE="volatile" +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git" +else VERSION="0.34.1" SOURCE_HASH="sha512:77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e" SECURITY_PATCH="3" @@ -10,6 +20,7 @@ SOURCE2="waf-${WAF_VERSION}" SOURCE2_URL[0]="https://waf.io/${SOURCE2}" SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" +fi DOCS="Copyright DOCS/tech-overview.txt DOCS/OUTDATED-tech/* ${DOCS}" WEB_SITE="https://mpv.io/" LICENSE[0]="LGPL" diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY index e3ce2ee9c5..8fc59c3a23 100644 --- a/video/mpv/HISTORY +++ b/video/mpv/HISTORY @@ -1,3 +1,8 @@ +2022-07-28 Pavel Vinogradov <public@sourcemage.org> + * BUILD, CONFIGURE, DEPENDS, DETAILS, INSTALL, PRE_BUILD, PREPARE: added + scm branch which is using meson like build system, hence mesonified almost + entire spell, next release will be using meson like system completely + 2022-01-07 Florian Franzmann <bwlf@bandrate.org> * DETAILS: version 0.34.1, waf version 2.0.23 diff --git a/video/mpv/INSTALL b/video/mpv/INSTALL index d3320cb103..7e2dc2c05a 100755 --- a/video/mpv/INSTALL +++ b/video/mpv/INSTALL @@ -1,5 +1,8 @@ -waf_install - -install -vm 755 -d "$INSTALL_ROOT/etc/mpv" && - -install -vm 644 etc/*example*.conf "$INSTALL_ROOT/etc/mpv" +if [[ "${MPV_BRANCH}" == "scm" ]]; then + default_install +else + # remove on next release + waf_install && + install -vm 755 -d "$INSTALL_ROOT/etc/mpv" && + install -vm 644 etc/*example*.conf "$INSTALL_ROOT/etc/mpv" +fi diff --git a/video/mpv/PREPARE b/video/mpv/PREPARE new file mode 100755 index 0000000000..e38d86f7e9 --- /dev/null +++ b/video/mpv/PREPARE @@ -0,0 +1,2 @@ +. "${GRIMOIRE}/FUNCTIONS" && +prepare_select_branch stable scm diff --git a/video/mpv/PRE_BUILD b/video/mpv/PRE_BUILD index 92f19526af..f7c30314a1 100755 --- a/video/mpv/PRE_BUILD +++ b/video/mpv/PRE_BUILD @@ -1,7 +1,11 @@ default_pre_build && -verify_file '2' && -cd $SOURCE_DIRECTORY && -install -m 0755 $SOURCE_CACHE/$SOURCE2 waf && -cp etc/{mpv,example}.conf && -sedit 's:env python:env python3:' waf +# remove on next release +if [[ "${MPV_BRANCH}" == "stable" ]]; then + verify_file '2' && + cd $SOURCE_DIRECTORY && + install -m 0755 $SOURCE_CACHE/$SOURCE2 waf && + cp etc/{mpv,example}.conf && + + sedit 's:env python:env python3:' waf +fi |