mpv: Update to 0.31.0

Changes:
0.31.0
======
Features
--------
Added
~~~~~
- vo_gpu/d3d11: allow configurable swapchain color space for native HDR output
- player: add mechanisms for better logging as preperation for console.lua
- audio: add ao_audiotrack for Android
- input: introduce a pseudo key name that grabs all text input
- wayland: add grab zone for resizing window with mouse
- osc: implement pseudo client side decorations via OSC
- vf_gpu: add video filter using vo_gpu's renderer
- added console.lua: interactive REPL for input commands
- osc: display Santa hat for idle logo in December
- vd_lavc: add option to autoselect known good hwdec implementations
- mac: replace old event tap for media key support with MediaPlayer

Changed
~~~~~~~
- input: disable gamepad code by default
- vo_gpu: allow vdpau usage under EGL
- stream, demux: redo origin policy

Removed
~~~~~~~
- mac: remove Apple Remote support
- client API: deprecate tick event

Options and Commands
--------------------
Added
~~~~~
- vo_gpu/d3d11: add --d3d11-output-csp for configuring swap chain color space
- command: add command-list property
- command, input: add input-bindings property
- command: add --window-maximized and make --window-minimized settable
- command: add property returning hidpi scale
- command, lua: add a way to share data between scripts
- client API, lua: add new API for setting OSD overlays

Changed
~~~~~~~
- add a builtin "sw-fast" profile, which restores performance settings
  for software video conversion. These were switched to higher quality.
  This affects video outputs like vo_x11 and vo_drm, and screenshots.
- options: make --show-profile without parameters list all profiles
- wayland: support for --hidpi-window-scale option
- stream_lavf: set --network-timeout to 60 seconds by default
- x11: scale window-scale by DPI

Deprecated
~~~~~~~~~~
- deprecate --input-file
- deprecate --video-sync=display-adrop
- deprecate all input section commands
- deprecate --display-fps, replaced by --override-display-fps

Removed
~~~~~~~
- remove deprecated --playlist-pos alias

Fixes and Minor Enhancements
----------------------------
- vo_drm, vo_x11: allow use of zimg
- vo_sdl: Support mouse wheel input, Improve mouse button input
- video: fix track switching work for external images
- vo_gpu: fix infinite scaler reinit spam
- f_output_chain: fix possible crash when changing filters
- vo_gpu: opengl: add hack for ancient Mesa/GLX
- demux_lavf: export demuxer_id for more formats which have it
- lua: make later key bindings always have higher priority
- drm_common: fix display FPS estimation for interlaced modes
- vo_drm: fix incorrect pixel format possibly being picked for 30-bit
- zsh completion: fix pcre usage to really be optional
- options: increase consistency between list options and document them
- osc: reduce unnecesary CPU usage by using property notifications

4 files changed, 23 insertions, 19 deletions

diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index ec0dba7388f..8bbd7881c8c 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.88 2019/10/25 14:35:55 leot Exp $
+# $NetBSD: Makefile,v 1.89 2019/12/28 17:20:32 leot Exp $
 
-DISTNAME=	mpv-0.30.0
+DISTNAME=	mpv-0.31.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
index 39a518bfd6f..edc1bd1dcc2 100644
--- a/multimedia/mpv/distinfo
+++ b/multimedia/mpv/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.57 2019/12/10 10:45:07 nia Exp $
+$NetBSD: distinfo,v 1.58 2019/12/28 17:20:32 leot Exp $
 
-SHA1 (mpv-0.30.0.tar.gz) = 94da9cc423339a8d4f583542a4e7c5f794b82e7b
-RMD160 (mpv-0.30.0.tar.gz) = e0272a0ef7dfd58ba6b05a84bd2c0217f36dff3f
-SHA512 (mpv-0.30.0.tar.gz) = 2b3cc626575b5e56308f5f9ecf926957a36c861c85f700a4a3ede72cf7f7ea08729d20f810693117e21aeeff649f08718e73ead7d117521bf88d746708a72c66
-Size (mpv-0.30.0.tar.gz) = 3085141 bytes
+SHA1 (mpv-0.31.0.tar.gz) = 1cf3d2c86139ebea3facce594fa0c64c54a4f45e
+RMD160 (mpv-0.31.0.tar.gz) = 59d296e9a25cf5e6ccaf7ec098814e5e7724d6f1
+SHA512 (mpv-0.31.0.tar.gz) = 5199183d35bc2d7fffde1af250edf829fe768cedd7aa00f424d2a11a11d82cdb451c62886159ba3e1efc407b242c25e2485f4ebffd13b1da9c70defbd1f4c309
+Size (mpv-0.31.0.tar.gz) = 3142672 bytes
 SHA1 (patch-audio_out_ao__alsa.c) = c4661d0d22550d6e4eb2b7a42dd04dbcc58123b0
