From: Jose Maldonado Subject: Re: UPDATE: mpv 0.38.0 To: ports@openbsd.org Cc: Brad Smith Date: Wed, 17 Apr 2024 23:25:28 -0400 El Wed, 17 Apr 2024 22:09:06 -0400 Brad Smith escribió: > Here is an update to mpv 0.38.0. > > https://raw.githubusercontent.com/mpv-player/mpv/master/RELEASE_NOTES > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/multimedia/mpv/Makefile,v > retrieving revision 1.99 > diff -u -p -u -p -r1.99 Makefile > --- Makefile 21 Feb 2024 10:42:42 -0000 1.99 > +++ Makefile 17 Apr 2024 23:57:05 -0000 > @@ -2,7 +2,7 @@ COMMENT = movie player based on MPlayer > > GH_ACCOUNT = mpv-player > GH_PROJECT = mpv > -GH_TAGNAME = v0.37.0 > +GH_TAGNAME = v0.38.0 > USE_NOBTCFI = Yes > > SHARED_LIBS += mpv 2.0 > @@ -62,6 +62,7 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V > -Dalsa=disabled \ > -Dandroid-media-ndk=disabled \ > -Daudiounit=disabled \ > + -Davfoundation=disabled \ > -Dcaca=disabled \ > -Dcocoa=disabled \ > -Dcoreaudio=disabled \ > @@ -72,12 +73,15 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V > -Dd3d-hwaccel=disabled \ > -Ddirect3d=disabled \ > -Ddmabuf-wayland=disabled \ > + -Ddrm=disabled \ > + -Ddvbin=disabled \ > -Degl-android=disabled \ > -Degl-angle=disabled \ > -Degl-angle-lib=disabled \ > -Degl-angle-win32=disabled \ > -Degl-drm=disabled \ > -Degl-wayland=disabled \ > + -Dgbm=disabled \ > -Dgl-cocoa=disabled \ > -Dgl-dxinterop=disabled \ > -Dgl-dxinterop-d3d9=disabled \ > @@ -93,7 +97,6 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V > -Doss-audio=disabled \ > -Dpipewire=disabled \ > -Dpulse=disabled \ > - -Drpi-mmal=disabled \ > -Drubberband=disabled \ > -Dshaderc=disabled \ > -Dsixel=disabled \ > @@ -106,6 +109,7 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V > -Dvaapi-drm=disabled \ > -Dvaapi-x11=disabled \ > -Dvaapi-wayland=disabled \ > + -Dvaapi-win32=disabled \ > -Dvapoursynth=disabled \ > -Dvdpau=disabled \ > -Dvdpau-gl-x11=disabled \ > Index: distinfo > =================================================================== > RCS file: /cvs/ports/multimedia/mpv/distinfo,v > retrieving revision 1.35 > diff -u -p -u -p -r1.35 distinfo > --- distinfo 21 Feb 2024 10:42:42 -0000 1.35 > +++ distinfo 17 Apr 2024 23:57:05 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (mpv-0.37.0.tar.gz) = > HS1K268Eii+m7hNFdQMsSy2tmn76/Vs+abiNuTWvrd8= -SIZE > (mpv-0.37.0.tar.gz) = 3384190 +SHA256 (mpv-0.38.0.tar.gz) = > htnvQLYFhzL2e0bQu9okoHT66GCz6q4FurMUUEEwMGY= +SIZE > (mpv-0.38.0.tar.gz) = 3419741 Index: patches/patch-meson_build > =================================================================== > RCS file: /cvs/ports/multimedia/mpv/patches/patch-meson_build,v > retrieving revision 1.7 > diff -u -p -u -p -r1.7 patch-meson_build > --- patches/patch-meson_build 21 Feb 2024 10:42:42 > -0000 1.7 +++ patches/patch-meson_build 17 Apr 2024 > 23:57:05 -0000 @@ -4,9 +4,9 @@ time if present at all, rather than > only Index: meson.build > --- meson.build.orig > +++ meson.build > -@@ -342,7 +342,19 @@ if features['libdl'] > +@@ -348,7 +348,19 @@ if features['libdl'] > endif > - > + > # C11 atomics are mandatory but linking to the library is not > always required. -dependencies += cc.find_library('atomic', required: > false) +if cc.links(''' > @@ -22,6 +22,6 @@ Index: meson.build > +else > + stdatomic_dep = cc.find_library('atomic') > +endif > - > + > cplugins = get_option('cplugins').require( > win32 or (features['libdl'] and > cc.has_link_argument('-rdynamic')), Index: > patches/patch-osdep_threads_posix_h > =================================================================== > RCS file: > /cvs/ports/multimedia/mpv/patches/patch-osdep_threads_posix_h,v > retrieving revision 1.1 diff -u -p -u -p -r1.1 > patch-osdep_threads_posix_h --- > patches/patch-osdep_threads_posix_h 21 Feb 2024 10:42:42 > -0000 1.1 +++ patches/patch-osdep_threads_posix_h 17 > Apr 2024 23:57:05 -0000 @@ -2,10 +2,10 @@ Index: > osdep/threads-posix.h --- osdep/threads-posix.h.orig +++ > osdep/threads-posix.h @@ -19,6 +19,7 @@ - > + > #include > #include > +#include > #include > - > + > #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.3 diff -u -p -u -p -r1.3 > patch-osdep_timer-linux_c --- > patches/patch-osdep_timer-linux_c 21 Feb 2024 10:42:42 > -0000 1.3 +++ patches/patch-osdep_timer-linux_c 17 Apr > 2024 23:57:05 -0000 @@ -5,12 +5,11 @@ Index: osdep/timer-linux.c --- > osdep/timer-linux.c.orig +++ osdep/timer-linux.c > @@ -20,6 +20,8 @@ > - > + > #include > #include > +#undef _POSIX_TIMERS > +#define _POSIX_TIMERS 1 > #include > - > + > #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.3 > diff -u -p -u -p -r1.3 patch-osdep_timer_c > --- patches/patch-osdep_timer_c 21 Feb 2024 10:42:42 > -0000 1.3 +++ patches/patch-osdep_timer_c 17 Apr 2024 > 23:57:05 -0000 @@ -13,4 +13,3 @@ Index: osdep/timer.c > #include > #include > #include > - > Hi, @Brad! I was just working on the update when I saw your message. The patch we needed in v0.37.0 (patch-osdep_threads_posix_h) is no longer needed, since the change has been accepted upstream, so we can delete it now. I also organized the CONFIGURE_ARGS alphabetically, and the output of the diff is slightly different than the diff you passed. But for the rest, mpv-0.38.0 compiles without problem on amd64 (OpenGL and Vulkan backends tested on amdgpu). -- ********************************************************* Dios en su cielo, todo bien en la Tierra Index: Makefile =================================================================== RCS file: /cvs/ports/multimedia/mpv/Makefile,v diff -u -p -r1.99 Makefile --- Makefile 21 Feb 2024 10:42:42 -0000 1.99 +++ Makefile 18 Apr 2024 03:15:44 -0000 @@ -2,7 +2,7 @@ COMMENT = movie player based on MPlayer GH_ACCOUNT = mpv-player GH_PROJECT = mpv -GH_TAGNAME = v0.37.0 +GH_TAGNAME = v0.38.0 USE_NOBTCFI = Yes SHARED_LIBS += mpv 2.0 @@ -54,30 +54,31 @@ RUN_DEPENDS = devel/desktop-file-utils x11/gtk+4,-guic CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_VERSION} \ - -Dcdda=enabled \ - -Ddvdnav=enabled \ - -Dlibmpv=true \ - -Dsdl2=enabled \ - -Dsndio=enabled \ -Dalsa=disabled \ -Dandroid-media-ndk=disabled \ -Daudiounit=disabled \ + -Davfoundation=disabled \ -Dcaca=disabled \ + -Dcdda=enabled \ -Dcocoa=disabled \ -Dcoreaudio=disabled \ -Dcuda-hwaccel=disabled \ -Dcuda-interop=disabled \ + -Ddvbin=disabled \ + -Ddvdnav=enabled \ -Dd3d9-hwaccel=disabled \ -Dd3d11=disabled \ -Dd3d-hwaccel=disabled \ -Ddirect3d=disabled \ -Ddmabuf-wayland=disabled \ + -Ddrm=disabled \ -Degl-android=disabled \ -Degl-angle=disabled \ -Degl-angle-lib=disabled \ -Degl-angle-win32=disabled \ -Degl-drm=disabled \ -Degl-wayland=disabled \ + -Dgbm=disabled \ -Dgl-cocoa=disabled \ -Dgl-dxinterop=disabled \ -Dgl-dxinterop-d3d9=disabled \ @@ -85,6 +86,7 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V -Dios-gl=disabled \ -Djack=disabled \ -Djavascript=disabled \ + -Dlibmpv=true \ -Dmacos-cocoa-cb=disabled \ -Dmacos-media-player=disabled \ -Dmacos-touchbar=disabled \ @@ -93,19 +95,20 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V -Doss-audio=disabled \ -Dpipewire=disabled \ -Dpulse=disabled \ - -Drpi-mmal=disabled \ -Drubberband=disabled \ + -Dsdl2=enabled \ + -Dsdl2-audio=disabled \ -Dshaderc=disabled \ -Dsixel=disabled \ + -Dspirv-cross=disabled \ -Dswift-build=disabled \ -Dswift-flags=disabled \ - -Dsdl2-audio=disabled \ - -Dspirv-cross=disabled \ -Duchardet=disabled \ -Dvaapi=disabled \ -Dvaapi-drm=disabled \ -Dvaapi-x11=disabled \ -Dvaapi-wayland=disabled \ + -Dvaapi-win32=disabled \ -Dvapoursynth=disabled \ -Dvdpau=disabled \ -Dvdpau-gl-x11=disabled \ @@ -116,6 +119,7 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V -Dwayland=disabled \ -Dwin32-threads=disabled \ -Dwasapi=disabled + CFLAGS += -I${LOCALBASE}/include LDFLAGS += -L${LOCALBASE}/lib Index: distinfo =================================================================== RCS file: /cvs/ports/multimedia/mpv/distinfo,v diff -u -p -r1.35 distinfo --- distinfo 21 Feb 2024 10:42:42 -0000 1.35 +++ distinfo 18 Apr 2024 03:15:44 -0000 @@ -1,2 +1,2 @@ -SHA256 (mpv-0.37.0.tar.gz) = HS1K268Eii+m7hNFdQMsSy2tmn76/Vs+abiNuTWvrd8= -SIZE (mpv-0.37.0.tar.gz) = 3384190 +SHA256 (mpv-0.38.0.tar.gz) = htnvQLYFhzL2e0bQu9okoHT66GCz6q4FurMUUEEwMGY= +SIZE (mpv-0.38.0.tar.gz) = 3419741 Index: patches/patch-meson_build =================================================================== RCS file: /cvs/ports/multimedia/mpv/patches/patch-meson_build,v diff -u -p -r1.7 patch-meson_build --- patches/patch-meson_build 21 Feb 2024 10:42:42 -0000 1.7 +++ patches/patch-meson_build 18 Apr 2024 03:15:44 -0000 @@ -4,7 +4,7 @@ time if present at all, rather than only Index: meson.build --- meson.build.orig +++ meson.build -@@ -342,7 +342,19 @@ if features['libdl'] +@@ -348,7 +348,19 @@ if features['libdl'] endif # C11 atomics are mandatory but linking to the library is not always required. Index: patches/patch-osdep_threads_posix_h =================================================================== RCS file: patches/patch-osdep_threads_posix_h diff -N patches/patch-osdep_threads_posix_h --- patches/patch-osdep_threads_posix_h 21 Feb 2024 10:42:42 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -Index: osdep/threads-posix.h ---- osdep/threads-posix.h.orig -+++ osdep/threads-posix.h -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - - #include "common/common.h"