Download raw body.
[UPDATE] multimedia/mpv - bump version v0.37.0
El Tue, 20 Feb 2024 13:13:02 +0000
Stuart Henderson <stu@spacehopper.org> escribió:
> On 2024/02/20 08:52, Jose Maldonado wrote:
> > El Tue, 20 Feb 2024 11:31:54 +0000
> > Stuart Henderson <stu@spacehopper.org> escribió:
> > > I get this:
> > >
> > > $ make port-lib-depends-check
> > >
> > > mpv-0.37.0(multimedia/mpv):
> > > Extra: SPIRV-Tools-shared.0 Xinerama.6
> > >
> > > Looks like upstream explicitly stopped using Xinerama so that one
> > > can be removed.
> > >
> > > What's up with SPIRV-Tools-shared and the new LIB_DEPENDS on
> > > spirv-tools - I see that the port still uses
> > > -Dspirv-cross=disabled, I could have missed something but that
> > > does seem to disable anything to do with spirv?
> > >
> >
> > Hi @sthen!
> >
> > In order to be consistent with the changes in x11/vlc, do we also
> > enable wayland support in multimedia/mpv? I can try this along with
> > the changes you have indicated
>
> wayland isn't enabled for vlc, it's just the libraries are pulled in
> via another dependency (gtk+3 in this case, I think) and so need to be
> listed. (Strangely only listed in libnotify_plugin..?)
>
> I'd prefer to get the update in first without too many more changes,
> just tie up this remaining issue about the spirv libs, then we can
> look at whether or not to enable wayland separately afterwards.
>
> $ objdump -p /usr/local/lib/vlc/plugins/notify/libnotify_plugin.so
>
Ok, I understand this. At the rate things are going we will see more
and more dependencies on Wayland.
About MPV, I upload a new diff with the corrections. I detail the
changes:
1) Removed Xinerama support (thanks @sthen)
2) spirv-cross we don't need it, since from what I see in mpv's
meson.build, this is a feature aimed at Windows (d3d11).
3) Vulkan in mpv can be activated without using spirv-tools (I removed
it from LIB_DEPENDS and WANTLIB). In this case, libplacebo will take
care of making the appropriate shader management arrangements (using
shaderc), as appropriate. I have already tested it by playing video
with shaders (FSR.glsl) and without these, it works correctly (on
OpenGL and Vulkan gpu-api-context)and the spirv shaders are processed by
libplacebo as shown in the log.
--
*********************************************************
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 20 Feb 2024 17:24:35 -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
@@ -14,11 +14,11 @@ HOMEPAGE = https://mpv.io/
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB += EGL SDL2 X11 Xext Xinerama Xpresent Xrandr Xss Xv archive
+WANTLIB += ${MODLUA_WANTLIB}
+WANTLIB += EGL SDL2 X11 Xext 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 += m placebo pthread sndio swresample swscale vulkan z zimg
MODULES = devel/meson \
lang/lua \
@@ -41,6 +41,7 @@ LIB_DEPENDS = archivers/libarchive \
graphics/jpeg \
graphics/lcms2 \
graphics/libplacebo \
+ graphics/vulkan-loader \
graphics/zimg \
multimedia/libass \
multimedia/libbluray \
@@ -48,6 +49,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 +85,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,28 +98,30 @@ 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
LDFLAGS += -L${LOCALBASE}/lib
-MODMESON_CONFIGURE_ENV += LDFLAGS="${LDFLAGS}"
+MODMESON_CONFIGURE_ENV += CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
NO_TEST = Yes
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 20 Feb 2024 17:24:35 -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 20 Feb 2024 17:24:35 -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 20 Feb 2024 17:24:35 -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 20 Feb 2024 17:24:35 -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 20 Feb 2024 17:24:35 -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>
+
[UPDATE] multimedia/mpv - bump version v0.37.0