El Mon, 12 Feb 2024 14:14:02 -0400
Jose Maldonado <josemal...@gmail.com> escribió:
> Hello everyone!
>
> This is an update for mpv. With the arrival of libplacebo (>=v6.338.0)
> we can compile mpv-0.37.0 without problems. The new dependencies for
> libplacebo and the update corresponding to this port have already been
> sent.
>
> This time I have enabled support for Vulkan in mpv. This should have
> no problem with normal use of mpv, as it defaults to GPU and OpenGL,
> even when Vulkan support is enabled. This makes Vulkan a backend that
> must be activated explicitly (using --gpu-api=vulkan).
>
> Compiled and tested in --current (OpenBSD 7.4 GENERIC.MP#1671 amd64)
> without problems including the use of GLSL shaders (both using OpenGL
> and Vulkan).
>
>
Sorry, I forget add a new patch for this version, resend the diff with
the corrections.
--
*********************************************************
Dios en su cielo, todo bien en la Tierra
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- Makefile 24 Jul 2023 12:40:20 -0000 1.98
+++ Makefile 12 Feb 2024 18:57:54 -0000
@@ -2,10 +2,10 @@ COMMENT = movie player based on MPlayer
GH_ACCOUNT = mpv-player
GH_PROJECT = mpv
-GH_TAGNAME = v0.36.0
+GH_TAGNAME = v0.37.0
USE_NOBTCFI = Yes
-SHARED_LIBS += mpv 1.0 # 2.0
+SHARED_LIBS += mpv 2.0
CATEGORIES = multimedia x11
@@ -17,8 +17,8 @@ PERMIT_PACKAGE = Yes
WANTLIB += EGL SDL2 X11 Xext Xinerama Xpresent Xrandr Xss Xv archive
WANTLIB += ass avcodec avdevice avfilter avformat avutil bluray
WANTLIB += c cdio cdio_cdda cdio_paranoia dvdnav iconv jpeg lcms2
-WANTLIB += ${MODLUA_WANTLIB} m placebo pthread sndio swresample
-WANTLIB += swscale z zimg
+WANTLIB += ${MODLUA_WANTLIB} m placebo pthread sndio SPIRV-Tools-shared
+WANTLIB += swresample swscale vulkan z zimg
MODULES = devel/meson \
lang/lua \
@@ -30,6 +30,7 @@ COMPILER_LANGS = c
DEBUG_PACKAGES = ${BUILD_PACKAGES}
BUILD_DEPENDS = audio/ladspa \
+ graphics/libplacebo \
textproc/py-docutils${MODPY_FLAVOR}
LIB_DEPENDS = archivers/libarchive \
@@ -41,6 +42,7 @@ LIB_DEPENDS = archivers/libarchive \
graphics/jpeg \
graphics/lcms2 \
graphics/libplacebo \
+ graphics/spirv-tools \
graphics/zimg \
multimedia/libass \
multimedia/libbluray \
@@ -48,6 +50,7 @@ LIB_DEPENDS = archivers/libarchive \
MODPY_RUNDEP = No
RUN_DEPENDS = devel/desktop-file-utils \
+ graphics/vulkan-loader \
www/yt-dlp \
x11/gtk+4,-guic
@@ -83,10 +86,6 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V
-Dios-gl=disabled \
-Djack=disabled \
-Djavascript=disabled \
- -Dlibplacebo-next=disabled \
- -Dmacos-10-11-features=disabled \
- -Dmacos-10-12-2-features=disabled \
- -Dmacos-10-14-features=disabled \
-Dmacos-cocoa-cb=disabled \
-Dmacos-media-player=disabled \
-Dmacos-touchbar=disabled \
@@ -100,22 +99,23 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V
-Dshaderc=disabled \
-Dsixel=disabled \
-Dswift-build=disabled \
+ -Dswift-flags=disabled \
-Dsdl2-audio=disabled \
-Dspirv-cross=disabled \
-Duchardet=disabled \
-Dvaapi=disabled \
-Dvaapi-drm=disabled \
- -Dvaapi-x-egl=disabled \
-Dvaapi-x11=disabled \
-Dvaapi-wayland=disabled \
-Dvapoursynth=disabled \
-Dvdpau=disabled \
-Dvdpau-gl-x11=disabled \
-Dvideotoolbox-gl=disabled \
- -Dvulkan=disabled \
+ -Dvideotoolbox-pl=disabled \
+ -Dvulkan=enabled \
-Dvulkan-interop=disabled \
-Dwayland=disabled \
- -Dwin32-internal-pthreads=disabled \
+ -Dwin32-threads=disabled \
-Dwasapi=disabled
CFLAGS += -I${LOCALBASE}/include
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/mpv/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo 24 Jul 2023 12:40:20 -0000 1.34
+++ distinfo 12 Feb 2024 18:57:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (mpv-0.36.0.tar.gz) = KavET46+4BO7L5/hTYCzDbGbU0xnkFbkhRzq31pei/Y=
-SIZE (mpv-0.36.0.tar.gz) = 3409178
+SHA256 (mpv-0.37.0.tar.gz) = HS1K268Eii+m7hNFdQMsSy2tmn76/Vs+abiNuTWvrd8=
+SIZE (mpv-0.37.0.tar.gz) = 3384190
Index: patches/patch-meson_build
===================================================================
RCS file: /cvs/ports/multimedia/mpv/patches/patch-meson_build,v
retrieving revision 1.6
diff -u -p -r1.6 patch-meson_build
--- patches/patch-meson_build 24 Jul 2023 12:40:20 -0000 1.6
+++ patches/patch-meson_build 12 Feb 2024 18:57:54 -0000
@@ -4,11 +4,11 @@ time if present at all, rather than only
Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -720,7 +720,19 @@ if features['sdl2-gamepad']
- sources += files('input/sdl_gamepad.c')
+@@ -342,7 +342,19 @@ if features['libdl']
endif
-
--stdatomic_dep = cc.find_library('atomic', required: false)
+
+ # C11 atomics are mandatory but linking to the library is not always required.
+-dependencies += cc.find_library('atomic', required: false)
+if cc.links('''
+#include <stdint.h>
+int main(void) {
@@ -22,6 +22,6 @@ Index: meson.build
+else
+ stdatomic_dep = cc.find_library('atomic')
+endif
- features += {'stdatomic': cc.has_header_symbol('stdatomic.h', 'atomic_int', dependencies: stdatomic_dep,
- required: get_option('stdatomic'))}
- if features['stdatomic']
+
+ cplugins = get_option('cplugins').require(
+ win32 or (features['libdl'] and cc.has_link_argument('-rdynamic')),
Index: patches/patch-osdep_threads_posix_h
===================================================================
RCS file: patches/patch-osdep_threads_posix_h
diff -N patches/patch-osdep_threads_posix_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-osdep_threads_posix_h 12 Feb 2024 18:57:54 -0000
@@ -0,0 +1,11 @@
+Index: osdep/threads-posix.h
+--- osdep/threads-posix.h.orig
++++ osdep/threads-posix.h
+@@ -19,6 +19,7 @@
+
+ #include <errno.h>
+ #include <pthread.h>
++#include <pthread_np.h>
+ #include <stdio.h>
+
+ #include "common/common.h"
Index: patches/patch-osdep_timer-linux_c
===================================================================
RCS file: /cvs/ports/multimedia/mpv/patches/patch-osdep_timer-linux_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-osdep_timer-linux_c
--- patches/patch-osdep_timer-linux_c 11 Mar 2022 19:39:24 -0000 1.2
+++ patches/patch-osdep_timer-linux_c 12 Feb 2024 18:57:54 -0000
@@ -4,12 +4,13 @@ required clocks, but we do have enough f
Index: osdep/timer-linux.c
--- osdep/timer-linux.c.orig
+++ osdep/timer-linux.c
-@@ -19,6 +19,8 @@
- */
-
- #include <unistd.h>
+@@ -20,6 +20,8 @@
+
+ #include <errno.h>
+ #include <stdlib.h>
+#undef _POSIX_TIMERS
+#define _POSIX_TIMERS 1
- #include <stdlib.h>
#include <time.h>
- #include <sys/time.h>
+
+ #include "common/common.h"
+
Index: patches/patch-osdep_timer_c
===================================================================
RCS file: /cvs/ports/multimedia/mpv/patches/patch-osdep_timer_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-osdep_timer_c
--- patches/patch-osdep_timer_c 11 Mar 2022 19:39:24 -0000 1.2
+++ patches/patch-osdep_timer_c 12 Feb 2024 18:57:54 -0000
@@ -4,8 +4,8 @@ required clocks, but we do have enough f
Index: osdep/timer.c
--- osdep/timer.c.orig
+++ osdep/timer.c
-@@ -19,6 +19,8 @@
- #include <pthread.h>
+@@ -18,6 +18,8 @@
+ #include <stdlib.h>
#include <time.h>
#include <unistd.h>
+#undef _POSIX_TIMERS
@@ -13,3 +13,4 @@ Index: osdep/timer.c
#include <sys/time.h>
#include <limits.h>
#include <assert.h>
+
