CVS commit: pkgsrc/multimedia/mpv

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

Module Name:    pkgsrc
Committed By:   leot
Date:           Mon Jan  1 15:50:14 UTC 2024

Modified Files:
        pkgsrc/multimedia/mpv: Makefile PLIST distinfo
        pkgsrc/multimedia/mpv/patches: patch-meson.build
Added Files:
        pkgsrc/multimedia/mpv/patches: patch-osdep_threads-posix.h
Removed Files:
        pkgsrc/multimedia/mpv/patches: patch-osdep_threads.c

Log Message:
mpv: Update to 0.37.0

pkgsrc changes:
- Remove bits that were applied upstream in patch-osdep_threads-posix.h
- Adjust patch-osdep_threads.c logic to patch-osdep_threads-posix.h
- Add dependency to libplacebo (thanks to <wiz> for help in packaging!)

Changes:
0.37.0
======
This release requires FFmpeg 4.4 or newer and libplacebo 6.338.0 or
newer.

This is the first release to unconditionally require libplacebo, but
note that the new improved renderer (vo_gpu_next) is not yet the
default.

Features
--------
New
~~~
- ao_oss: add SPDIF passthrough support
- hwtransfer: implement support for HW->HW format conversions
- stream/dvbin: add support for delivery system ISDB-T
- audio/chmap: support up to 64 channels (including 22.2 layout)
- libmpv: add mpv_time_ns()
- vo_gpu, vo_gpu_next: add Vulkan support for macOS
- meson: make libplacebo a required dependency
- hwdec: support videotoolbox hwdec with libplacebo

Changed
~~~~~~~
- msg: print warning and error messages to stderr
- options: restore old default subtitle selection behavior
- input.conf: swap wheel up/down with wheel left/right

Removed
~~~~~~~
- waf: remove waf as a build system
- osc.lua: remove toggle for forced only subpictures (appeared as [F])
- mac: remove runtime checks and compatibility for macOS older than 10.15
- cocoa: remove deprecated OpenGL cocoa backend

Options and Commands
--------------------
Added
~~~~~
- vo_gpu_next: add --hdr-peak-percentile
- player: add --term-remaining-playtime option
- x11: add --x11-wid-title option
- vo_gpu_next: add --libplacebo-opts
- player: add --subs-match-os-language option (replaces 'auto' option)
- vo: add --video-crop
- win32: add --window-corners, --window-affinity, --title-bar, --backdrop-type
- sub: add --sub-stretch-durations option

Changed
~~~~~~~
- builtin.conf: add --hdr-peak-percentile=99.995 to gpu-hq profile
- player: add 'always' option to --subs-fallback-forced
- demux_playlist: default to --directory-mode=lazy
- builtin.conf: add --allow-delayed-peak-detect=no to gpu-hq profile
- vo_gpu, vo_gpu_next: support --icc-3dlut-size=auto
- demux: prepend some cache options with --demuxer-
- builtin.conf: modernize internal profiles for higher quality rendering by default,
  rename 'gpu-hq' profile to 'high-quality', add 'fast' profile
- vo_gpu, vo_gpu_next: default to dscale=hermite
- builtin.conf: remove deprecated 'opengl-hq' profile
- options: remove a bunch of old option fallbacks/deprecated ones
- vo_gpu: allow --deband-iterations to be 0
- stream_cdda: deprecate --cdda-toc-bias and always check for offsets
- options: disable --allow-delayed-peak-detect by default
- options: adjust default of --watch-later-options

Deprecated
~~~~~~~~~~
- command: deprecate shared-script-properties
- demux_cue: deprecate --demuxer-cue-codepage for --metadata-codepage

Removed
~~~~~~~
- player: remove special 'auto' option from alang/slang/vlang (previous default)
- vo_gpu: remove --tone-mapping-mode
- vo_gpu: remove --scale-wblur, --scale-cutoff etc.
- vo_gpu: remove --scaler-lut-size
- m_option: drop support for -del for list options

