mpv: Update to 0.30.0

pkgsrc changes:
 - Drop dependency to libdvdread, no longer supported in favour of libdvdnav
 - Remove `v4l2' option, option was removed and no longer supported
 - Remove patch-audio_out_ao__oss.c, applied upstream

Changes:
Release 0.30.0
==============
This release requires FFmpeg 4.0 or newer.
This release has replaced the internal Vulkan rendering abstraction
with libplacebo's more up-to-date implementation.

Features
--------
Added
~~~~~
- vo_gpu: vulkan: hwdec_cuda: Add support for Vulkan interop
- command: support for async commands
- input: support for named arguments
- cocoa-cb: add support for mac 10.14 Dark mode and run time switching
- vo_gpu: switch to Vulkan API implementation based on libplacebo
- context_drm_egl: Add support for presentation feedback
- vo_gpu: implement error diffusion for dithering
- vo/gpu: hwdec_vdpau: Support direct mode for 4:4:4 content
- vo_gpu: hwdec_vaapi: Add Vulkan interop
- video, TOOLS: add vf_fingerprint and a skip-logo script
- vo_gpu: d3d11: add support for presentation feedback
- vo_drm: 30bpp support
- cocoa-cb: add support for 10bit opengl rendering
- video: add pure gamma TRC curves for 2.0, 2.4 and 2.6
- vo_drm: Implement N-buffering and presentation feedback
- Reintroduce vo_wayland as vo_wlshm
- video: add zimg wrapper
- wayland: add presentation time
- input: add gamepad support through SDL2

Changed
~~~~~~~
- cocoa-cb: use libmpv's advanced rendering control and timing
- vo_gpu: improve tone mapping desaturation
- vo_gpu: redesign peak detection algorithm
- vo_gpu: allow boosting dark scenes when tone mapping
- osc: improve look of seekranges
- vo_gpu: x11: remove special vdpau probing, use EGL by default
- demux: sort filenames naturally when playing a directory / archive
- stream_dvb: rewrite channel switching, remove old stream control
- filters: extend vf_format so that it can convert color parameters

Removed
~~~~~~~
- demux, stream: rip out the classic stream cache
- vo_gpu: removed internal Vulkan implementation
- Remove libdvdread support in favor of libdvdnav
- demux, stream: remove much of the optical disc support
- Remove classic Linux analog TV support, and DVB runtime controls
- demux, stream: remove old rar support in favor of libarchive
- vo_gpu: remove mali-fbdev
- vo_gpu: remove vdpau/GLX backend
- vf_vapourynth: remove Lua backend
- vo_gpu: remove hwdec_d3d11eglrgb

Options and Commands
--------------------
Added
~~~~~
- command: add a subprocess command
- vo_gpu: added --tone-mapping-max-boost, --hdr-peak-decay-rate,
  --hdr-scene-threshold-low/high
- player: add --demuxer-cache-wait option
- Implement backwards playback
- demux: add a on-disk cache
- demux, command: add another stream recording mechanism, `dump-cache` command
- ao_pulse: add --pulse-allow-suspended
- command: add video-add/video-remove/video-reload commands
- demux_cue: added --demuxer-cue-codepage to select CUE sheet charset
- input: add keybind command
- command: add sub-start & sub-end properties
- video/d3d11: added --d3d11-adapter to select a rendering adapter by name
- vo_gpu/d3d11: added --d3d11-output-format for configuring swap chain format

Changed
~~~~~~~
- vo_gpu: split --linear-scaling into --linear-upscaling and
  --linear-downscaling
- vo_gpu: split --tone-mapping-desaturate into strength and exponent
- drm: rename --drm-osd-plane-id to --drm-draw-plane, --drm-video-plane-id to
  --drm-drmprime-video-plane, --drm-osd-size to --drm-draw-surface-size

Deprecated
~~~~~~~~~~
- options: deprecate --video-aspect, replaced by --video-aspect-override
- options: deprecate --record-file, --spirv-compiler

Removed
~~~~~~~
- options: remove deprecated --chapter option
- demux: remove "program" property
- stream: remove "disc-titles", "disc-title", "disc-title-list", and "angle"
  properties
- cocoa-cb: remove --macos-title-bar-style, replaced by
  --macos-title-bar-material and --macos-title-bar-appearance
- spirv: remove support for --spirv-compiler=nvidia (shaderc is the only
  remaining option)

Fixes and Minor Enhancements
----------------------------
- context_drm_egl: implement n-buffering
- cocoa-cb: add support for custom colored title bar
- vo_gpu: x11egl: support Mesa OML sync extension
- demux, demux_edl: add extension for tracks sourced from separate streams
- context_drm_egl: Use eglGetPlatformDisplayEXT if available
- vo_gpu: vulkan: add Android context
- wayland: use xdg-decoration if available
- vo_gpu: glx: use GLX_OML_sync_control for better vsync reporting
- demux: runtime option changing for cache and stream recording
- x11: fix ICC profiling for multiple monitors
- zsh completion: move generation to runtime and improve

9 files changed, 36 insertions, 100 deletions

diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index acc80fa1905..ec0dba7388f 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2019/09/18 14:17:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.88 2019/10/25 14:35:55 leot Exp $
 
-DISTNAME=	mpv-0.29.1
-PKGREVISION=	11
+DISTNAME=	mpv-0.30.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -22,7 +21,6 @@ TOOL_DEPENDS+=	waf>=2.0.9:../../devel/waf
 
 WAF_CONFIGURE_ARGS+=	--bindir=${PREFIX}/bin
 WAF_CONFIGURE_ARGS+=	--enable-dvdnav
-WAF_CONFIGURE_ARGS+=	--enable-dvdread
 WAF_CONFIGURE_ARGS+=	--disable-egl-x11
 WAF_CONFIGURE_ARGS+=	--disable-swift
 
@@ -59,7 +57,6 @@ post-install:
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../multimedia/libdvdnav/buildlink3.mk"
-.include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/multimedia/mpv/PLIST b/multimedia/mpv/PLIST
index 435103392b2..8b6d58253f3 100644
--- a/multimedia/mpv/PLIST
+++ b/multimedia/mpv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2016/07/01 07:47:38 leot Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/10/25 14:35:56 leot Exp $
 bin/mpv
 man/man1/mpv.1
 share/applications/mpv.desktop
@@ -12,3 +12,4 @@ share/icons/hicolor/32x32/apps/mpv.png
 share/icons/hicolor/64x64/apps/mpv.png
 share/icons/hicolor/scalable/apps/mpv.svg
 share/icons/hicolor/symbolic/apps/mpv-symbolic.svg
+share/zsh/site-functions/_mpv
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
index 377e6a11b7a..fa3e7b72876 100644
--- a/multimedia/mpv/distinfo
+++ b/multimedia/mpv/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.54 2019/08/18 17:57:55 nia Exp $
+$NetBSD: distinfo,v 1.55 2019/10/25 14:35:56 leot Exp $
 
-SHA1 (mpv-0.29.1.tar.gz) = 83f2bc0eb5a8bec9a9d5efc7de0e19a442238ac5
-RMD160 (mpv-0.29.1.tar.gz) = 72a4fda3a72ac4fd37ed04435833fa2cf378a012
-SHA512 (mpv-0.29.1.tar.gz) = ec57c9ceaaf2915ee237dd5a1c5ea5d22725d8611e28a9b998e5bb0d8ab5bdf3631d0267fc7b54da31cb1eaa145ef35841e68846bd41c3b9e1024902e92fd086
-Size (mpv-0.29.1.tar.gz) = 3059503 bytes
+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 (patch-audio_out_ao__alsa.c) = c4661d0d22550d6e4eb2b7a42dd04dbcc58123b0
-SHA1 (patch-audio_out_ao__oss.c) = 824c214d0d4464b94e46a922ede4045ae537a534
 SHA1 (patch-options_options.c) = 125282ede99098224fc9c16952b44c12b8b3e06b
-SHA1 (patch-player_main.c) = e794199990059cc95050032194bca70557c381d7
-SHA1 (patch-video_out_drm__common.c) = facb8d99fe31119618866c9af512a60e54b4ea6c
-SHA1 (patch-video_out_wayland__common.c) = 816ee9c59404a50af922b8e4f97fbcd02b20ba45
-SHA1 (patch-wscript) = a908365c0c63745e1d22010c26804789997d4377
+SHA1 (patch-player_main.c) = 19b3553477ce7746f516b3db423f253385e918cf
+SHA1 (patch-video_out_drm__common.c) = a545a8aec29f1b3c44d26aacbc59b86d3333a0b9
+SHA1 (patch-video_out_wayland__common.c) = 2c450f47af5e6390d9ee66275f95ee5d62c67ce4
+SHA1 (patch-wscript) = 2f082a2d3797234bf56859d95c219f5355382224
diff --git a/multimedia/mpv/options.mk b/multimedia/mpv/options.mk
index bbbab80e48e..26307526def 100644
--- a/multimedia/mpv/options.mk
+++ b/multimedia/mpv/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2019/09/14 16:39:26 adam Exp $
+# $NetBSD: options.mk,v 1.20 2019/10/25 14:35:56 leot Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mpv
 
@@ -8,7 +8,7 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.mpv
 PKG_OPTIONS_OPTIONAL_GROUPS=	gl
 PKG_OPTIONS_GROUP.gl=		opengl rpi
 
-PKG_SUPPORTED_OPTIONS+=		alsa ass bluray caca libdrm lua pulseaudio v4l2
+PKG_SUPPORTED_OPTIONS+=		alsa ass bluray caca libdrm lua pulseaudio
 PKG_SUPPORTED_OPTIONS+=		sdl2 wayland x11
 
 .include "../../mk/bsd.fast.prefs.mk"
@@ -100,15 +100,6 @@ WAF_CONFIGURE_ARGS+=	--disable-libass
 .endif
 
 ###
-### V4L2 support
-###
-.if !empty(PKG_OPTIONS:Mv4l2)
-WAF_CONFIGURE_ARGS+=	--enable-libv4l2
-.else
-WAF_CONFIGURE_ARGS+=	--disable-libv4l2
-.endif
-
-###
 ### VAAPI support (video output)
 ###
 .if !empty(PKG_OPTIONS:Mvaapi)
diff --git a/multimedia/mpv/patches/patch-audio_out_ao__oss.c b/multimedia/mpv/patches/patch-audio_out_ao__oss.c
deleted file mode 100644
index 70da1705b74..00000000000
--- a/multimedia/mpv/patches/patch-audio_out_ao__oss.c
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-audio_out_ao__oss.c,v 1.10 2018/10/25 08:31:32 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, fallbacks to stereo.
-
-Shared upstream via:
-
- <https://github.com/mpv-player/mpv/pull/6234>
-
---- audio/out/ao_oss.c.orig	2018-10-02 19:03:41.000000000 +0000
-+++ audio/out/ao_oss.c
-@@ -336,19 +336,23 @@ static int reopen_device(struct ao *ao, 
-             mp_chmap_sel_add_map(&sel, &oss_layouts[n]);
-         if (!ao_chmap_sel_adjust(ao, &sel, &channels))
-             goto fail;
--        int reqchannels = channels.num;
-+        int c, nchannels, reqchannels;
-+        nchannels = reqchannels = channels.num;
-         // We only use SNDCTL_DSP_CHANNELS for >2 channels, in case some drivers don't have it
-         if (reqchannels > 2) {
--            int nchannels = reqchannels;
--            if (ioctl(p->audio_fd, SNDCTL_DSP_CHANNELS, &nchannels) == -1 ||
--                nchannels != reqchannels)
--            {
-+            if (ioctl(p->audio_fd, SNDCTL_DSP_CHANNELS, &nchannels) == -1) {
-                 MP_ERR(ao, "Failed to set audio device to %d channels.\n",
-                        reqchannels);
-                 goto fail;
-             }
-+            if (nchannels != reqchannels) {
-+                // Fallback to stereo
-+                nchannels = 2;
-+                goto stereo;
-+            }
-         } else {
--            int c = reqchannels - 1;
-+stereo:
-+            c = nchannels - 1;
-             if (ioctl(p->audio_fd, SNDCTL_DSP_STEREO, &c) == -1) {
-                 MP_ERR(ao, "Failed to set audio device to %d channels.\n",
-                        reqchannels);
diff --git a/multimedia/mpv/patches/patch-player_main.c b/multimedia/mpv/patches/patch-player_main.c
index 3995ebb6176..438f8c8c2aa 100644
--- a/multimedia/mpv/patches/patch-player_main.c
+++ b/multimedia/mpv/patches/patch-player_main.c
@@ -1,26 +1,20 @@
-$NetBSD: patch-player_main.c,v 1.4 2018/07/25 14:19:16 leot Exp $
+$NetBSD: patch-player_main.c,v 1.5 2019/10/25 14:35:56 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	2018-07-22 16:46:25.000000000 +0000
+--- player/main.c.orig	2019-10-25 13:08:15.000000000 +0000
 +++ player/main.c
-@@ -381,21 +381,6 @@ int mp_initialize(struct MPContext *mpct
+@@ -384,15 +384,6 @@ int mp_initialize(struct MPContext *mpct
      if (handle_help_options(mpctx))
          return 1; // help
  
 -    if (!print_libav_versions(mp_null_log, 0)) {
--        // Using mismatched libraries can be legitimate, but even then it's
--        // a bad idea. We don't acknowledge its usefulness and stability.
--        // Distro maintainers who patch this out should be aware that mpv
--        // intentionally ignores ABI in some places where it's not possible to
--        // get by without violating it.
 -        print_libav_versions(mpctx->log, MSGL_FATAL);
--        MP_FATAL(mpctx, "\nmpv was compiled against a different version of "
+-        MP_FATAL(mpctx, "\nmpv was compiled against an incompatible version of "
 -                 "FFmpeg/Libav than the shared\nlibrary it is linked against. "
 -                 "This is most likely a broken build and could\nresult in "
--                 "misbehavior and crashes.\n\nmpv does not support this "
--                 "configuration and will not run - rebuild mpv instead.\n");
+-                 "misbehavior and crashes.\n\nThis is a broken build.\n");
 -        return -1;
 -    }
 -
diff --git a/multimedia/mpv/patches/patch-video_out_drm__common.c b/multimedia/mpv/patches/patch-video_out_drm__common.c
index 2435b9f860a..e567b76c4f3 100644
--- a/multimedia/mpv/patches/patch-video_out_drm__common.c
+++ b/multimedia/mpv/patches/patch-video_out_drm__common.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-video_out_drm__common.c,v 1.2 2019/02/05 12:07:57 leot Exp $
+$NetBSD: patch-video_out_drm__common.c,v 1.3 2019/10/25 14:35:56 leot Exp $
 
 Enable support for DRM on NetBSD.
 
---- video/out/drm_common.c.orig	2018-10-02 19:03:41.000000000 +0000
+--- video/out/drm_common.c.orig	2019-10-25 13:08:15.000000000 +0000
 +++ video/out/drm_common.c
 @@ -21,7 +21,12 @@
  #include <sys/ioctl.h>
@@ -15,5 +15,5 @@ Enable support for DRM on NetBSD.
  #include <sys/vt.h>
 +#endif
  #include <unistd.h>
- 
- #include "drm_common.h"
+ #include <limits.h>
+ #include <math.h>
diff --git a/multimedia/mpv/patches/patch-video_out_wayland__common.c b/multimedia/mpv/patches/patch-video_out_wayland__common.c
index 30a2ff3008a..521c7b94f99 100644
--- a/multimedia/mpv/patches/patch-video_out_wayland__common.c
+++ b/multimedia/mpv/patches/patch-video_out_wayland__common.c
@@ -1,14 +1,13 @@
-$NetBSD: patch-video_out_wayland__common.c,v 1.1 2019/08/18 17:57:55 nia Exp $
+$NetBSD: patch-video_out_wayland__common.c,v 1.2 2019/10/25 14:35:56 leot Exp $
 
 Allow building on systems without evdev.
 
---- video/out/wayland_common.c.orig	2018-10-02 19:03:41.000000000 +0000
+--- video/out/wayland_common.c.orig	2019-10-25 13:08:15.000000000 +0000
 +++ video/out/wayland_common.c
-@@ -16,8 +16,14 @@
-  */
- 
+@@ -19,7 +19,13 @@
+ #include <limits.h>
  #include <poll.h>
--#include <unistd.h>
+ #include <unistd.h>
 +#if defined(__linux) || defined(__FreeBSD__)
  #include <linux/input.h>
 +#else
@@ -16,7 +15,6 @@ Allow building on systems without evdev.
 +#define BTN_MIDDLE	(1)
 +#define BTN_RIGHT	(2)
 +#endif
-+#include <unistd.h>
+ #include <time.h>
  #include "common/msg.h"
- #include "input/input.h"
- #include "input/keycodes.h"
+ #include "options/m_config.h"
diff --git a/multimedia/mpv/patches/patch-wscript b/multimedia/mpv/patches/patch-wscript
index 79aff8d774c..eb6a6ec2eb7 100644
--- a/multimedia/mpv/patches/patch-wscript
+++ b/multimedia/mpv/patches/patch-wscript
@@ -1,10 +1,10 @@
-$NetBSD: patch-wscript,v 1.2 2019/02/05 12:07:57 leot Exp $
+$NetBSD: patch-wscript,v 1.3 2019/10/25 14:35:56 leot Exp $
 
 Enable support for DRM on NetBSD.
 
---- wscript.orig	2018-10-02 19:03:41.000000000 +0000
+--- wscript.orig	2019-10-25 13:08:15.000000000 +0000
 +++ wscript
-@@ -276,6 +276,11 @@ iconv support use --disable-iconv.",
+@@ -289,6 +289,11 @@ iconv support use --disable-iconv.",
          'func': check_statement(['sys/vt.h', 'sys/ioctl.h'],
                                  'int m; ioctl(0, VT_GETMODE, &m)'),
      }, {
@@ -16,14 +16,12 @@ Enable support for DRM on NetBSD.
          'name': 'gbm.h',
          'desc': 'gbm.h',
          'func': check_cc(header_name=['stdio.h', 'gbm.h']),
-@@ -550,8 +555,8 @@ video_output_features = [
+@@ -584,7 +589,7 @@ video_output_features = [
      }, {
          'name': '--drm',
          'desc': 'DRM',
 -        'deps': 'vt.h',
--        'func': check_pkg_config('libdrm'),
 +        'deps': 'vt.h || wsdisplay_usl_io.h',
-+        'func': check_pkg_config('libdrm')
+         'func': check_pkg_config('libdrm', '>= 2.4.74'),
      }, {
          'name': '--drmprime',
-         'desc': 'DRM Prime ffmpeg support',