 @@ -1,20 +1,19 @@
-# $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
 HOMEPAGE=	https://mpv.io/
 COMMENT=	Video player based on MPlayer and mplayer2
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 # needs sem_timedwait(3)
 NOT_FOR_PLATFORM=	NetBSD-[1-6].*-*
 # Requires support for c11 atomics.
 USE_CC_FEATURES+=	c11
 # Needed for rst2man
 @@ -73,19 +72,20 @@ post-install:
 	    ${DESTDIR}${PREFIX}/share/examples/mpv/mpv.conf
 .include "options.mk"
 .include "../../devel/meson/build.mk"
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .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"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,22 +1,22 @@
-@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
 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
 share/bash-completion/completions/mpv
 share/doc/mpv/input.conf
 share/doc/mpv/mplayer-input.conf
 share/doc/mpv/restore-old-bindings.conf
 share/examples/mpv/encoding-profiles.conf
 share/examples/mpv/mpv.conf
 share/icons/hicolor/128x128/apps/mpv.png
 share/icons/hicolor/16x16/apps/mpv.png
 share/icons/hicolor/32x32/apps/mpv.png
 share/icons/hicolor/64x64/apps/mpv.png

 @@ -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
+BLAKE2s (mpv-0.37.0.tar.gz) = 0406db57ea2b31c309f653af7ed61373ae2db6c63e8189a184bac159b7e52753
-SHA512 (mpv-0.36.0.tar.gz) = 51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f
+SHA512 (mpv-0.37.0.tar.gz) = a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
-Size (mpv-0.36.0.tar.gz) = 3409178 bytes
+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-meson.build) = 2ffcbb18391372b694af44d711c16d3d44f871c8
-SHA1 (patch-osdep_threads.c) = ac9d45ae77893104eb4185f8b399fcc90960cf77
+SHA1 (patch-osdep_threads-posix.h) = 67900f0f14762a7ec7e2ee5fdcf57c32cbfe6b49
 SHA1 (patch-stream_stream__libarchive.c) = 2025f994b7f82cc868608ab7e8df0ae89b549922
 SHA1 (patch-video_out_drm__common.c) = 70eb8884f63e9456c0ffe592289cfd81e208955b

 @@ -1,74 +1,62 @@
-$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'
 +netbsd = host_machine.system() == 'netbsd'
  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')}
 +features += {'wsdisplay_usl_io.h': not features['vt.h'] and not features['consio.h'] and cc.has_header_symbol('dev/wscons/wsdisplay_usl_io.h', 'VT_GETMODE')}
++
  # macOS's pthread_setname_np is a special snowflake and differs from literally every other platform.
  features += {'osx-thread-name': darwin}
 +# NetBSD pthread_setname_np differs from macOS and Linux
 +features += {'netbsd-thread-name': netbsd}
++
  features += {'glibc-thread-name': false}
 -if not features['osx-thread-name']
 +if not features['osx-thread-name'] and not features['netbsd-thread-name']
      features += {'glibc-thread-name': posix and cc.has_function('pthread_setname_np', args: '-D_GNU_SOURCE',
                                                                  dependencies: pthreads, prefix: '#include <pthread.h>')}
  endif
  features += {'bsd-thread-name': false}
 -if not features['osx-thread-name'] and not features['glibc-thread-name']
 +if not features['osx-thread-name'] and not features['glibc-thread-name'] and not features['netbsd-thread-name']
      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
+@@ -900,7 +906,7 @@ if features['direct3d']
      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']
  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'))
 -    install_data('etc/encoding-profiles.conf', install_dir: join_paths(confdir, 'mpv'))
 +    install_data('etc/encoding-profiles.conf', install_dir: join_paths(datadir, 'examples/mpv'))
      foreach size: ['16x16', '32x32', '64x64', '128x128']
          icon_dir = join_paths(datadir, 'icons', 'hicolor', size, 'apps')