Fixes and Minor Enhancements
----------------------------
- build: remove unneeded libdl requirement for vaapi
- zimg: fix abort on subsampled input with odd heights
- video_writer: fix gamma for YUV screenshots
- player/video: fix possible crash when changing lavfi-complex
- ad_spdif: fix segfault due to early deallocation
- ao_pipewire: fix race conditon with setting the media role
- draw_bmp: fix overflowing coordinates in mark_rcs
- ao_sndio: use sio_flush() to improve controls responsiveness
- vo_vdpau: fix hwdec for this vo
- vo_gpu, vo_gpu_next: fix setting an empty dscale
- vd_lavc: repeatedly attempt to fallback if hwdec fails in reinit
- options: fix relative time parsing on negative input
- win32: signal DPI changes correctly
- mp_image: properly infer color levels for some pixfmts
- vo_gpu_next: add ability to use named hook params
- vo_gpu_next: take into account PAR when taking screenshots
- ao_audiotrack: support more channel layouts
- osc.lua: support speed-independent time-remaining display
- sub: fix switching tracks while paused
- audio: fix clipping with gapless audio enabled
- player/video: avoid spamming logs with EOF
- player/command: detect aspect ratio name and show it in stats.lua
- wayland: keyboard input fixes
- demux_playlist: remove len restriction on headerless m3u
- win32: fix display resolution calculation on mulitple monitors
- vo_gpu_next: multiple adjustments and fixes to interpolation
- loadfile: avoid infinite playlist loading loops
- context_drm_egl: don't free EGL properties if they are null
- x11: require xrandr 1.4, remove xinerama support
- drm_common: skip cards that don't have connected outputs
- win32_common: fixes minimized window being focused on launch
- ao/jack: set device_buffer to JACK buffer size
- meson: rename all features with underscores
- input: add new keys: Back, Tools, ZoomIn, ZoomOut
- win32: don't ignore --screen and --fs-screen
- input: add missing keypad key defines and Windows multimedia keys
- player: use audio pts corresponding to playing audio on EOF
- command: add sub-ass-extradata property
- vo_dmabuf_wayland: unmap osd surface when not needed
- player: always write redirect entries for resuming playback
- stats.lua: reorganize how video params are displayed
- stats.lua: display HDR metadata
- osc.lua: add scrolling to the seekbar
- demux_lavf: prefer track durations over container durations to determine total
- vo: vulkan: allow picking devices by UUID
- video: allow overriding container crop if it is present
- vo_gpu, vo_gpu_next, screenshot: support applying crop for screenshots
- sd_lavc: account for floating point inaccuracy, fix sub PTS
- stream: accept dav:// and davs:// urls
- filter_kernels: refine some constants
- filter_kernels: add ewa_lanczos4sharpest
- osc.lua: add scrolling to audio/sub buttons
- demux_mkv: support cropping and rotation
- vo_dmabuf_wayland: support 90 degree rotations
- filter_kernels: add hermite filter
- vo: avoid unnecessary redraws when the OSD shows
- scripting: support DLL cplugins
- af_scaletempo2: various bug fixes
- sdl_gamepad: fix button detection on modern controllers
- vo_dmabuf_wayland: support osd rendering when there's no video
- demux_playlist: add --directory-mode=auto
- vo_gpu_next: use proper color for subtitles
- win32: add an option to change window affinity and control title bar state
- win32: reduce top border thickness to imitate DWM invisible borders
- wayland: remove gnome-specific idle-inhibit warning
- win32: pass window handle to the window-id property
- osc.lua: fix calculation for slider's min-max average
- recorder: fix a couple of memory leaks
- af_scaletempo2: raise max playback rate to 8.0
- osc.lua: move the idle logo behind other overlays
- hwdec_drmprime: add nv16 support
- various: change internal timing code to work in nanoseconds instead of microseconds
- vo: increase display refresh rate estimation limit from 99 Hz to 400 Hz
- external_files: base cover-art-whitelist on cover-art-auto-exts
- path: don't override cache and state paths with --config-dir
- codec_tags: map some more image mimetypes
- af/vf-command: add ability to target a specific lavfi filter
- win32: prevent white window flash on startup
- demux_playlist: use --metacode-codepage when parsing playlist files
- video: revert racey change that led to stutter and deadlocking
- console.lua: various improvements
- command: add playlist-next-playlist and playlist-prev-playlist
- ytdl_hook.lua: set metadata with single tracks
- defaults.lua: add a disabled parameter to timer constructors
- terminal-unix: race condition fixes
- af_scaletempo2: better defaults
- hwtransfer: handle hwcontexts that don't implement frame constraints
- stream_cdda: remove fallback for ancient libcdio versions
- osdep: drop support for C11 without atomics
- dvbin: do a big cleanup on code style and functions
- ytdl_hook.lua: parse the separate cookies field
- sub: update subtitles if current track is an image
- javascript: use --js-memory-report option instead of MPV_LEAK_REPORT
- ao_coreaudio: signal buffer underruns
- ytdl_hook.lua: support thumbnails
- demux: make hysteresis-secs respect cache-secs
- mp_image: pass rotation correctly to/from AVFrame correctly
- various: add new internal mp_thread abstraction and use it
- drm: use present_sync mechanism for presentation feedback
- vo_gpu: apply ICC profile and dithering only to window screenshots
- audio: introduce ao_read_data_nonblocking() and use it in relevant backends
- wayland: obey initial size hints set by the compositor
- command: export storage aspect ratio (sar) properties
- vo: delay vsync samples by at least 10 refreshes to improve convergence time
- vo_sdl: fix broken mouse wheel multiplier
- vo_gpu_next: simplify cache code and don't re-save when unmodified


