Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (a503e3264f3a10bb61a31816d605730e99477129)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (a503e3264f3a10bb61a31816d605730e99477129)
  • Date: Sat, 12 Nov 2022 20:45:38 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

video/mpv/BUILD | 8 -
video/mpv/CONFIGURE | 49 +-----
video/mpv/DEPENDS | 399
+++++++++++++++++-----------------------------------
video/mpv/DETAILS | 6
video/mpv/HISTORY | 5
video/mpv/INSTALL | 8 -
video/mpv/PRE_BUILD | 11 -
7 files changed, 155 insertions(+), 331 deletions(-)

New commits:
commit a503e3264f3a10bb61a31816d605730e99477129
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

video/mpv: completely switched to meson

diff --git a/video/mpv/BUILD b/video/mpv/BUILD
index 89571ac..f3636ab 100755
--- a/video/mpv/BUILD
+++ b/video/mpv/BUILD
@@ -18,10 +18,4 @@ if is_depends_enabled "${SPELL}" "smgl-gl_select"; then
fi
fi &&

-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
+default_build
diff --git a/video/mpv/CONFIGURE b/video/mpv/CONFIGURE
index a3649ac..8dcf5ff 100755
--- a/video/mpv/CONFIGURE
+++ b/video/mpv/CONFIGURE
@@ -1,45 +1,24 @@
-if [[ "${MPV_BRANCH}" == "scm" ]]; then
- . "${GRIMOIRE}/MESON_CONFIGURE" &&
+. "${GRIMOIRE}/MESON_CONFIGURE" &&

- list_remove MPV_OPTS "--enable-dvb" &&
- list_remove MPV_OPTS "--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" &&
+list_remove MPV_OPTS "--enable-dvbin" &&
+list_remove MPV_OPTS "--disable-dvbin" &&

+config_query_option MPV_OPTS "Build GPLv2+ version of MPV?" n \
+ "gpl=true" \
+ "gpl=false" &&
+if list_find "$MPV_OPTS" "gpl=true"; then
config_query_option MPV_OPTS "Enable DVB input module?" y \
"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
- # 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
+ "dvbin=disabled"
fi &&

+config_query_option MPV_OPTS "Build libmpv library?" n \
+ "libmpv=true" \
+ "libmpv=false" &&
+
list_remove MPV_OPTS "--enable-joystick" &&
list_remove MPV_OPTS "--disable-joystick" &&

diff --git a/video/mpv/DEPENDS b/video/mpv/DEPENDS
index 265f413..cff7669 100755
--- a/video/mpv/DEPENDS
+++ b/video/mpv/DEPENDS
@@ -1,300 +1,169 @@
+. "${GRIMOIRE}/MESON_DEPENDS" &&
depends perl &&
depends LIBAVCODEC &&
depends libass &&

if [[ "${MPV_BRANCH}" == "scm" ]]; then
- . "${GRIMOIRE}/MESON_DEPENDS" &&
-
- depends git &&
-
- 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" &&
+ depends git
+fi &&
+
+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 libplacebo \
- "libplacebo=enabled" \
- "libplacebo=disabled" \
- "for libplacebo support" &&
- if is_depends_enabled ${SPELL} libplacebo; then
- optional_depends vulkan-loader \
- "vulkan=enabled" \
- "vulkan=disabled" \
- "for Vulkan context support"
- fi &&
-
- 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
- # 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 libplacebo \
+ "libplacebo=enabled" \
+ "libplacebo=disabled" \
+ "for libplacebo support" &&
+if is_depends_enabled ${SPELL} libplacebo; then
+ optional_depends vulkan-loader \
+ "vulkan=enabled" \
+ "vulkan=disabled" \
+ "for Vulkan context support"
+fi &&
+
+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 \
- "--enable-x11" \
- "--disable-x11" \
+ "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 \
- "--enable-vdpau" \
- "--disable-vdpau" \
+ "vdpau=enabled" \
+ "vdpau=disabled" \
"for VDPAU acceleration" &&

