Fri Oct 25 14:35:56 2019 UTC ()
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


(leot)
diff -r1.87 -r1.88 pkgsrc/multimedia/mpv/Makefile
diff -r1.7 -r1.8 pkgsrc/multimedia/mpv/PLIST
diff -r1.54 -r1.55 pkgsrc/multimedia/mpv/distinfo
diff -r1.19 -r1.20 pkgsrc/multimedia/mpv/options.mk
diff -r1.10 -r0 pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__oss.c
diff -r1.4 -r1.5 pkgsrc/multimedia/mpv/patches/patch-player_main.c
diff -r1.2 -r1.3 pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.c
diff -r1.2 -r1.3 pkgsrc/multimedia/mpv/patches/patch-wscript
diff -r1.1 -r1.2 pkgsrc/multimedia/mpv/patches/patch-video_out_wayland__common.c
cvs diff -r1.87 -r1.88 pkgsrc/multimedia/mpv/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/Makefile 2019/09/18 14:17:14 1.87
+++ pkgsrc/multimedia/mpv/Makefile 2019/10/25 14:35:55 1.88
@@ -1,38 +1,36 @@ @@ -1,38 +1,36 @@
1# $NetBSD: Makefile,v 1.87 2019/09/18 14:17:14 ryoon Exp $ 1# $NetBSD: Makefile,v 1.88 2019/10/25 14:35:55 leot Exp $
2 2
3DISTNAME= mpv-0.29.1 3DISTNAME= mpv-0.30.0
4PKGREVISION= 11 
5CATEGORIES= multimedia 4CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
8 7
9MAINTAINER= leot@NetBSD.org 8MAINTAINER= leot@NetBSD.org
10HOMEPAGE= https://mpv.io/ 9HOMEPAGE= https://mpv.io/
11COMMENT= Video player based on MPlayer and mplayer2 10COMMENT= Video player based on MPlayer and mplayer2
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
13 12
14# needs sem_timedwait(3) 13# needs sem_timedwait(3)
15NOT_FOR_PLATFORM= NetBSD-[1-6].*-* 14NOT_FOR_PLATFORM= NetBSD-[1-6].*-*
16 15
17NOT_PAX_MPROTECT_SAFE+= bin/mpv 16NOT_PAX_MPROTECT_SAFE+= bin/mpv
18 17
19TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils 18TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
20# ${WRKSRC}/bootstrap.py mentions needed version 19# ${WRKSRC}/bootstrap.py mentions needed version
21TOOL_DEPENDS+= waf>=2.0.9:../../devel/waf 20TOOL_DEPENDS+= waf>=2.0.9:../../devel/waf
22 21
23WAF_CONFIGURE_ARGS+= --bindir=${PREFIX}/bin 22WAF_CONFIGURE_ARGS+= --bindir=${PREFIX}/bin
24WAF_CONFIGURE_ARGS+= --enable-dvdnav 23WAF_CONFIGURE_ARGS+= --enable-dvdnav
25WAF_CONFIGURE_ARGS+= --enable-dvdread 
26WAF_CONFIGURE_ARGS+= --disable-egl-x11 24WAF_CONFIGURE_ARGS+= --disable-egl-x11
27WAF_CONFIGURE_ARGS+= --disable-swift 25WAF_CONFIGURE_ARGS+= --disable-swift
28 26
29PYTHON_FOR_BUILD_ONLY= yes 27PYTHON_FOR_BUILD_ONLY= yes
30 28
31USE_TOOLS+= perl pkg-config 29USE_TOOLS+= perl pkg-config
32 30
33MAKE_DIRS= ${PKG_SYSCONFDIR}/mpv 31MAKE_DIRS= ${PKG_SYSCONFDIR}/mpv
34INSTALLATION_DIRS= share/examples/mpv 32INSTALLATION_DIRS= share/examples/mpv
35CONF_FILES+= share/examples/mpv/encoding-profiles.conf ${PKG_SYSCONFDIR}/mpv/encoding-profiles.conf 33CONF_FILES+= share/examples/mpv/encoding-profiles.conf ${PKG_SYSCONFDIR}/mpv/encoding-profiles.conf
36 34
37SUBST_CLASSES+= audio 35SUBST_CLASSES+= audio
38SUBST_SED.audio+= -e "s,/dev/dsp,${DEVOSSAUDIO}," 36SUBST_SED.audio+= -e "s,/dev/dsp,${DEVOSSAUDIO},"
@@ -49,19 +47,18 @@ SUBST_MESSAGE.python= Fix Python command @@ -49,19 +47,18 @@ SUBST_MESSAGE.python= Fix Python command
49 47
50post-install: 48post-install:
51 cd ${DESTDIR}${PREFIX} && ${MV} etc/mpv/encoding-profiles.conf share/examples/mpv 49 cd ${DESTDIR}${PREFIX} && ${MV} etc/mpv/encoding-profiles.conf share/examples/mpv
52 50
53.include "options.mk" 51.include "options.mk"
54 52
55.include "../../mk/oss.buildlink3.mk" 53.include "../../mk/oss.buildlink3.mk"
56.include "../../converters/libiconv/buildlink3.mk" 54.include "../../converters/libiconv/buildlink3.mk"
57.include "../../devel/waf/waf.mk" 55.include "../../devel/waf/waf.mk"
58.include "../../devel/zlib/buildlink3.mk" 56.include "../../devel/zlib/buildlink3.mk"
59.include "../../graphics/lcms2/buildlink3.mk" 57.include "../../graphics/lcms2/buildlink3.mk"
60.include "../../lang/python/application.mk" 58.include "../../lang/python/application.mk"
61.include "../../multimedia/libdvdnav/buildlink3.mk" 59.include "../../multimedia/libdvdnav/buildlink3.mk"
62.include "../../multimedia/libdvdread/buildlink3.mk" 
63.include "../../multimedia/ffmpeg4/buildlink3.mk" 60.include "../../multimedia/ffmpeg4/buildlink3.mk"
64.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 61.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
65.include "../../sysutils/desktop-file-utils/desktopdb.mk" 62.include "../../sysutils/desktop-file-utils/desktopdb.mk"
66.include "../../mk/jpeg.buildlink3.mk" 63.include "../../mk/jpeg.buildlink3.mk"
67.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/mpv/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/PLIST 2016/07/01 07:47:38 1.7
+++ pkgsrc/multimedia/mpv/PLIST 2019/10/25 14:35:56 1.8
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1@comment $NetBSD: PLIST,v 1.7 2016/07/01 07:47:38 leot Exp $ 1@comment $NetBSD: PLIST,v 1.8 2019/10/25 14:35:56 leot Exp $
2bin/mpv 2bin/mpv
3man/man1/mpv.1 3man/man1/mpv.1
4share/applications/mpv.desktop 4share/applications/mpv.desktop
5share/doc/mpv/input.conf 5share/doc/mpv/input.conf
6share/doc/mpv/mplayer-input.conf 6share/doc/mpv/mplayer-input.conf
7share/doc/mpv/mpv.conf 7share/doc/mpv/mpv.conf
8share/doc/mpv/restore-old-bindings.conf 8share/doc/mpv/restore-old-bindings.conf
9share/examples/mpv/encoding-profiles.conf 9share/examples/mpv/encoding-profiles.conf
10share/icons/hicolor/16x16/apps/mpv.png 10share/icons/hicolor/16x16/apps/mpv.png
11share/icons/hicolor/32x32/apps/mpv.png 11share/icons/hicolor/32x32/apps/mpv.png
12share/icons/hicolor/64x64/apps/mpv.png 12share/icons/hicolor/64x64/apps/mpv.png
13share/icons/hicolor/scalable/apps/mpv.svg 13share/icons/hicolor/scalable/apps/mpv.svg
14share/icons/hicolor/symbolic/apps/mpv-symbolic.svg 14share/icons/hicolor/symbolic/apps/mpv-symbolic.svg
 15share/zsh/site-functions/_mpv