To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/multimedia/mpv/PLIST
cvs rdiff -u -r1.80 -r1.81 pkgsrc/multimedia/mpv/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/mpv/patches/patch-meson.build
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/mpv/patches/patch-osdep_threads-posix.h
cvs rdiff -u -r1.1 -r0 pkgsrc/multimedia/mpv/patches/patch-osdep_threads.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.162 pkgsrc/multimedia/mpv/Makefile:1.163
--- pkgsrc/multimedia/mpv/Makefile:1.162        Sun Nov 12 13:23:01 2023
+++ pkgsrc/multimedia/mpv/Makefile      Mon Jan  1 15:50:13 2024
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.162 2023/11/12 13:23:01 wiz Exp $
+# $NetBSD: Makefile,v 1.163 2024/01/01 15:50:13 leot Exp $
 
-DISTNAME=      mpv-0.36.0
+DISTNAME=      mpv-0.37.0
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
-PKGREVISION=   3
 
 MAINTAINER=    leot%NetBSD.org@localhost
 HOMEPAGE=      https://mpv.io/
@@ -83,6 +82,7 @@ post-install:
 .include "../../lang/python/tool.mk"
 .include "../../multimedia/libass/buildlink3.mk"
 .include "../../multimedia/libdvdnav/buildlink3.mk"
+.include "../../multimedia/libplacebo/buildlink3.mk"
 .include "../../multimedia/ffmpeg6/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/multimedia/mpv/PLIST
diff -u pkgsrc/multimedia/mpv/PLIST:1.14 pkgsrc/multimedia/mpv/PLIST:1.15
--- pkgsrc/multimedia/mpv/PLIST:1.14    Tue Aug 15 19:17:10 2023
+++ pkgsrc/multimedia/mpv/PLIST Mon Jan  1 15:50:13 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2023/08/15 19:17:10 leot Exp $
+@comment $NetBSD: PLIST,v 1.15 2024/01/01 15:50:13 leot Exp $
 bin/mpv
 include/mpv/client.h
 include/mpv/render.h
