På mandag 22. desember 2025 kl. 08:58, skrev [email protected] <[email protected]>:
> > > Could someone please help me with the post-install wizardry? I was not > able to get it to package without removing a line. Is this right, as > the files listed in share/examples/mpv between the tgz in ports and > the one this diff builds looks about the same? > > The 'sdl2' option was removed (for redundancy?) from meson configure as > noted in the changelog: > https://github.com/mpv-player/mpv/releases/tag/v0.41.0 > > It still enables sdl2 implicitly though: > > Run-time dependency sdl2 found: YES 2.32.8 > > Not sure if an alternative explicit enable would be preferred? > > I checked update-plist and update-patches. The removed patch looks > upstreamed from looking at the demux/demux_mkv.c in the build > folder. > > Testing and thoughts welcome especially for arch64, sparc64, and the > like, I tested amd64 but more welcome, as many people use this. > > Please don't get mad at me, I'll let someone else more experienced > push this to make sure it does not break on someone. > The formatting was copied/pasted improperly in the last diff, sorry for the noise. I also forgot to add that I built and tested these reverse dependencies: multimedia/mpvqt x11/kde-applications/kalarm (works fine in wayland and xwayland with '--platform xcb') x11/kde-applications/plasmatube (requires '--platform xcb' on sway) x11/smplayer (requires '--platform xcb' on sway) And question whether that the library bump should be 2.1 or 3.0. yaydn > Thank you. > Index: Makefile =================================================================== RCS file: /cvs/ports/multimedia/mpv/Makefile,v diff -u -p -u -p -r1.108 Makefile --- Makefile 26 Mar 2025 22:17:11 -0000 1.108 +++ Makefile 22 Dec 2025 08:43:39 -0000 @@ -2,10 +2,10 @@ COMMENT = movie player based on MPlayer GH_ACCOUNT = mpv-player GH_PROJECT = mpv -GH_TAGNAME = v0.40.0 +GH_TAGNAME = v0.41.0 USE_NOBTCFI = Yes -SHARED_LIBS += mpv 2.0 +SHARED_LIBS += mpv 2.1 CATEGORIES = multimedia x11 @@ -56,7 +56,9 @@ RUN_DEPENDS = devel/desktop-file-utils x11/gtk+4,-guic CONFIGURE_ARGS = -Dalsa=disabled \ + -Daaudio=disabled \ -Dandroid-media-ndk=disabled \ + -Daudiotrack=disabled \ -Daudiounit=disabled \ -Davfoundation=disabled \ -Dcaca=disabled \ @@ -99,7 +101,6 @@ CONFIGURE_ARGS = -Dalsa=disabled \ -Dpulse=disabled \ -Drubberband=disabled \ -Dsdl2-audio=disabled \ - -Dsdl2=enabled \ -Dshaderc=disabled \ -Dsixel=disabled \ -Dspirv-cross=disabled \ @@ -130,7 +131,6 @@ post-install: ${INSTALL_DATA} ${WRKDIST}/TOOLS/mpv_identify.sh \ ${WRKDIST}/TOOLS/umpv ${PREFIX}/share/examples/mpv ${MODPY_BIN_ADJ} ${PREFIX}/share/examples/mpv/umpv - mv -f ${WRKINST}${SYSCONFDIR}/mpv/* ${PREFIX}/share/examples/mpv sed -Ei 's,(/dev/dvd|/dev/cdrom),/dev/rcd0c,g' ${PREFIX}/man/man1/mpv.1 .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/multimedia/mpv/distinfo,v diff -u -p -u -p -r1.38 distinfo --- distinfo 26 Mar 2025 22:17:11 -0000 1.38 +++ distinfo 22 Dec 2025 08:43:39 -0000 @@ -1,2 +1,2 @@ -SHA256 (mpv-0.40.0.tar.gz) = EKD0ZU9iFApt1NOA3PC729z25pdVaGPcSZwpYYLwgaM= -SIZE (mpv-0.40.0.tar.gz) = 3561474 +SHA256 (mpv-0.41.0.tar.gz) = 7iEJKl7kJzUzkjYJKdxkZFxUR5rv21urxc+7X61iYgk= +SIZE (mpv-0.41.0.tar.gz) = 7262018 Index: patches/patch-demux_demux_mkv_c =================================================================== RCS file: patches/patch-demux_demux_mkv_c diff -N patches/patch-demux_demux_mkv_c --- patches/patch-demux_demux_mkv_c 21 Oct 2025 13:04:43 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -Index: demux/demux_mkv.c ---- demux/demux_mkv.c.orig -+++ demux/demux_mkv.c -@@ -2200,16 +2200,16 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_ - // [0x30..0x37] are component tags utilized for - // non-mobile captioning service ("profile A"). - if (component_tag >= 0x30 && component_tag <= 0x37) -- lav->profile = FF_PROFILE_ARIB_PROFILE_A; -+ lav->profile = AV_PROFILE_ARIB_PROFILE_A; - break; - case 0x0012: - // component tag 0x87 signifies a mobile/partial reception - // (1seg) captioning service ("profile C"). - if (component_tag == 0x87) -- lav->profile = FF_PROFILE_ARIB_PROFILE_C; -+ lav->profile = AV_PROFILE_ARIB_PROFILE_C; - break; - } -- if (lav->profile == FF_PROFILE_UNKNOWN) -+ if (lav->profile == AV_PROFILE_UNKNOWN) - MP_WARN(demuxer, "ARIB caption profile %02x / %04x not supported.\n", - component_tag, data_component_id); - } Index: patches/patch-meson_build =================================================================== RCS file: /cvs/ports/multimedia/mpv/patches/patch-meson_build,v diff -u -p -u -p -r1.12 patch-meson_build --- patches/patch-meson_build 26 Mar 2025 22:17:15 -0000 1.12 +++ patches/patch-meson_build 22 Dec 2025 08:43:39 -0000 @@ -5,7 +5,7 @@ Support for xcb-shm Index: meson.build --- meson.build.orig +++ meson.build -@@ -358,7 +358,19 @@ if features['libdl'] +@@ -356,7 +356,19 @@ if features['libdl'] endif # C11 atomics are mandatory but linking to the library is not always required. @@ -26,7 +26,7 @@ Index: meson.build cplugins = get_option('cplugins').require( win32 or (features['libdl'] and cc.has_link_argument('-rdynamic')), -@@ -1070,7 +1082,10 @@ x11 = { +@@ -1089,7 +1101,10 @@ x11 = { dependency('xscrnsaver', version: '>= 1.0.0', required: x11_opt), dependency('xext', version: '>= 1.0.0', required: x11_opt), dependency('xpresent', version: '>= 1.0.0', required: x11_opt),
