CVS commit: pkgsrc/multimedia/mpv

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue May  3 07:04:27 UTC 2022

Modified Files:
        pkgsrc/multimedia/mpv: Makefile PLIST distinfo
        pkgsrc/multimedia/mpv/patches: patch-wscript
Added Files:
        pkgsrc/multimedia/mpv/patches: patch-etc_mpv.conf
            patch-wscript__build.py

Log Message:
mpv: To aid in playing surround sound files on typical NetBSD hardware,
default to downmixing surround files to stereo.

Healthy side effect: read default options from $SYSCONFDIR/mpv/mpv.conf.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/mpv/PLIST
cvs rdiff -u -r1.73 -r1.74 pkgsrc/multimedia/mpv/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/mpv/patches/patch-etc_mpv.conf
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/mpv/patches/patch-wscript
cvs rdiff -u -r0 -r1.3 pkgsrc/multimedia/mpv/patches/patch-wscript__build.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/mpv/Makefile
diff -u pkgsrc/multimedia/mpv/Makefile:1.134 pkgsrc/multimedia/mpv/Makefile:1.135
--- pkgsrc/multimedia/mpv/Makefile:1.134        Mon Apr 18 19:11:46 2022
+++ pkgsrc/multimedia/mpv/Makefile      Tue May  3 07:04:27 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.134 2022/04/18 19:11:46 adam Exp $
+# $NetBSD: Makefile,v 1.135 2022/05/03 07:04:27 nia Exp $
 
 DISTNAME=      mpv-0.34.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -20,6 +20,7 @@ TOOL_DEPENDS+=        waf>=2.0.9:../../devel/wa
 
 WAF_REPLACE_EXECUTABLE=        yes
 WAF_CONFIGURE_ARGS+=   --bindir=${PREFIX}/bin
+WAF_CONFIGURE_ARGS+=   --sysconfdir=${PKG_SYSCONFDIR}
 WAF_CONFIGURE_ARGS+=   --enable-dvdnav
 WAF_CONFIGURE_ARGS+=   --enable-libmpv-shared
 
@@ -29,7 +30,10 @@ USE_TOOLS+=  perl pkg-config
 
 MAKE_DIRS=             ${PKG_SYSCONFDIR}/mpv
 INSTALLATION_DIRS=     share/examples/mpv
-CONF_FILES+=           share/examples/mpv/encoding-profiles.conf ${PKG_SYSCONFDIR}/mpv/encoding-profiles.conf
+CONF_FILES+=           share/examples/mpv/encoding-profiles.conf \
+                       ${PKG_SYSCONFDIR}/mpv/encoding-profiles.conf
+CONF_FILES+=           share/examples/mpv/mpv.conf \
+                       ${PKG_SYSCONFDIR}/mpv/mpv.conf
 
 PKGCONFIG_OVERRIDE+=   libmpv/mpv.pc.in
 
@@ -60,7 +64,8 @@ BUILDLINK_PASSTHRU_DIRS+=     ${XCODE_DIR}/T
 .endif
 
 post-install:
-       cd ${DESTDIR}${PREFIX} && ${MV} etc/mpv/encoding-profiles.conf share/examples/mpv
+       ${MV} ${DESTDIR}${PREFIX}/share/doc/mpv/mpv.conf \
+           ${DESTDIR}${PREFIX}/share/examples/mpv/mpv.conf
 
 .include "options.mk"
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/multimedia/mpv/PLIST
diff -u pkgsrc/multimedia/mpv/PLIST:1.11 pkgsrc/multimedia/mpv/PLIST:1.12
--- pkgsrc/multimedia/mpv/PLIST:1.11    Sat Dec 19 11:27:51 2020
+++ pkgsrc/multimedia/mpv/PLIST Tue May  3 07:04:27 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2020/12/19 11:27:51 leot Exp $
+@comment $NetBSD: PLIST,v 1.12 2022/05/03 07:04:27 nia Exp $
 bin/mpv
 include/mpv/client.h
 include/mpv/opengl_cb.h
@@ -14,9 +14,9 @@ share/applications/mpv.desktop
 share/bash-completion/completions/mpv
 share/doc/mpv/input.conf
 share/doc/mpv/mplayer-input.conf
-share/doc/mpv/mpv.conf
 share/doc/mpv/restore-old-bindings.conf
 share/examples/mpv/encoding-profiles.conf
+share/examples/mpv/mpv.conf
 share/icons/hicolor/128x128/apps/mpv.png
 share/icons/hicolor/16x16/apps/mpv.png
 share/icons/hicolor/32x32/apps/mpv.png

Index: pkgsrc/multimedia/mpv/distinfo
diff -u pkgsrc/multimedia/mpv/distinfo:1.73 pkgsrc/multimedia/mpv/distinfo:1.74
--- pkgsrc/multimedia/mpv/distinfo:1.73 Thu Jan  6 20:02:16 2022
+++ pkgsrc/multimedia/mpv/distinfo      Tue May  3 07:04:27 2022
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.73 2022/01/06 20:02:16 leot Exp $
+$NetBSD: distinfo,v 1.74 2022/05/03 07:04:27 nia Exp $
 
 BLAKE2s (mpv-0.34.1.tar.gz) = 8c12b91067c852b26e1b044afb0ff1e80f1950f2c5cc193cc10ffbef227eb4da
 SHA512 (mpv-0.34.1.tar.gz) = 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
 Size (mpv-0.34.1.tar.gz) = 3288356 bytes
 SHA1 (patch-audio_out_ao__alsa.c) = c4661d0d22550d6e4eb2b7a42dd04dbcc58123b0