@@ -6,7 +6,7 @@ include/mpv/render_gl.h
 include/mpv/stream_cb.h
 lib/libmpv.so
 lib/libmpv.so.2
-lib/libmpv.so.2.1.0
+lib/libmpv.so.2.2.0
 lib/pkgconfig/mpv.pc
 man/man1/mpv.1
 share/applications/mpv.desktop

Index: pkgsrc/multimedia/mpv/distinfo
diff -u pkgsrc/multimedia/mpv/distinfo:1.80 pkgsrc/multimedia/mpv/distinfo:1.81
--- pkgsrc/multimedia/mpv/distinfo:1.80 Tue Aug 15 19:17:10 2023
+++ pkgsrc/multimedia/mpv/distinfo      Mon Jan  1 15:50:13 2024
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.80 2023/08/15 19:17:10 leot Exp $
+$NetBSD: distinfo,v 1.81 2024/01/01 15:50:13 leot Exp $
 
-BLAKE2s (mpv-0.36.0.tar.gz) = 8d0935c3b9daf9e8fe88e1413407e7194f34d688ffb00d46ab0dc68e750e5ade
-SHA512 (mpv-0.36.0.tar.gz) = 51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f
-Size (mpv-0.36.0.tar.gz) = 3409178 bytes
+BLAKE2s (mpv-0.37.0.tar.gz) = 0406db57ea2b31c309f653af7ed61373ae2db6c63e8189a184bac159b7e52753
+SHA512 (mpv-0.37.0.tar.gz) = a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
+Size (mpv-0.37.0.tar.gz) = 3384190 bytes
 SHA1 (patch-audio_out_ao__alsa.c) = c4661d0d22550d6e4eb2b7a42dd04dbcc58123b0
 SHA1 (patch-etc_mpv.conf) = 9e41b2f4bf59c3bfc5ad84af05538661981ed111
-SHA1 (patch-meson.build) = 1f534e05b5d87958a03be35027e7d4e03f772dcb
-SHA1 (patch-osdep_threads.c) = ac9d45ae77893104eb4185f8b399fcc90960cf77
+SHA1 (patch-meson.build) = 2ffcbb18391372b694af44d711c16d3d44f871c8
+SHA1 (patch-osdep_threads-posix.h) = 67900f0f14762a7ec7e2ee5fdcf57c32cbfe6b49
 SHA1 (patch-stream_stream__libarchive.c) = 2025f994b7f82cc868608ab7e8df0ae89b549922
 SHA1 (patch-video_out_drm__common.c) = 70eb8884f63e9456c0ffe592289cfd81e208955b

Index: pkgsrc/multimedia/mpv/patches/patch-meson.build
diff -u pkgsrc/multimedia/mpv/patches/patch-meson.build:1.1 pkgsrc/multimedia/mpv/patches/patch-meson.build:1.2
--- pkgsrc/multimedia/mpv/patches/patch-meson.build:1.1 Tue Aug 15 19:17:10 2023
+++ pkgsrc/multimedia/mpv/patches/patch-meson.build     Mon Jan  1 15:50:14 2024
@@ -1,18 +1,15 @@
-$NetBSD: patch-meson.build,v 1.1 2023/08/15 19:17:10 leot Exp $
+$NetBSD: patch-meson.build,v 1.2 2024/01/01 15:50:14 leot Exp $
 
 - Instruct about NetBSD pthread_setname_np(3).
   Maybe pthread_setname_np(3) should be checked in order to distinguish
   based on the argument supported instead of special-casing based on the
   platform... workaround that for the moment in the simplest way.
 - Enable support for DRM on NetBSD.
-- Also check for SNDCTL_DSP_HALT. NetBSD ossaudio(3) has
-  SNDCTL_DSP_SETPLAYVOL but not SNDCTL_DSP_HALT. Consistent with the
-  same check that is present in wscript.
 - Install configuration files to examples, per pkgsrc conventions.
 