cvs diff -r1.54 -r1.55 pkgsrc/multimedia/mpv/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/distinfo 2019/08/18 17:57:55 1.54
+++ pkgsrc/multimedia/mpv/distinfo 2019/10/25 14:35:56 1.55
@@ -1,13 +1,12 @@ @@ -1,13 +1,12 @@
1$NetBSD: distinfo,v 1.54 2019/08/18 17:57:55 nia Exp $ 1$NetBSD: distinfo,v 1.55 2019/10/25 14:35:56 leot Exp $
2 2
3SHA1 (mpv-0.29.1.tar.gz) = 83f2bc0eb5a8bec9a9d5efc7de0e19a442238ac5 3SHA1 (mpv-0.30.0.tar.gz) = 94da9cc423339a8d4f583542a4e7c5f794b82e7b
4RMD160 (mpv-0.29.1.tar.gz) = 72a4fda3a72ac4fd37ed04435833fa2cf378a012 4RMD160 (mpv-0.30.0.tar.gz) = e0272a0ef7dfd58ba6b05a84bd2c0217f36dff3f
5SHA512 (mpv-0.29.1.tar.gz) = ec57c9ceaaf2915ee237dd5a1c5ea5d22725d8611e28a9b998e5bb0d8ab5bdf3631d0267fc7b54da31cb1eaa145ef35841e68846bd41c3b9e1024902e92fd086 5SHA512 (mpv-0.30.0.tar.gz) = 2b3cc626575b5e56308f5f9ecf926957a36c861c85f700a4a3ede72cf7f7ea08729d20f810693117e21aeeff649f08718e73ead7d117521bf88d746708a72c66
6Size (mpv-0.29.1.tar.gz) = 3059503 bytes 6Size (mpv-0.30.0.tar.gz) = 3085141 bytes
7SHA1 (patch-audio_out_ao__alsa.c) = c4661d0d22550d6e4eb2b7a42dd04dbcc58123b0 7SHA1 (patch-audio_out_ao__alsa.c) = c4661d0d22550d6e4eb2b7a42dd04dbcc58123b0
8SHA1 (patch-audio_out_ao__oss.c) = 824c214d0d4464b94e46a922ede4045ae537a534 
9SHA1 (patch-options_options.c) = 125282ede99098224fc9c16952b44c12b8b3e06b 8SHA1 (patch-options_options.c) = 125282ede99098224fc9c16952b44c12b8b3e06b
10SHA1 (patch-player_main.c) = e794199990059cc95050032194bca70557c381d7 9SHA1 (patch-player_main.c) = 19b3553477ce7746f516b3db423f253385e918cf
11SHA1 (patch-video_out_drm__common.c) = facb8d99fe31119618866c9af512a60e54b4ea6c 10SHA1 (patch-video_out_drm__common.c) = a545a8aec29f1b3c44d26aacbc59b86d3333a0b9
12SHA1 (patch-video_out_wayland__common.c) = 816ee9c59404a50af922b8e4f97fbcd02b20ba45 11SHA1 (patch-video_out_wayland__common.c) = 2c450f47af5e6390d9ee66275f95ee5d62c67ce4
13SHA1 (patch-wscript) = a908365c0c63745e1d22010c26804789997d4377 12SHA1 (patch-wscript) = 2f082a2d3797234bf56859d95c219f5355382224
cvs diff -r1.19 -r1.20 pkgsrc/multimedia/mpv/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/options.mk 2019/09/14 16:39:26 1.19
+++ pkgsrc/multimedia/mpv/options.mk 2019/10/25 14:35:56 1.20
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: options.mk,v 1.19 2019/09/14 16:39:26 adam Exp $ 1# $NetBSD: options.mk,v 1.20 2019/10/25 14:35:56 leot Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mpv 3PKG_OPTIONS_VAR= PKG_OPTIONS.mpv
4 4
5.include "../../multimedia/libva/available.mk" 5.include "../../multimedia/libva/available.mk"
6.include "../../multimedia/libvdpau/available.mk" 6.include "../../multimedia/libvdpau/available.mk"
7 7
8PKG_OPTIONS_OPTIONAL_GROUPS= gl 8PKG_OPTIONS_OPTIONAL_GROUPS= gl
9PKG_OPTIONS_GROUP.gl= opengl rpi 9PKG_OPTIONS_GROUP.gl= opengl rpi
10 10
11PKG_SUPPORTED_OPTIONS+= alsa ass bluray caca libdrm lua pulseaudio v4l2 11PKG_SUPPORTED_OPTIONS+= alsa ass bluray caca libdrm lua pulseaudio
12PKG_SUPPORTED_OPTIONS+= sdl2 wayland x11 12PKG_SUPPORTED_OPTIONS+= sdl2 wayland x11
13 13
14.include "../../mk/bsd.fast.prefs.mk" 14.include "../../mk/bsd.fast.prefs.mk"
15PKG_SUGGESTED_OPTIONS= ass bluray lua sdl2 15PKG_SUGGESTED_OPTIONS= ass bluray lua sdl2
16PKG_SUGGESTED_OPTIONS.Linux+= alsa 16PKG_SUGGESTED_OPTIONS.Linux+= alsa
17.if ${OPSYS} != "Darwin" 17.if ${OPSYS} != "Darwin"
18PKG_SUGGESTED_OPTIONS+= opengl libdrm x11 18PKG_SUGGESTED_OPTIONS+= opengl libdrm x11
19.endif 19.endif
20.if ${VAAPI_AVAILABLE} == "yes" 20.if ${VAAPI_AVAILABLE} == "yes"
21PKG_SUPPORTED_OPTIONS+= vaapi 21PKG_SUPPORTED_OPTIONS+= vaapi
22PKG_SUGGESTED_OPTIONS+= vaapi 22PKG_SUGGESTED_OPTIONS+= vaapi
23.endif 23.endif
24.if ${VDPAU_AVAILABLE} == "yes" 24.if ${VDPAU_AVAILABLE} == "yes"
@@ -90,35 +90,26 @@ WAF_CONFIGURE_ARGS+= --disable-sdl2 @@ -90,35 +90,26 @@ WAF_CONFIGURE_ARGS+= --disable-sdl2
90.endif 90.endif
91 91
92### 92###
93### libASS support 93### libASS support
94### 94###
95.if !empty(PKG_OPTIONS:Mass) 95.if !empty(PKG_OPTIONS:Mass)
96WAF_CONFIGURE_ARGS+= --enable-libass 96WAF_CONFIGURE_ARGS+= --enable-libass
97.include "../../multimedia/libass/buildlink3.mk" 97.include "../../multimedia/libass/buildlink3.mk"
98.else 98.else
99WAF_CONFIGURE_ARGS+= --disable-libass 99WAF_CONFIGURE_ARGS+= --disable-libass
100.endif 100.endif
101 101
102### 102###
103### V4L2 support 
104### 
105.if !empty(PKG_OPTIONS:Mv4l2) 
106WAF_CONFIGURE_ARGS+= --enable-libv4l2 
107.else 
108WAF_CONFIGURE_ARGS+= --disable-libv4l2 
109.endif 
110 
111### 
112### VAAPI support (video output) 103### VAAPI support (video output)
113### 104###
114.if !empty(PKG_OPTIONS:Mvaapi) 105.if !empty(PKG_OPTIONS:Mvaapi)
115WAF_CONFIGURE_ARGS+= --enable-vaapi 106WAF_CONFIGURE_ARGS+= --enable-vaapi
116.include "../../multimedia/libva/buildlink3.mk" 107.include "../../multimedia/libva/buildlink3.mk"
117.else 108.else
118WAF_CONFIGURE_ARGS+= --disable-vaapi 109WAF_CONFIGURE_ARGS+= --disable-vaapi
119.endif 110.endif
120 111
121### 112###
122### VDPAU support (video output) 113### VDPAU support (video output)
123### 114###
124.if !empty(PKG_OPTIONS:Mvdpau) 115.if !empty(PKG_OPTIONS:Mvdpau)
File Deleted: pkgsrc/multimedia/mpv/patches/Attic/patch-audio_out_ao__oss.c
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/mpv/patches/Attic/patch-player_main.c (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/patches/Attic/patch-player_main.c 2018/07/25 14:19:16 1.4
+++ pkgsrc/multimedia/mpv/patches/Attic/patch-player_main.c 2019/10/25 14:35:56 1.5
@@ -1,29 +1,23 @@ @@ -1,29 +1,23 @@
1$NetBSD: patch-player_main.c,v 1.4 2018/07/25 14:19:16 leot Exp $ 1$NetBSD: patch-player_main.c,v 1.5 2019/10/25 14:35:56 leot Exp $
2 2
3Avoid to check mismatched built vs running libraries version. 3Avoid to check mismatched built vs running libraries version.
4The use in pkgsrc can be considered a legitimate one. 4The use in pkgsrc can be considered a legitimate one.
5 5
6--- player/main.c.orig 2018-07-22 16:46:25.000000000 +0000 6--- player/main.c.orig 2019-10-25 13:08:15.000000000 +0000
7+++ player/main.c 7+++ player/main.c
8@@ -381,21 +381,6 @@ int mp_initialize(struct MPContext *mpct 8@@ -384,15 +384,6 @@ int mp_initialize(struct MPContext *mpct
9 if (handle_help_options(mpctx)) 9 if (handle_help_options(mpctx))
10 return 1; // help 10 return 1; // help
11  11
12- if (!print_libav_versions(mp_null_log, 0)) { 12- if (!print_libav_versions(mp_null_log, 0)) {
13- // Using mismatched libraries can be legitimate, but even then it's 
14- // a bad idea. We don't acknowledge its usefulness and stability. 
15- // Distro maintainers who patch this out should be aware that mpv 
16- // intentionally ignores ABI in some places where it's not possible to 
17- // get by without violating it. 
18- print_libav_versions(mpctx->log, MSGL_FATAL); 13- print_libav_versions(mpctx->log, MSGL_FATAL);
19- MP_FATAL(mpctx, "\nmpv was compiled against a different version of " 14- MP_FATAL(mpctx, "\nmpv was compiled against an incompatible version of "
20- "FFmpeg/Libav than the shared\nlibrary it is linked against. " 15- "FFmpeg/Libav than the shared\nlibrary it is linked against. "
21- "This is most likely a broken build and could\nresult in " 16- "This is most likely a broken build and could\nresult in "
22- "misbehavior and crashes.\n\nmpv does not support this " 17- "misbehavior and crashes.\n\nThis is a broken build.\n");
23- "configuration and will not run - rebuild mpv instead.\n"); 
24- return -1; 18- return -1;
25- } 19- }
26- 20-
27 if (!mpctx->playlist->first && !opts->player_idle_mode) { 21 if (!mpctx->playlist->first && !opts->player_idle_mode) {
28 // nothing to play 22 // nothing to play
29 mp_print_version(mpctx->log, true); 23 mp_print_version(mpctx->log, true);
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.c (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.c 2019/02/05 12:07:57 1.2
+++ pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.c 2019/10/25 14:35:56 1.3
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-video_out_drm__common.c,v 1.2 2019/02/05 12:07:57 leot Exp $ 1$NetBSD: patch-video_out_drm__common.c,v 1.3 2019/10/25 14:35:56 leot Exp $
2 2
3Enable support for DRM on NetBSD. 3Enable support for DRM on NetBSD.
4 4
5--- video/out/drm_common.c.orig 2018-10-02 19:03:41.000000000 +0000 5--- video/out/drm_common.c.orig 2019-10-25 13:08:15.000000000 +0000
6+++ video/out/drm_common.c 6+++ video/out/drm_common.c
7@@ -21,7 +21,12 @@ 7@@ -21,7 +21,12 @@
8 #include <sys/ioctl.h> 8 #include <sys/ioctl.h>
9 #include <poll.h> 9 #include <poll.h>
10 #include <sys/stat.h> 10 #include <sys/stat.h>
11+#if defined(__NetBSD__) 11+#if defined(__NetBSD__)
12+#include <sys/types.h> 12+#include <sys/types.h>
13+#include <dev/wscons/wsdisplay_usl_io.h> 13+#include <dev/wscons/wsdisplay_usl_io.h>
14+#else 14+#else
15 #include <sys/vt.h> 15 #include <sys/vt.h>
16+#endif 16+#endif
17 #include <unistd.h> 17 #include <unistd.h>
18  18 #include <limits.h>
19 #include "drm_common.h" 19 #include <math.h>
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/mpv/patches/patch-wscript (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/patches/patch-wscript 2019/02/05 12:07:57 1.2
+++ pkgsrc/multimedia/mpv/patches/patch-wscript 2019/10/25 14:35:56 1.3
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1$NetBSD: patch-wscript,v 1.2 2019/02/05 12:07:57 leot Exp $ 1$NetBSD: patch-wscript,v 1.3 2019/10/25 14:35:56 leot Exp $
2 2
3Enable support for DRM on NetBSD. 3Enable support for DRM on NetBSD.
4 4
5--- wscript.orig 2018-10-02 19:03:41.000000000 +0000 5--- wscript.orig 2019-10-25 13:08:15.000000000 +0000
6+++ wscript 6+++ wscript
7@@ -276,6 +276,11 @@ iconv support use --disable-iconv.", 7@@ -289,6 +289,11 @@ iconv support use --disable-iconv.",
8 'func': check_statement(['sys/vt.h', 'sys/ioctl.h'], 8 'func': check_statement(['sys/vt.h', 'sys/ioctl.h'],
9 'int m; ioctl(0, VT_GETMODE, &m)'), 9 'int m; ioctl(0, VT_GETMODE, &m)'),
10 }, { 10 }, {
11+ 'name': 'wsdisplay_usl_io.h', 11+ 'name': 'wsdisplay_usl_io.h',
12+ 'desc': 'wsdisplay_usl_io.h', 12+ 'desc': 'wsdisplay_usl_io.h',
13+ 'func': check_statement(['sys/types.h', 'dev/wscons/wsdisplay_usl_io.h', 'sys/ioctl.h'], 13+ 'func': check_statement(['sys/types.h', 'dev/wscons/wsdisplay_usl_io.h', 'sys/ioctl.h'],
14+ 'int m; ioctl(0, VT_GETMODE, &m)'), 14+ 'int m; ioctl(0, VT_GETMODE, &m)'),
15+ }, { 15+ }, {
16 'name': 'gbm.h', 16 'name': 'gbm.h',
17 'desc': 'gbm.h', 17 'desc': 'gbm.h',
18 'func': check_cc(header_name=['stdio.h', 'gbm.h']), 18 'func': check_cc(header_name=['stdio.h', 'gbm.h']),
19@@ -550,8 +555,8 @@ video_output_features = [ 19@@ -584,7 +589,7 @@ video_output_features = [
20 }, { 20 }, {
21 'name': '--drm', 21 'name': '--drm',
22 'desc': 'DRM', 22 'desc': 'DRM',
23- 'deps': 'vt.h', 23- 'deps': 'vt.h',
24- 'func': check_pkg_config('libdrm'), 
25+ 'deps': 'vt.h || wsdisplay_usl_io.h', 24+ 'deps': 'vt.h || wsdisplay_usl_io.h',
26+ 'func': check_pkg_config('libdrm') 25 'func': check_pkg_config('libdrm', '>= 2.4.74'),
27 }, { 26 }, {
28 'name': '--drmprime', 27 'name': '--drmprime',
29 'desc': 'DRM Prime ffmpeg support', 
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/mpv/patches/patch-video_out_wayland__common.c (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/patches/patch-video_out_wayland__common.c 2019/08/18 17:57:55 1.1
+++ pkgsrc/multimedia/mpv/patches/patch-video_out_wayland__common.c 2019/10/25 14:35:56 1.2
@@ -1,22 +1,20 @@ @@ -1,22 +1,20 @@
1$NetBSD: patch-video_out_wayland__common.c,v 1.1 2019/08/18 17:57:55 nia Exp $ 1$NetBSD: patch-video_out_wayland__common.c,v 1.2 2019/10/25 14:35:56 leot Exp $
2 2
3Allow building on systems without evdev. 3Allow building on systems without evdev.
4 4
5--- video/out/wayland_common.c.orig 2018-10-02 19:03:41.000000000 +0000 5--- video/out/wayland_common.c.orig 2019-10-25 13:08:15.000000000 +0000
6+++ video/out/wayland_common.c 6+++ video/out/wayland_common.c
7@@ -16,8 +16,14 @@ 7@@ -19,7 +19,13 @@
8 */ 8 #include <limits.h>
9  
10 #include <poll.h> 9 #include <poll.h>
11-#include <unistd.h> 10 #include <unistd.h>
12+#if defined(__linux) || defined(__FreeBSD__) 11+#if defined(__linux) || defined(__FreeBSD__)
13 #include <linux/input.h> 12 #include <linux/input.h>
14+#else 13+#else
15+#define BTN_LEFT (0) 14+#define BTN_LEFT (0)
16+#define BTN_MIDDLE (1) 15+#define BTN_MIDDLE (1)
17+#define BTN_RIGHT (2) 16+#define BTN_RIGHT (2)
18+#endif 17+#endif
19+#include <unistd.h> 18 #include <time.h>
20 #include "common/msg.h" 19 #include "common/msg.h"
21 #include "input/input.h" 20 #include "options/m_config.h"
22 #include "input/keycodes.h"