Tue May 3 07:04:27 2022 UTC ()
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


(nia)
diff -r1.134 -r1.135 pkgsrc/multimedia/mpv/Makefile
diff -r1.11 -r1.12 pkgsrc/multimedia/mpv/PLIST
diff -r1.73 -r1.74 pkgsrc/multimedia/mpv/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/mpv/patches/patch-etc_mpv.conf
diff -r1.7 -r1.8 pkgsrc/multimedia/mpv/patches/patch-wscript
diff -r0 -r1.3 pkgsrc/multimedia/mpv/patches/patch-wscript__build.py
cvs diff -r1.134 -r1.135 pkgsrc/multimedia/mpv/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/Makefile 2022/04/18 19:11:46 1.134
+++ pkgsrc/multimedia/mpv/Makefile 2022/05/03 07:04:27 1.135
@@ -1,45 +1,49 @@ @@ -1,45 +1,49 @@
1# $NetBSD: Makefile,v 1.134 2022/04/18 19:11:46 adam Exp $ 1# $NetBSD: Makefile,v 1.135 2022/05/03 07:04:27 nia Exp $
2 2
3DISTNAME= mpv-0.34.1 3DISTNAME= mpv-0.34.1
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= leot@NetBSD.org 9MAINTAINER= leot@NetBSD.org
10HOMEPAGE= https://mpv.io/ 10HOMEPAGE= https://mpv.io/
11COMMENT= Video player based on MPlayer and mplayer2 11COMMENT= Video player based on MPlayer and mplayer2
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
13 13
14# needs sem_timedwait(3) 14# needs sem_timedwait(3)
15NOT_FOR_PLATFORM= NetBSD-[1-6].*-* 15NOT_FOR_PLATFORM= NetBSD-[1-6].*-*
16 16
17TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils 17TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
18# ${WRKSRC}/bootstrap.py mentions needed version 18# ${WRKSRC}/bootstrap.py mentions needed version
19TOOL_DEPENDS+= waf>=2.0.9:../../devel/waf 19TOOL_DEPENDS+= waf>=2.0.9:../../devel/waf
20 20
21WAF_REPLACE_EXECUTABLE= yes 21WAF_REPLACE_EXECUTABLE= yes
22WAF_CONFIGURE_ARGS+= --bindir=${PREFIX}/bin 22WAF_CONFIGURE_ARGS+= --bindir=${PREFIX}/bin
 23WAF_CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
23WAF_CONFIGURE_ARGS+= --enable-dvdnav 24WAF_CONFIGURE_ARGS+= --enable-dvdnav
24WAF_CONFIGURE_ARGS+= --enable-libmpv-shared 25WAF_CONFIGURE_ARGS+= --enable-libmpv-shared
25 26
26PYTHON_FOR_BUILD_ONLY= yes 27PYTHON_FOR_BUILD_ONLY= yes
27 28
28USE_TOOLS+= perl pkg-config 29USE_TOOLS+= perl pkg-config
29 30
30MAKE_DIRS= ${PKG_SYSCONFDIR}/mpv 31MAKE_DIRS= ${PKG_SYSCONFDIR}/mpv
31INSTALLATION_DIRS= share/examples/mpv 32INSTALLATION_DIRS= share/examples/mpv
32CONF_FILES+= share/examples/mpv/encoding-profiles.conf ${PKG_SYSCONFDIR}/mpv/encoding-profiles.conf 33CONF_FILES+= share/examples/mpv/encoding-profiles.conf \
 34 ${PKG_SYSCONFDIR}/mpv/encoding-profiles.conf
 35CONF_FILES+= share/examples/mpv/mpv.conf \
 36 ${PKG_SYSCONFDIR}/mpv/mpv.conf
