CVS commit: pkgsrc/multimedia/mpv

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

Module Name:    pkgsrc
Committed By:   leot
Date:           Sun Oct 20 09:28:29 UTC 2024

Modified Files:
        pkgsrc/multimedia/mpv: Makefile distinfo
        pkgsrc/multimedia/mpv/patches: patch-meson.build
            patch-video_out_drm__common.c

Log Message:
mpv: Update to 0.39.0

Changes:
0.39.0
======
We are excited to announce the release of mpv 0.39.0, with more than 5
months of development since the last version. This release brings
numerous improvements and fixes across nearly all components.

Key highlights:

* A new select.lua script, allowing users to easily choose files from
  playlists, tracks, chapters, output devices, and more.
* A native replacement for autoload.lua has been implemented.
  See --autocreate-playlist in the manual.
* NVIDIA RTX and Intel VSR scaling are now supported via the d3d11va filter.
* Media controls are now supported on Windows.
* Track selection has been improved, especially for multi-component languages
  like fr-CA.
* A new fifth page has been added to stats.lua, displaying track information.
* Compatibility with dmabuf-wayland has been significantly enhanced.
* Multi-touch support has been introduced.

This release requires FFmpeg 6.1 or newer and libplacebo 6.338.2 or newer.


To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.82 -r1.83 pkgsrc/multimedia/mpv/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/mpv/patches/patch-meson.build
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.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.168 pkgsrc/multimedia/mpv/Makefile:1.169
--- pkgsrc/multimedia/mpv/Makefile:1.168        Wed May 29 16:33:46 2024
+++ pkgsrc/multimedia/mpv/Makefile      Sun Oct 20 09:28:29 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.168 2024/05/29 16:33:46 adam Exp $
+# $NetBSD: Makefile,v 1.169 2024/10/20 09:28:29 leot Exp $
 
-DISTNAME=      mpv-0.38.0
-PKGREVISION=   1
+DISTNAME=      mpv-0.39.0
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -85,6 +84,7 @@ post-install:
 .include "../../multimedia/libdvdnav/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libplacebo+=     libplacebo>=6.338.2
 .include "../../multimedia/libplacebo/buildlink3.mk"
+BUILDLINK_API_DEPENDS.ffmpeg6+=        ffmpeg6>=6.1
 .include "../../multimedia/ffmpeg6/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/multimedia/mpv/distinfo
diff -u pkgsrc/multimedia/mpv/distinfo:1.82 pkgsrc/multimedia/mpv/distinfo:1.83
--- pkgsrc/multimedia/mpv/distinfo:1.82 Wed May 15 20:37:20 2024
+++ pkgsrc/multimedia/mpv/distinfo      Sun Oct 20 09:28:29 2024
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.82 2024/05/15 20:37:20 wiz Exp $
+$NetBSD: distinfo,v 1.83 2024/10/20 09:28:29 leot Exp $
 
-BLAKE2s (mpv-0.38.0.tar.gz) = 030036c0a06177c0eb3478bee5bbd78b001889173d98f965c845777e468c4068
-SHA512 (mpv-0.38.0.tar.gz) = b5b2af59039ef4711814f94bbdfedb37f8ce914301670e42d4ed05fe1900025a3d3a2f3d5e69628a8aad115a647a27c386718959e2df1a18740468b3a84f8975
-Size (mpv-0.38.0.tar.gz) = 3419741 bytes
+BLAKE2s (mpv-0.39.0.tar.gz) = 16a4e3392732f311fee0d87a3565c9dad13eb00eeeab941589adf483fd619d70
+SHA512 (mpv-0.39.0.tar.gz) = 9cf1d7487b1e9e36d2b731bf951c4d3b9deba95109af408ccfc71b88e85f6de2558e7b4950781667bb4d40e0352742e3ed278559ff34d07905dd459969cbf503
+Size (mpv-0.39.0.tar.gz) = 3494313 bytes
 SHA1 (patch-audio_out_ao__alsa.c) = c4661d0d22550d6e4eb2b7a42dd04dbcc58123b0
 SHA1 (patch-etc_mpv.conf) = 9e41b2f4bf59c3bfc5ad84af05538661981ed111
