CVS commit: pkgsrc/multimedia/mpv

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sat Jul 22 17:28:38 UTC 2017

Modified Files:
        pkgsrc/multimedia/mpv: Makefile distinfo
        pkgsrc/multimedia/mpv/patches: patch-audio_out_ao__oss.c

Log Message:
Update multimedia/mpv to 0.26.0

pkgsrc changes:
 - Adjust SUBST `audio' class after recent ao_oss changes
 - Backport a patch to fix issue #4642 (`ao_oss: fix a dumb calculation').

Changes:
Release 0.26.0
==============
VA-API/VDPAU hardware decoding now requires FFmpeg > 3.2.
DVB support is disabled by default since it does not work with some older kernels.
Built-in V4L TV support is disabled by default. av://v4l2 can be used instead.
Support for C plugins is now enabled by default (#4491).

Many more parts of the player are now licensed under LGPL, see Copyright file.
Thanks to all contributors who have agreed to relicensing of their changes!
See #2033 for details.

Features
--------
Added
~~~~~
- Universal Windows Plaform (UWP) support (libmpv only)
- csputils: implement sony s-gamut
- js: add javascript scripting support using MuJS
  See DOCS/man/javascript.rst for more details
- vo_opengl: add new HDR tone mapping algorithm (mobius, now default)
- vo_opengl: hwdec_cuda: Support separate decode and display devices
- vo_opengl: implement sony s-log1 and s-log2 trc
- vo_opengl: implement support for OOTFs and non-display referred content

Removed
~~~~~~~
- vf_dlopen: remove this filter

Options and Commands
--------------------
Added
~~~~~
- vo_opengl: add --tone-mapping-desaturate
- vo_opengl: support tone-mapping-param for `clip`
- ytdl_hook: add option to exclude URLs from being parsed

Changed
~~~~~~~
- allow setting profile option with libmpv
- audio: move replaygain control to top-level options
- external_files: parse ~ in --{sub,audio}-paths
- options: change --sub-fix-timing default to no (#4484)
- options: expose string list actions for --sub-file option
- options: slight cleanup of --sub-ass-style-override
  * signfs → scale
  * --sub-ass-style-override → --sub-ass-override
- renamed the HDR TRCs `st2084` and `std-b67` to `pq` and `hlg` respectively
- replace vf_format's `peak` suboption by `sig-peak`, which is relative to the reference white level instead of in cd/m^2
- the following options change to append-by-default (and possibly separator):
  * --script
- video: change --video-aspect-method default value to `container`

Deprecated
~~~~~~~~~~
- m_option: deprecate multiple items for -add etc.
- player: deprecate "osd" command
- --audio-file-paths => --audio-file-path
- --sub-paths => --sub-file-path
- --opengl-shaders => --opengl-shader
- --sub-paths => --sub-file-paths
- the following options are deprecated for setting via API:
  * "script" (use "scripts")
  * "sub-file" (use "sub-files")
  * "audio-file" (use "audio-files")
  * "external-file" (use "external-files")
  (the compatibility hacks for this will be removed after this release)

Removed
~~~~~~~
- chmap: remove misleading "downmix" channel layout name (#4545)
- demux_lavf: remove --demuxer-lavf-cryptokey option (#4579)
- input.conf: drop TV/DVB bindings
- options: remove remaining deprecated audio device selection options
  * --alsa-device
  * --oss-device
  * --coreaudio-exclusive
  * --pulse-sink
  * --rsound-host/--rsound-port
  * --ao-sndio-device
  * --ao-wasapi-exclusive
  * --ao-wasapi-device
- remove option --target-brightness
- remove property "video-params/nom-peak"

Fixes and Minor Enhancements
----------------------------
- TOOLS/lua/autoload.lua: actually sort files case insensitive (#4398)
- TOOLS/lua/autoload.lua: ignores all files starting with "."
- ao_openal: kill off device listing (#4311)
- ao_pulse: reorder format choice to prefer float and S32 over S16 as fallback format
- ao_wasapi: try correct initial format (#4582)
- command: add missing change notification for playlist-shuffle (#4573)
- demux_disc: fix bluray subtitle language retrieval (#4611)
- demux_mkv: fix alpha with vp9 + libvpx
- demux_mkv: support FFmpeg A_MS/ACM extensions
- ipc-unix: don’t truncate the message on EAGAIN (#4452)
- ipc: raise json nesting limit (#4394)
- macOS: fix mpv-wrapper.sh when used with csh or tcsh shell
- macOS: properly unhide Dock when quitting during System fs animation
- mpv_identify: replace deprecated fps property (#4550)
- options/path: fallback to USERPROFILE if HOME isn't set
- player: close audio device on no audio track
- player: fix potential segfault when playing dvd:// with DVD disabled (#4393)
- player: prevent seek position to jump around adjacent keyframes, e.g. when dragging the OSC bar on short videos (#4183)
- vo_opengl: bump up SHADER_MAX_HOOKS and MAX_TEXTURE_HOOKS to 64
- vo_opengl: correct off-by-one in scale=oversample
- vo_opengl: do not use vaapi-over-GLX (#4555)
- vo_opengl: fall back to ordered dither instead of blowing up (#4519)
- vo_opengl: tone map in linear XYZ instead of RGB
- x11: add 128x128 sized icon support
- ytdl_hook: add a header to support geo-bypass
- ytdl_hook: don't override start time set by saved state
- ytdl_hook: don't override user-set start time
- ytdl_hook: treat single-entry playlists as a single video


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/multimedia/mpv/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__oss.c

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.56 pkgsrc/multimedia/mpv/Makefile:1.57
--- pkgsrc/multimedia/mpv/Makefile:1.56 Sun Jul 16 12:06:25 2017
+++ pkgsrc/multimedia/mpv/Makefile      Sat Jul 22 17:28:38 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2017/07/16 12:06:25 leot Exp $
+# $NetBSD: Makefile,v 1.57 2017/07/22 17:28:38 leot Exp $
 
-DISTNAME=      mpv-0.25.0
-PKGREVISION=   1
+DISTNAME=      mpv-0.26.0
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -30,7 +29,7 @@ CONF_FILES+=          share/examples/mpv/encodin
 
 SUBST_CLASSES+=                audio
 SUBST_SED.audio+=      -e "s,/dev/dsp,${DEVOSSAUDIO},"
-SUBST_FILES.audio+=    stream/audio_in.c waftools/checks/custom.py wscript
+SUBST_FILES.audio+=    audio/out/ao_oss.c stream/ai_oss.c
 SUBST_STAGE.audio=     pre-configure
 SUBST_MESSAGE.audio=   Fixing path to audio device.
 

Index: pkgsrc/multimedia/mpv/distinfo
diff -u pkgsrc/multimedia/mpv/distinfo:1.35 pkgsrc/multimedia/mpv/distinfo:1.36
--- pkgsrc/multimedia/mpv/distinfo:1.35 Sun Jul 16 12:06:25 2017
+++ pkgsrc/multimedia/mpv/distinfo      Sat Jul 22 17:28:38 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.35 2017/07/16 12:06:25 leot Exp $
+$NetBSD: distinfo,v 1.36 2017/07/22 17:28:38 leot Exp $
 
-SHA1 (mpv-0.25.0.tar.gz) = fe98e9afe0a5ed04ef957cb2d0bf014b5c6c6665
-RMD160 (mpv-0.25.0.tar.gz) = fd9c2ebe95ae121de8f2f17aa4e36711457ed758
-SHA512 (mpv-0.25.0.tar.gz) = eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf
-Size (mpv-0.25.0.tar.gz) = 2874584 bytes
-SHA1 (patch-audio_out_ao__oss.c) = 518f87f39e56d764046a198a9f9429e3c051d67a
+SHA1 (mpv-0.26.0.tar.gz) = e384ec257aac966e0da821f873d8f12439e92796
+RMD160 (mpv-0.26.0.tar.gz) = 9b0c95f416070f5b0a88a6934d004fc33144dff6
+SHA512 (mpv-0.26.0.tar.gz) = fd772b4765317eb1ea3b54f12b86e0ac6c4d5e9d16895eb5bebe2e074a01f6b790981b9b34a87d9b23e4291149d3a7154b09fba4a259cec1949a6aa88d6ddec7
+Size (mpv-0.26.0.tar.gz) = 2916212 bytes
+SHA1 (patch-audio_out_ao__oss.c) = 31b8d0966a0a306a15fbb32876d5556e9f1a61a8
 SHA1 (patch-player_main.c) = 842432e448526a9d170e7efd2b01276e36072e16

Index: pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__oss.c
diff -u pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__oss.c:1.4 pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__oss.c:1.5
--- pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__oss.c:1.4 Sun Jul 16 12:06:25 2017
+++ pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__oss.c     Sat Jul 22 17:28:38 2017
@@ -1,14 +1,16 @@
-$NetBSD: patch-audio_out_ao__oss.c,v 1.4 2017/07/16 12:06:25 leot Exp $
+$NetBSD: patch-audio_out_ao__oss.c,v 1.5 2017/07/22 17:28:38 leot Exp $
 
-ioctl(..., SNDCTL_DSP_CHANNELS, &nchannels) for not supported nchannels does not
-return an error and instead set nchannels to the default value. Instead of
-failing with no audio, fallback to stereo or mono.
+- ioctl(..., SNDCTL_DSP_CHANNELS, &nchannels) for not supported nchannels does not
+  return an error and instead set nchannels to the default value. Instead of
+  failing with no audio, fallback to stereo or mono.
+  Fallback logic inspired by `OSS v3 Programmer's guide', p. 34.
+- Backport fix for issue #4642: `ao_oss: fix a dumb calculation', period_size
+  used the wrong unit, and even if the unit had been correct, was assigned the
+  wrong value.
 
-Fallback logic inspired by `OSS v3 Programmer's guide', p. 34.
-
---- audio/out/ao_oss.c.orig    2017-02-12 01:31:16.000000000 +0000
+--- audio/out/ao_oss.c.orig    2017-07-22 17:01:42.955374723 +0000
 +++ audio/out/ao_oss.c
-@@ -345,13 +345,26 @@ static int reopen_device(struct ao *ao, 
+@@ -332,13 +332,26 @@ static int reopen_device(struct ao *ao, 
          // We only use SNDCTL_DSP_CHANNELS for >2 channels, in case some drivers don't have it
          if (reqchannels > 2) {
              int nchannels = reqchannels;
@@ -38,3 +40,15 @@ Fallback logic inspired by `OSS v3 Progr
          } else {
              int c = reqchannels - 1;
              if (ioctl(p->audio_fd, SNDCTL_DSP_STEREO, &c) == -1) {
+@@ -387,8 +400,9 @@ static int reopen_device(struct ao *ao, 
+         }
+     }
+ 
+-    ao->period_size = channels.num * af_fmt_to_bytes(format);
+-    p->outburst -= p->outburst % ao->period_size; // round down
++    int sstride = channels.num * af_fmt_to_bytes(format);
++    p->outburst -= p->outburst % sstride; // round down
++    ao->period_size = p->outburst / sstride;
+ 
+     return 0;
+