here's an update to mpv 0.39.0, which is working ok so far for me.
the "vulkan-interop" build option (which we were setting to "disabled"
was removed, and code relating to it moved under plain "vulkan" (which
is "enabled").
I don't know how to test that, any suggestions?
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
diff -u -p -r1.105 Makefile
--- Makefile 21 Dec 2024 11:38:27 -0000 1.105
+++ Makefile 30 Jan 2025 14:14:19 -0000
@@ -2,9 +2,8 @@ COMMENT = movie player based on MPlayer
GH_ACCOUNT = mpv-player
GH_PROJECT = mpv
-GH_TAGNAME = v0.38.0
+GH_TAGNAME = v0.39.0
USE_NOBTCFI = Yes
-REVISION = 1
SHARED_LIBS += mpv 2.0
@@ -90,6 +89,10 @@ CONFIGURE_ARGS = -Dalsa=disabled \
-Djavascript=disabled \
-Dlibmpv=true \
-Dlua=lua${MODLUA_DEP_VERSION} \
+ -Dmacos-10-15-4-features=disabled \
+ -Dmacos-11-features=disabled \
+ -Dmacos-11-3-features=disabled \
+ -Dmacos-12-features=disabled \
-Dmacos-cocoa-cb=disabled \
-Dmacos-media-player=disabled \
-Dmacos-touchbar=disabled \
@@ -118,7 +121,6 @@ CONFIGURE_ARGS = -Dalsa=disabled \
-Dvdpau=disabled \
-Dvideotoolbox-gl=disabled \
-Dvideotoolbox-pl=disabled \
- -Dvulkan-interop=disabled \
-Dvulkan=enabled \
-Dwasapi=disabled \
-Dwayland=disabled \
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/mpv/distinfo,v
diff -u -p -r1.36 distinfo
--- distinfo 7 May 2024 15:12:07 -0000 1.36
+++ distinfo 30 Jan 2025 14:14:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (mpv-0.38.0.tar.gz) = htnvQLYFhzL2e0bQu9okoHT66GCz6q4FurMUUEEwMGY=
-SIZE (mpv-0.38.0.tar.gz) = 3419741
+SHA256 (mpv-0.39.0.tar.gz) = LKkkN6/7YsK1WbRBnqR4XHDQI1kFAOilLpXqOrRVRoM=
+SIZE (mpv-0.39.0.tar.gz) = 3494313
Index: patches/patch-meson_build
===================================================================
RCS file: /cvs/ports/multimedia/mpv/patches/patch-meson_build,v
diff -u -p -r1.9 patch-meson_build
--- patches/patch-meson_build 28 Jul 2024 06:51:13 -0000 1.9
+++ patches/patch-meson_build 30 Jan 2025 14:14:19 -0000
@@ -25,12 +25,12 @@ Index: meson.build
cplugins = get_option('cplugins').require(
win32 or (features['libdl'] and cc.has_link_argument('-rdynamic')),
-@@ -525,7 +537,7 @@ features += {'glob': features['glob-posix'] or feature
+@@ -545,7 +557,7 @@ features += {'glob': features['glob-posix'] or feature
features += {'vt.h': cc.has_header_symbol('sys/vt.h', 'VT_GETMODE')}
-features += {'consio.h': not features['vt.h'] and
cc.has_header_symbol('sys/consio.h', 'VT_GETMODE')}
+features += {'consio.h': not features['vt.h'] and
cc.has_header_symbol('dev/wscons/wsdisplay_usl_io.h', 'VT_GETMODE', prefix:
'#include <sys/param.h>')}
- # macOS's pthread_setname_np is a special snowflake and differs from
literally every other platform.
- features += {'mac-thread-name': darwin}
+ features += {'wsdisplay-usl-io.h':
cc.has_header_symbol('dev/wscons/wsdisplay_usl_io.h', 'VT_GETMODE', prefix:
'#include <sys/types.h>')}
+
Index: patches/patch-osdep_terminal-unix_c
===================================================================
RCS file: /cvs/ports/multimedia/mpv/patches/patch-osdep_terminal-unix_c,v
diff -u -p -r1.2 patch-osdep_terminal-unix_c
--- patches/patch-osdep_terminal-unix_c 9 Aug 2024 16:04:31 -0000 1.2
+++ patches/patch-osdep_terminal-unix_c 30 Jan 2025 14:14:19 -0000
@@ -3,7 +3,7 @@ https://github.com/mpv-player/mpv/pull/1
Index: osdep/terminal-unix.c
--- osdep/terminal-unix.c.orig
+++ osdep/terminal-unix.c
-@@ -421,7 +421,8 @@ static MP_THREAD_VOID terminal_thread(void *ptr)
+@@ -466,7 +466,8 @@ static MP_THREAD_VOID terminal_thread(void *ptr)
}
if (fds[1].revents & POLLIN) {
int8_t c = -1;
Index: patches/patch-osdep_timer_c
===================================================================
RCS file: /cvs/ports/multimedia/mpv/patches/patch-osdep_timer_c,v
diff -u -p -r1.4 patch-osdep_timer_c
--- patches/patch-osdep_timer_c 7 May 2024 15:12:07 -0000 1.4
+++ patches/patch-osdep_timer_c 30 Jan 2025 14:14:19 -0000
@@ -4,12 +4,12 @@ required clocks, but we do have enough f
Index: osdep/timer.c
--- osdep/timer.c.orig
+++ osdep/timer.c
-@@ -18,6 +18,8 @@
+@@ -16,6 +16,8 @@
+ */
+
#include <stdlib.h>
- #include <time.h>
- #include <unistd.h>
+#undef _POSIX_TIMERS
+#define _POSIX_TIMERS 1
- #include <sys/time.h>
+ #include <time.h>
#include <limits.h>
#include <assert.h>
Index: patches/patch-video_out_drm_common_c
===================================================================
RCS file: /cvs/ports/multimedia/mpv/patches/patch-video_out_drm_common_c,v
diff -u -p -r1.1 patch-video_out_drm_common_c
--- patches/patch-video_out_drm_common_c 28 Jul 2024 06:51:13 -0000
1.1
+++ patches/patch-video_out_drm_common_c 30 Jan 2025 14:14:19 -0000
@@ -1,12 +1,19 @@
Index: video/out/drm_common.c
--- video/out/drm_common.c.orig
+++ video/out/drm_common.c
-@@ -30,7 +30,7 @@
+@@ -29,12 +29,12 @@
+
#include "config.h"
- #if HAVE_CONSIO_H
--#include <sys/consio.h>
+-#if HAVE_CONSIO_H
++#if HAVE_WSDISPLAY_USL_IO_H
+#include <dev/wscons/wsdisplay_usl_io.h>
- #else
++#elif HAVE_CONSIO_H
+ #include <sys/consio.h>
+ #elif HAVE_VT_H
#include <sys/vt.h>
+-#elif HAVE_WSDISPLAY_USL_IO_H
+-#include <dev/wscons/wsdisplay_usl_io.h>
#endif
+
+ #include "drm_atomic.h"