33 37
34PKGCONFIG_OVERRIDE+= libmpv/mpv.pc.in 38PKGCONFIG_OVERRIDE+= libmpv/mpv.pc.in
35 39
36SUBST_CLASSES+= python 40SUBST_CLASSES+= python
37SUBST_SED.python+= -e "s,python,python${PYVERSSUFFIX}," 41SUBST_SED.python+= -e "s,python,python${PYVERSSUFFIX},"
38SUBST_SED.python+= -e "s,rst2man,rst2man-${PYVERSSUFFIX}," 42SUBST_SED.python+= -e "s,rst2man,rst2man-${PYVERSSUFFIX},"
39SUBST_FILES.python+= wscript wscript_build.py 43SUBST_FILES.python+= wscript wscript_build.py
40SUBST_STAGE.python= pre-configure 44SUBST_STAGE.python= pre-configure
41SUBST_MESSAGE.python= Fix Python command names. 45SUBST_MESSAGE.python= Fix Python command names.
42 46
43.include "../../mk/bsd.prefs.mk" 47.include "../../mk/bsd.prefs.mk"
44 48
45# 49#
@@ -50,27 +54,28 @@ SUBST_MESSAGE.python= Fix Python command @@ -50,27 +54,28 @@ SUBST_MESSAGE.python= Fix Python command
50# On newer macOS releases there are a couple of swift compat static libraries 54# On newer macOS releases there are a couple of swift compat static libraries
51# that need to be added to the search path. 55# that need to be added to the search path.
52# 56#
53.if ${OPSYS} == "Darwin" 57.if ${OPSYS} == "Darwin"
54XCODE_DIR!= xcode-select -p 2>/dev/null || ${TRUE} 58XCODE_DIR!= xcode-select -p 2>/dev/null || ${TRUE}
55. if exists(${XCODE_DIR}/usr/lib/swift/macosx) 59. if exists(${XCODE_DIR}/usr/lib/swift/macosx)
56BUILDLINK_PASSTHRU_DIRS+= ${XCODE_DIR}/usr/lib/swift/macosx 60BUILDLINK_PASSTHRU_DIRS+= ${XCODE_DIR}/usr/lib/swift/macosx
57. elif exists(${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx) 61. elif exists(${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx)
58BUILDLINK_PASSTHRU_DIRS+= ${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx 62BUILDLINK_PASSTHRU_DIRS+= ${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx
59. endif 63. endif
60.endif 64.endif
61 65
62post-install: 66post-install:
63 cd ${DESTDIR}${PREFIX} && ${MV} etc/mpv/encoding-profiles.conf share/examples/mpv 67 ${MV} ${DESTDIR}${PREFIX}/share/doc/mpv/mpv.conf \
 68 ${DESTDIR}${PREFIX}/share/examples/mpv/mpv.conf
64 69
65.include "options.mk" 70.include "options.mk"
66.include "../../converters/libiconv/buildlink3.mk" 71.include "../../converters/libiconv/buildlink3.mk"
67.include "../../devel/waf/waf.mk" 72.include "../../devel/waf/waf.mk"
68.include "../../devel/zlib/buildlink3.mk" 73.include "../../devel/zlib/buildlink3.mk"
69.include "../../graphics/lcms2/buildlink3.mk" 74.include "../../graphics/lcms2/buildlink3.mk"
70.include "../../lang/python/application.mk" 75.include "../../lang/python/application.mk"
71.include "../../multimedia/libass/buildlink3.mk" 76.include "../../multimedia/libass/buildlink3.mk"
72.include "../../multimedia/libdvdnav/buildlink3.mk" 77.include "../../multimedia/libdvdnav/buildlink3.mk"
73.include "../../multimedia/ffmpeg4/buildlink3.mk" 78.include "../../multimedia/ffmpeg4/buildlink3.mk"
74.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 79.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
75.include "../../sysutils/desktop-file-utils/desktopdb.mk" 80.include "../../sysutils/desktop-file-utils/desktopdb.mk"
76.include "../../mk/jpeg.buildlink3.mk" 81.include "../../mk/jpeg.buildlink3.mk"
cvs diff -r1.11 -r1.12 pkgsrc/multimedia/mpv/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/PLIST 2020/12/19 11:27:51 1.11
+++ pkgsrc/multimedia/mpv/PLIST 2022/05/03 07:04:27 1.12
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1@comment $NetBSD: PLIST,v 1.11 2020/12/19 11:27:51 leot Exp $ 1@comment $NetBSD: PLIST,v 1.12 2022/05/03 07:04:27 nia Exp $
2bin/mpv 2bin/mpv
3include/mpv/client.h 3include/mpv/client.h
4include/mpv/opengl_cb.h 4include/mpv/opengl_cb.h
5include/mpv/render.h 5include/mpv/render.h
6include/mpv/render_gl.h 6include/mpv/render_gl.h
7include/mpv/stream_cb.h 7include/mpv/stream_cb.h
8lib/libmpv.so 8lib/libmpv.so
9lib/libmpv.so.1 9lib/libmpv.so.1
10lib/libmpv.so.1.109.0 10lib/libmpv.so.1.109.0
11lib/pkgconfig/mpv.pc 11lib/pkgconfig/mpv.pc
12man/man1/mpv.1 12man/man1/mpv.1
13share/applications/mpv.desktop 13share/applications/mpv.desktop
14share/bash-completion/completions/mpv 14share/bash-completion/completions/mpv
15share/doc/mpv/input.conf 15share/doc/mpv/input.conf
16share/doc/mpv/mplayer-input.conf 16share/doc/mpv/mplayer-input.conf
17share/doc/mpv/mpv.conf 
18share/doc/mpv/restore-old-bindings.conf 17share/doc/mpv/restore-old-bindings.conf
19share/examples/mpv/encoding-profiles.conf 18share/examples/mpv/encoding-profiles.conf
 19share/examples/mpv/mpv.conf
20share/icons/hicolor/128x128/apps/mpv.png 20share/icons/hicolor/128x128/apps/mpv.png
21share/icons/hicolor/16x16/apps/mpv.png 21share/icons/hicolor/16x16/apps/mpv.png
22share/icons/hicolor/32x32/apps/mpv.png 22share/icons/hicolor/32x32/apps/mpv.png
23share/icons/hicolor/64x64/apps/mpv.png 23share/icons/hicolor/64x64/apps/mpv.png
24share/icons/hicolor/scalable/apps/mpv.svg 24share/icons/hicolor/scalable/apps/mpv.svg
25share/icons/hicolor/symbolic/apps/mpv-symbolic.svg 25share/icons/hicolor/symbolic/apps/mpv-symbolic.svg
26share/zsh/site-functions/_mpv 26share/zsh/site-functions/_mpv
cvs diff -r1.73 -r1.74 pkgsrc/multimedia/mpv/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/distinfo 2022/01/06 20:02:16 1.73
+++ pkgsrc/multimedia/mpv/distinfo 2022/05/03 07:04:27 1.74
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1$NetBSD: distinfo,v 1.73 2022/01/06 20:02:16 leot Exp $ 1$NetBSD: distinfo,v 1.74 2022/05/03 07:04:27 nia Exp $
2 2
3BLAKE2s (mpv-0.34.1.tar.gz) = 8c12b91067c852b26e1b044afb0ff1e80f1950f2c5cc193cc10ffbef227eb4da 3BLAKE2s (mpv-0.34.1.tar.gz) = 8c12b91067c852b26e1b044afb0ff1e80f1950f2c5cc193cc10ffbef227eb4da
4SHA512 (mpv-0.34.1.tar.gz) = 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e 4SHA512 (mpv-0.34.1.tar.gz) = 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
5Size (mpv-0.34.1.tar.gz) = 3288356 bytes 5Size (mpv-0.34.1.tar.gz) = 3288356 bytes
6SHA1 (patch-audio_out_ao__alsa.c) = c4661d0d22550d6e4eb2b7a42dd04dbcc58123b0 6SHA1 (patch-audio_out_ao__alsa.c) = c4661d0d22550d6e4eb2b7a42dd04dbcc58123b0
 7SHA1 (patch-etc_mpv.conf) = 9e41b2f4bf59c3bfc5ad84af05538661981ed111
7SHA1 (patch-video_out_drm__common.c) = 70eb8884f63e9456c0ffe592289cfd81e208955b 8SHA1 (patch-video_out_drm__common.c) = 70eb8884f63e9456c0ffe592289cfd81e208955b
8SHA1 (patch-video_out_wayland__common.c) = abed416d258ebf0b595ea897daf3013dd81189e8 9SHA1 (patch-video_out_wayland__common.c) = abed416d258ebf0b595ea897daf3013dd81189e8
9SHA1 (patch-wscript) = 3792bd2cc84fababdde86e66c5a93772f2b105d1 10SHA1 (patch-wscript) = c7bb9c506718c38aded9ca47e7aa0d76cf338bf2
 11SHA1 (patch-wscript__build.py) = fc77ebe56fba0b827541d052a767402965793ee1
File Added: pkgsrc/multimedia/mpv/patches/patch-etc_mpv.conf
$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 #
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/mpv/patches/patch-wscript (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/patches/patch-wscript 2021/11/01 17:39:26 1.7
+++ pkgsrc/multimedia/mpv/patches/patch-wscript 2022/05/03 07:04:27 1.8
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-wscript,v 1.7 2021/11/01 17:39:26 leot Exp $ 1$NetBSD: patch-wscript,v 1.8 2022/05/03 07:04:27 nia Exp $
2 2
3- Enable support for DRM on NetBSD. 3- Enable support for DRM on NetBSD.
4- Check for OSSv4 features that could not be on some platforms 4- Check for OSSv4 features that could not be on some platforms
5 (e.g. NetBSD) 5 (e.g. NetBSD)
6 6
7--- wscript.orig 2021-11-01 14:44:39.000000000 +0000 7--- wscript.orig 2022-01-03 19:45:08.000000000 +0000
8+++ wscript 8+++ wscript
9@@ -272,6 +272,11 @@ iconv support use --disable-iconv.", 9@@ -272,6 +272,11 @@ iconv support use --disable-iconv.",
10 'func': check_statement(['sys/consio.h', 'sys/ioctl.h'], 10 'func': check_statement(['sys/consio.h', 'sys/ioctl.h'],
11 'int m; ioctl(0, VT_GETMODE, &m)'), 11 'int m; ioctl(0, VT_GETMODE, &m)'),
12 }, { 12 }, {
13+ 'name': 'wsdisplay_usl_io.h', 13+ 'name': 'wsdisplay_usl_io.h',
14+ 'desc': 'wsdisplay_usl_io.h', 14+ 'desc': 'wsdisplay_usl_io.h',
15+ 'func': check_statement(['sys/types.h', 'dev/wscons/wsdisplay_usl_io.h', 'sys/ioctl.h'], 15+ 'func': check_statement(['sys/types.h', 'dev/wscons/wsdisplay_usl_io.h', 'sys/ioctl.h'],
16+ 'int m; ioctl(0, VT_GETMODE, &m)'), 16+ 'int m; ioctl(0, VT_GETMODE, &m)'),
17+ }, { 17+ }, {
18 'name': 'gbm.h', 18 'name': 'gbm.h',
19 'desc': 'gbm.h', 19 'desc': 'gbm.h',
20 'func': check_cc(header_name=['stdio.h', 'gbm.h']), 20 'func': check_cc(header_name=['stdio.h', 'gbm.h']),
File Added: pkgsrc/multimedia/mpv/patches/patch-wscript__build.py
$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(