mpv: (partial) Update to 0.37.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: mpv: (partial) Update to 0.37.0
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Sun, 31 Dec 2023 11:16:32 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Dec 31 12:16:32 2023 +0100
Changeset:	22eba8692b1845d199fbf5eafca7b0214adee8b1

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

Log Message:
mpv: (partial) Update to 0.37.0

Update - at least `patch`-target speaking - to mpv-0.37.0, i.e. update all the
checksums and adjust several patches.

- patch-osdep_threads.c logic was moved to patch-osdep_threads-posix.h
- remove some bits that were applied upstream for patch-meson.build

Only `patch` target tried, not `build` tested yet!

(Actual changelog will be added to COMMIT_MSG, sorry!)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=22eba8692b1845d199fbf5eafca7b0214adee8b1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mpv/Makefile                            |  3 +--
 mpv/distinfo                            | 10 +++++-----
 mpv/patches/patch-meson.build           | 24 ++++++------------------
 mpv/patches/patch-osdep_threads-posix.h | 15 +++++++++++++++
 mpv/patches/patch-osdep_threads.c       | 15 ---------------
 5 files changed, 27 insertions(+), 40 deletions(-)

diffs:
diff --git a/mpv/Makefile b/mpv/Makefile
index 566b0a4e6d..1d74ab5bb3 100644
--- a/mpv/Makefile
+++ b/mpv/Makefile
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.162 2023/11/12 13:23:01 wiz 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/
diff --git a/mpv/distinfo b/mpv/distinfo
index cfe8d59ce8..16a00d90d4 100644
--- a/mpv/distinfo
+++ b/mpv/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.80 2023/08/15 19:17:10 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
diff --git a/mpv/patches/patch-meson.build b/mpv/patches/patch-meson.build
index 7fadef4bff..854631e8fb 100644
--- a/mpv/patches/patch-meson.build
+++ b/mpv/patches/patch-meson.build
@@ -5,14 +5,11 @@ $NetBSD: patch-meson.build,v 1.1 2023/08/15 19:17:10 leot Exp $
   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/15 19:17:10 leot Exp $
  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/15 19:17:10 leot Exp $
      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'))
diff --git a/mpv/patches/patch-osdep_threads-posix.h b/mpv/patches/patch-osdep_threads-posix.h
new file mode 100644
index 0000000000..28b36c4bb6
--- /dev/null
+++ b/mpv/patches/patch-osdep_threads-posix.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+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
+ }
+ 
diff --git a/mpv/patches/patch-osdep_threads.c b/mpv/patches/patch-osdep_threads.c
deleted file mode 100644
index b3cbb75464..0000000000
--- a/mpv/patches/patch-osdep_threads.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-osdep_threads.c,v 1.1 2023/08/15 19:17:10 leot Exp $
-
-Add support for NetBSD.
-
---- osdep/threads.c.orig	2023-07-23 17:10:36.000000000 +0000
-+++ osdep/threads.c
-@@ -51,6 +51,8 @@ void mpthread_set_name(const char *name)
-     pthread_set_name_np(pthread_self(), tname);
- #elif HAVE_OSX_THREAD_NAME
-     pthread_setname_np(tname);
-+#elif HAVE_NETBSD_THREAD_NAME
-+    pthread_setname_np(pthread_self(), "%s", tname);
- #endif
- }
-
Prev by Date: wip: Add mpv
Next by Date: mpv: Add candidate commit message
Previous by Thread: wip: Add mpv
Next by Thread: mpv: Add candidate commit message
Indexes:
Home | Main Index | Thread Index | Old Index