optional_depends libxv \
- "--enable-xv" \
- "--disable-xv" \
+ "xv=enabled" \
+ "xv=disabled" \
"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 &&
+ fi
+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" &&
+# codecs
+optional_depends JPEG \
+ "jpeg=enabled" \
+ "jpeg=disabled" \
+ "for JPEG input/output 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" &&
+optional_depends libcdio-paranoia \
+ "cdda=enabled" \
+ "cdda=disabled" \
+ "for cdda support" &&

- if is_depends_enabled $SPELL samba; then
- depends SSL
- fi &&
+# features

- optional_depends lcms2 \
- "--enable-lcms2" \
- "--disable-lcms2" \
- "for LCMS2 support" &&
+optional_depends lcms2 \
+ "lcms2=enabled" \
+ "lcms2=disabled" \
+ "for LCMS2 support" &&

- optional_depends libbluray \
- "--enable-libbluray" \
- "--disable-libbluray" \
- "for Blu-ray support" &&
+optional_depends libbluray \
+ "libbluray=enabled" \
+ "libbluray=disabled" \
+ "for Blu-ray support" &&

- optional_depends libdvdnav \
- "--enable-dvdnav" \
- "--disable-dvdnav" \
- "for dvd navigation support" &&
+optional_depends libdvdnav \
+ "dvdnav=enabled" \
+ "dvdnav=disabled" \
+ "for dvd navigation support" &&

- optional_depends uchardet \
- "--enable-uchardet" \
- "--disable-uchardet" \
- "for charset discovery and conversion using uchardet" &&
+optional_depends uchardet \
+ "uchardet=enabled" \
+ "uchardet=disabled" \
+ "for charset discovery and conversion using uchardet" &&

- optional_depends smgl-gl_select "" "" "to select OPENGL provider" &&
+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 &&
+if is_depends_enabled "${SPELL}" "$(get_spell_provider ${SPELL} LUA)"; 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
+optional_depends libarchive \
+ "libarchive=enabled" \
+ "libarchive=disabled" \
+ "to support reading zip files and more"
diff --git a/video/mpv/DETAILS b/video/mpv/DETAILS
index 941bb59..5f32261 100755
--- a/video/mpv/DETAILS
+++ b/video/mpv/DETAILS
@@ -1,7 +1,7 @@
. "${GRIMOIRE}/FUNCTIONS"
+. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL="mpv"
if [[ "${MPV_BRANCH}" == "scm" ]]; then
-. "${GRIMOIRE}/MESON_FUNCTIONS"
VERSION="$(get_scm_version)"
SOURCE="${SPELL}-git.tar.xz"
FORCE_DOWNLOAD="on"
@@ -15,10 +15,6 @@ else
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]="https://github.com/${SPELL}-player/${SPELL}/archive/v${VERSION}.tar.gz";
SOURCE_HINTS="no-check-certificate"
- WAF_VERSION="2.0.23"
-
SOURCE2_HASH="sha512:b1794a4d706308b3f190713ad73db3b89a9f5f89b1eb4f332a3a65e950a785ef93df2a57a5abe078533a27a25059cf33f1d59a20486c6ba02435e41b4e1d4668"
- 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}"
diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY
index b7a8635..47fe1b0 100644
--- a/video/mpv/HISTORY
+++ b/video/mpv/HISTORY
@@ -1,3 +1,8 @@
+2022-11-12 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: completely switched to meson,
dvbin
+ feature is available only with gpl=true
+ * INSTALL, PRE_BUILD: dropped
+
2022-11-12 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 0.35.0

diff --git a/video/mpv/INSTALL b/video/mpv/INSTALL
deleted file mode 100755
index 7e2dc2c..0000000
--- a/video/mpv/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-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/PRE_BUILD b/video/mpv/PRE_BUILD
deleted file mode 100755
index f7c3031..0000000
--- a/video/mpv/PRE_BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-default_pre_build &&
-
-# 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



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (a503e3264f3a10bb61a31816d605730e99477129), Pavel Vinogradov, 11/12/2022

Archive powered by MHonArc 2.6.24.

Top of Page