+SHA1 (patch-etc_mpv.conf) = 9e41b2f4bf59c3bfc5ad84af05538661981ed111
 SHA1 (patch-video_out_drm__common.c) = 70eb8884f63e9456c0ffe592289cfd81e208955b
 SHA1 (patch-video_out_wayland__common.c) = abed416d258ebf0b595ea897daf3013dd81189e8
-SHA1 (patch-wscript) = 3792bd2cc84fababdde86e66c5a93772f2b105d1
+SHA1 (patch-wscript) = c7bb9c506718c38aded9ca47e7aa0d76cf338bf2
+SHA1 (patch-wscript__build.py) = fc77ebe56fba0b827541d052a767402965793ee1

Index: pkgsrc/multimedia/mpv/patches/patch-wscript
diff -u pkgsrc/multimedia/mpv/patches/patch-wscript:1.7 pkgsrc/multimedia/mpv/patches/patch-wscript:1.8
--- pkgsrc/multimedia/mpv/patches/patch-wscript:1.7     Mon Nov  1 17:39:26 2021
+++ pkgsrc/multimedia/mpv/patches/patch-wscript Tue May  3 07:04:27 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-wscript,v 1.7 2021/11/01 17:39:26 leot Exp $
+$NetBSD: patch-wscript,v 1.8 2022/05/03 07:04:27 nia Exp $
 
 - Enable support for DRM on NetBSD.
 - Check for OSSv4 features that could not be on some platforms
   (e.g. NetBSD)
 
---- wscript.orig       2021-11-01 14:44:39.000000000 +0000
+--- wscript.orig       2022-01-03 19:45:08.000000000 +0000
 +++ wscript
 @@ -272,6 +272,11 @@ iconv support use --disable-iconv.",
          'func': check_statement(['sys/consio.h', 'sys/ioctl.h'],

Added files:

Index: pkgsrc/multimedia/mpv/patches/patch-etc_mpv.conf
diff -u /dev/null pkgsrc/multimedia/mpv/patches/patch-etc_mpv.conf:1.1
--- /dev/null   Tue May  3 07:04:27 2022
+++ pkgsrc/multimedia/mpv/patches/patch-etc_mpv.conf    Tue May  3 07:04:27 2022
@@ -0,0 +1,29 @@
+$NetBSD: patch-etc_mpv.conf,v 1.1 2022/05/03 07:04:27 nia Exp $
+
+Optimize for stereo audio output devices on NetBSD.
+
+--- etc/mpv.conf.orig  2022-01-03 19:45:08.000000000 +0000
++++ etc/mpv.conf
+@@ -71,19 +71,9 @@
+ # audio settings #
+ ##################
+ 
+-# Specify default audio device. You can list devices with: --audio-device=help
+-# The option takes the device string (the stuff between the '...').
+-#audio-device=alsa/default
+-
+-# Do not filter audio to keep pitch when changing playback speed.
+-#audio-pitch-correction=no
+-
+-# Output 5.1 audio natively, and upmix/downmix audio with a different format.
+-#audio-channels=5.1
+-# Disable any automatic remix, _if_ the audio output accepts the audio format.
+-# of the currently played file. See caveats mentioned in the manpage.
+-# (The default is "auto-safe", see manpage.)
+-#audio-channels=auto
++# NetBSD's audio stack will decline to set a surround mode if the device
++# does not support it.  By default, play surround files in stereo for safety.
++audio-channels=stereo
+ 
+ ##################
+ # other settings #

Index: pkgsrc/multimedia/mpv/patches/patch-wscript__build.py
diff -u /dev/null pkgsrc/multimedia/mpv/patches/patch-wscript__build.py:1.3
--- /dev/null   Tue May  3 07:04:27 2022
+++ pkgsrc/multimedia/mpv/patches/patch-wscript__build.py       Tue May  3 07:04:27 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-wscript__build.py,v 1.3 2022/05/03 07:04:27 nia Exp $
+
+Install configuration files to examples, per pkgsrc conventions.
+
+--- wscript_build.py.orig      2022-01-03 19:45:08.000000000 +0000
++++ wscript_build.py
+@@ -737,7 +737,7 @@ def build(ctx):
+             ctx.env.DATADIR + '/applications',
+             ['etc/mpv.desktop'] )
+ 
+-        ctx.install_files(ctx.env.CONFDIR, ['etc/encoding-profiles.conf'] )
++        ctx.install_files(ctx.env.DATADIR + '/examples/mpv',  ['etc/encoding-profiles.conf'] )
+ 
+         for size in '16x16 32x32 64x64 128x128'.split():
+             ctx.install_as(