-SHA1 (patch-meson.build) = 490a7a3b498cfc3ccd8994778f46ae72dbe70431
+SHA1 (patch-meson.build) = 0c529563d875ee41a7b2c556a449107f5e87d742
 SHA1 (patch-osdep_threads-posix.h) = b7e2626ba490742858bb979ddbc5a541550ecb6b
 SHA1 (patch-stream_stream__libarchive.c) = 2025f994b7f82cc868608ab7e8df0ae89b549922
-SHA1 (patch-video_out_drm__common.c) = 70eb8884f63e9456c0ffe592289cfd81e208955b
+SHA1 (patch-video_out_drm__common.c) = cdb827cbbcdfb667329cdbee7ebbb2c5f6acef2f

Index: pkgsrc/multimedia/mpv/patches/patch-meson.build
diff -u pkgsrc/multimedia/mpv/patches/patch-meson.build:1.3 pkgsrc/multimedia/mpv/patches/patch-meson.build:1.4
--- pkgsrc/multimedia/mpv/patches/patch-meson.build:1.3 Wed May 15 20:37:20 2024
+++ pkgsrc/multimedia/mpv/patches/patch-meson.build     Sun Oct 20 09:28:29 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.3 2024/05/15 20:37:20 wiz Exp $
+$NetBSD: patch-meson.build,v 1.4 2024/10/20 09:28:29 leot Exp $
 
 - Instruct about NetBSD pthread_setname_np(3).
   Maybe pthread_setname_np(3) should be checked in order to distinguish
@@ -7,9 +7,9 @@ $NetBSD: patch-meson.build,v 1.3 2024/05
 - Enable support for DRM on NetBSD.
 - Install configuration files to examples, per pkgsrc conventions.
 
---- meson.build.orig   2024-04-17 19:18:44.000000000 +0000
+--- meson.build.orig   2024-09-23 17:36:41.000000000 +0000
 +++ meson.build
-@@ -303,6 +303,7 @@ if cc.get_id() == 'clang'
+@@ -300,6 +300,7 @@ if cc.has_multi_arguments('-Wformat', '-
  endif
  
  darwin = host_machine.system() == 'darwin'
@@ -17,12 +17,7 @@ $NetBSD: patch-meson.build,v 1.3 2024/05
  win32 = host_machine.system() == 'cygwin' or host_machine.system() == 'windows'
  posix = not win32
  
-@@ -527,17 +528,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')}
-+
+@@ -552,14 +553,17 @@ features += {'wsdisplay-usl-io.h': cc.ha
  # macOS's pthread_setname_np is a special snowflake and differs from literally every other platform.
  features += {'mac-thread-name': darwin}
  
@@ -42,18 +37,9 @@ $NetBSD: patch-meson.build,v 1.3 2024/05
      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
-@@ -922,7 +928,7 @@ if features['direct3d']
- endif
- 
- 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',
-@@ -1758,7 +1764,7 @@ if get_option('cplayer')
+@@ -1798,7 +1802,7 @@ if get_option('cplayer')
+     install_data('etc/_mpv.zsh', install_dir: zsh_install_dir, rename: '_mpv')
  
-     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'))

Index: pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.c
diff -u pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.c:1.4 pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.c:1.5
--- pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.c:1.4     Sat Dec 19 11:27:51 2020
+++ pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.c Sun Oct 20 09:28:29 2024
@@ -1,16 +1,14 @@
-$NetBSD: patch-video_out_drm__common.c,v 1.4 2020/12/19 11:27:51 leot Exp $
+$NetBSD: patch-video_out_drm__common.c,v 1.5 2024/10/20 09:28:29 leot Exp $
 
 Enable support for DRM on NetBSD.
 
---- video/out/drm_common.c.orig        2020-11-22 17:46:28.000000000 +0000
+--- video/out/drm_common.c.orig        2024-09-23 17:36:41.000000000 +0000
 +++ video/out/drm_common.c
-@@ -30,6 +30,9 @@
- 
- #if HAVE_CONSIO_H
- #include <sys/consio.h>
-+#elif HAVE_WSDISPLAY_USL_IO_H
-+#include <sys/types.h>
-+#include <dev/wscons/wsdisplay_usl_io.h>
- #else
+@@ -34,6 +34,7 @@
+ #elif HAVE_VT_H
  #include <sys/vt.h>
+ #elif HAVE_WSDISPLAY_USL_IO_H
++#include <sys/types.h>
+ #include <dev/wscons/wsdisplay_usl_io.h>
  #endif
+