-SHA1 (patch-options_options.c) = 125282ede99098224fc9c16952b44c12b8b3e06b
-SHA1 (patch-player_main.c) = 19b3553477ce7746f516b3db423f253385e918cf
+SHA1 (patch-options_options.c) = 0c711323e2cd46948852476144ed0e07418394b4
+SHA1 (patch-player_main.c) = 7d1d62091c327fca698844004ddb9a7871e15fce
 SHA1 (patch-video_out_drm__common.c) = a545a8aec29f1b3c44d26aacbc59b86d3333a0b9
 SHA1 (patch-video_out_wayland__common.c) = d3e72c4ff5426bd8349c15679a47d446c35666b1
 SHA1 (patch-wscript) = 2f082a2d3797234bf56859d95c219f5355382224
diff --git a/multimedia/mpv/patches/patch-options_options.c b/multimedia/mpv/patches/patch-options_options.c
index c29596e5538..7e2d79681f6 100644
--- a/multimedia/mpv/patches/patch-options_options.c
+++ b/multimedia/mpv/patches/patch-options_options.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-options_options.c,v 1.1 2019/06/04 13:55:43 nia Exp $
+$NetBSD: patch-options_options.c,v 1.2 2019/12/28 17:20:33 leot Exp $
 
 autosync=0 requires "a perfect audio delay measurement".
 
@@ -6,9 +6,10 @@ NetBSD does not provide this. Setting it to 30 (as recommended in
 mpv's man page) fixes frame drops in NetBSD.
 
 PR kern/54230
---- options/options.c.orig	2018-10-02 19:03:41.000000000 +0000
+
+--- options/options.c.orig	2019-12-28 11:07:07.000000000 +0000
 +++ options/options.c
-@@ -972,6 +972,10 @@ const struct MPOpts mp_default_opts = {
+@@ -992,6 +992,10 @@ static const struct MPOpts mp_default_op
      },
  
      .cuda_device = -1,
@@ -18,4 +19,4 @@ PR kern/54230
 +#endif
  };
  
- #endif /* MPLAYER_CFG_MPLAYER_H */
+ const struct m_sub_options mp_opt_root = {
diff --git a/multimedia/mpv/patches/patch-player_main.c b/multimedia/mpv/patches/patch-player_main.c
index 438f8c8c2aa..bc2188c41d5 100644
--- a/multimedia/mpv/patches/patch-player_main.c
+++ b/multimedia/mpv/patches/patch-player_main.c
@@ -1,15 +1,18 @@
-$NetBSD: patch-player_main.c,v 1.5 2019/10/25 14:35:56 leot Exp $
+$NetBSD: patch-player_main.c,v 1.6 2019/12/28 17:20:33 leot Exp $
 
 Avoid to check mismatched built vs running libraries version.
 The use in pkgsrc can be considered a legitimate one.
 
---- player/main.c.orig	2019-10-25 13:08:15.000000000 +0000
+--- player/main.c.orig	2019-12-28 11:07:07.000000000 +0000
 +++ player/main.c
-@@ -384,15 +384,6 @@ int mp_initialize(struct MPContext *mpct
+@@ -387,18 +387,6 @@ int mp_initialize(struct MPContext *mpct
      if (handle_help_options(mpctx))
          return 1; // help
  
 -    if (!print_libav_versions(mp_null_log, 0)) {
+-        // This happens only if the runtime FFmpeg version is lower than the
+-        // build version, which will not work according to FFmpeg's ABI rules.
+-        // This does not happen if runtime FFmpeg is newer, which is compatible.
 -        print_libav_versions(mpctx->log, MSGL_FATAL);
 -        MP_FATAL(mpctx, "\nmpv was compiled against an incompatible version of "
 -                 "FFmpeg/Libav than the shared\nlibrary it is linked against. "
@@ -18,6 +21,6 @@ The use in pkgsrc can be considered a legitimate one.
 -        return -1;
 -    }
 -
-     if (!mpctx->playlist->first && !opts->player_idle_mode) {
-         // nothing to play
-         mp_print_version(mpctx->log, true);
+ #if HAVE_TESTS
+     if (opts->test_mode && opts->test_mode[0])
+         return run_tests(mpctx) ? 1 : -1;