---- meson.build.orig   2023-07-23 17:10:36.000000000 +0000
+--- meson.build.orig   2023-11-21 18:47:46.000000000 +0000
 +++ meson.build
-@@ -293,6 +293,7 @@ if cc.get_id() == 'clang'
+@@ -297,6 +297,7 @@ if cc.get_id() == 'clang'
  endif
  
  darwin = host_machine.system() == 'darwin'
@@ -20,7 +17,7 @@ $NetBSD: patch-meson.build,v 1.1 2023/08
  win32 = host_machine.system() == 'cygwin' or host_machine.system() == 'windows'
  posix = not win32
  
-@@ -521,17 +522,22 @@ features += {'vt.h': cc.has_header_symbo
+@@ -515,17 +516,22 @@ features += {'vt.h': cc.has_header_symbo
  
  features += {'consio.h': not features['vt.h'] and cc.has_header_symbol('sys/consio.h', 'VT_GETMODE')}
  
@@ -45,25 +42,16 @@ $NetBSD: patch-meson.build,v 1.1 2023/08
      features += {'bsd-thread-name': posix and cc.has_function('pthread_set_name_np', dependencies: pthreads,
                                                                prefix: '#include <pthread.h>\n#include <pthread_np.h>')}
  endif
-@@ -827,6 +833,8 @@ oss_opt = get_option('oss-audio').requir
-     error_message: 'the build is not GPL!',
- )
- features += {'oss-audio': cc.has_header_symbol('sys/soundcard.h', 'SNDCTL_DSP_SETPLAYVOL',
-+                                               required: oss_opt) and
-+                          cc.has_header_symbol('sys/soundcard.h', 'SNDCTL_DSP_HALT',
-                                                required: oss_opt)}
- if features['oss-audio']
-     sources += files('audio/out/ao_oss.c')
-@@ -894,7 +902,7 @@ if features['direct3d']
+@@ -900,7 +906,7 @@ if features['direct3d']
  endif
  
- drm = dependency('libdrm', version: '>= 2.4.75', required: get_option('drm'))
+ drm = dependency('libdrm', version: '>= 2.4.105', required: get_option('drm'))
 -features += {'drm': drm.found() and (features['vt.h'] or features['consio.h'])}
 +features += {'drm': drm.found() and (features['vt.h'] or features['consio.h'] or features['wsdisplay_usl_io.h'])}
  if features['drm']
      dependencies += drm
      sources += files('video/drmprime.c',
-@@ -1744,7 +1752,7 @@ if get_option('cplayer')
+@@ -1734,7 +1740,7 @@ if get_option('cplayer')
  
      install_data('etc/mpv.desktop', install_dir: join_paths(datadir, 'applications'))
      install_data('etc/mpv.metainfo.xml', install_dir: join_paths(datadir, 'metainfo'))

Added files:

Index: pkgsrc/multimedia/mpv/patches/patch-osdep_threads-posix.h
diff -u /dev/null pkgsrc/multimedia/mpv/patches/patch-osdep_threads-posix.h:1.1
--- /dev/null   Mon Jan  1 15:50:14 2024
+++ pkgsrc/multimedia/mpv/patches/patch-osdep_threads-posix.h   Mon Jan  1 15:50:14 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-osdep_threads-posix.h,v 1.1 2024/01/01 15:50:14 leot Exp $
+
+Add support for NetBSD.
+
+--- osdep/threads-posix.h.orig 2023-12-31 11:13:03.078250654 +0000
++++ osdep/threads-posix.h
+@@ -232,6 +232,8 @@ static inline void mp_thread_set_name(co
+     pthread_set_name_np(pthread_self(), name);
+ #elif HAVE_OSX_THREAD_NAME
+     pthread_setname_np(name);
++#elif HAVE_NETBSD_THREAD_NAME
++    pthread_setname_np(pthread_self(), "%s", name);
+ #endif
+ }
+