From 33295f6375dcf129e84948629ac897b7bcaf288d Mon Sep 17 00:00:00 2001 From: dogknowsnx Date: Sun, 19 Oct 2025 11:45:40 +0200 Subject: [PATCH 1/2] libplacebo: update to 7.351.0 Force-push for building w/ meson-1.9.1 --- common/shlibs | 2 +- srcpkgs/libplacebo/patches/fix-for-python.patch | 13 +++++++++++++ srcpkgs/libplacebo/template | 6 +++--- 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/libplacebo/patches/fix-for-python.patch diff --git a/common/shlibs b/common/shlibs index 4d95b4bc64cf4b..5dd795db065e03 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3523,7 +3523,7 @@ libSoapySDR.so.0.8 SoapySDR-0.8.1_1 libeditorconfig.so.0 editorconfig-0.12.2_1 libcfitsio.so.10 cfitsio-4.2.0_1 libapparmor.so.1 libapparmor-2.12.0_1 -libplacebo.so.338 libplacebo-6.338.2_1 +libplacebo.so.351 libplacebo-7.351.0_1 libw2xc.so waifu2x-converter-cpp-5.2_1 libnova-0.15.so.0 libnova-0.15.0_1 libcue.so.2 libcue-2.2.0_1 diff --git a/srcpkgs/libplacebo/patches/fix-for-python.patch b/srcpkgs/libplacebo/patches/fix-for-python.patch new file mode 100644 index 00000000000000..773461bed934dd --- /dev/null +++ b/srcpkgs/libplacebo/patches/fix-for-python.patch @@ -0,0 +1,13 @@ +https://github.com/haasn/libplacebo/issues/335 +--- a/src/vulkan/utils_gen.py ++++ b/src/vulkan/utils_gen.py +@@ -202,7 +202,8 @@ if __name__ == '__main__': + if not xmlfile or xmlfile == '': + xmlfile = find_registry_xml(datadir) + +- registry = VkXML(ET.parse(xmlfile)) ++ tree = ET.parse(xmlfile) ++ registry = VkXML(tree.getroot()) + with open(outfile, 'w') as f: + f.write(TEMPLATE.render( + vkresults = get_vkenum(registry, 'VkResult'), diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template index 7d3761b7be57fd..0193f03499be66 100644 --- a/srcpkgs/libplacebo/template +++ b/srcpkgs/libplacebo/template @@ -1,7 +1,7 @@ # Template file for 'libplacebo' pkgname=libplacebo -version=6.338.2 -revision=3 +version=7.351.0 +revision=1 build_style=meson configure_args="-Dshaderc=enabled -Dvulkan=enabled -Ddemos=false $(vopt_feature lcms) $(vopt_feature opengl)" @@ -14,7 +14,7 @@ maintainer="Enrico Belleri " license="LGPL-2.1-or-later" homepage="https://code.videolan.org/videolan/libplacebo" distfiles="https://code.videolan.org/videolan/libplacebo/-/archive/v${version}/libplacebo-v${version}.tar.gz" -checksum=d029adbe55bba8aed7aed2c48b0b66081dddfb9d42683a709342e33aa666c544 +checksum=4efe1c8d4da3c61295eb5fdfa50e6037409d8425eb3c15dd86788679c4ce59ee if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -Dtests=true" From 9381ca2e56034142ff7b84c2a004c1b9ba6e729a Mon Sep 17 00:00:00 2001 From: dogknowsnx Date: Sun, 28 Dec 2025 13:00:45 +0100 Subject: [PATCH 2/2] mpv: update to 0.41.0 Remove sdl build option: https://github.com/mpv-player/mpv/commit/609acc7cf203e761df0d32fdfccd9d365e6b6b81 --- srcpkgs/mpv/patches/fix-clipboard-polling.patch | 16 ---------------- srcpkgs/mpv/template | 17 +++++++---------- 2 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/mpv/patches/fix-clipboard-polling.patch diff --git a/srcpkgs/mpv/patches/fix-clipboard-polling.patch b/srcpkgs/mpv/patches/fix-clipboard-polling.patch deleted file mode 100644 index 13612bed860e9c..00000000000000 --- a/srcpkgs/mpv/patches/fix-clipboard-polling.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://github.com/mpv-player/mpv/pull/16140 ---- a/player/clipboard/clipboard-wayland.c -+++ b/player/clipboard/clipboard-wayland.c -@@ -348,6 +348,12 @@ static bool clipboard_wayland_dispatch_events(struct clipboard_wayland_priv *wl, - if (fds[1].revents & POLLIN) - return false; - -+ if (fds[2].revents & (POLLERR | POLLHUP | POLLNVAL)) -+ destroy_offer(wl->selection_offer); -+ -+ if (fds[3].revents & (POLLERR | POLLHUP | POLLNVAL)) -+ destroy_offer(wl->primary_selection_offer); -+ - if (fds[2].revents & POLLIN) - get_selection_data(wl, wl->selection_offer, false); - diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index b6fb7b849802d4..771c2566fddc59 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,7 +1,7 @@ # Template file for 'mpv' pkgname=mpv -version=0.40.0 -revision=4 +version=0.41.0 +revision=1 build_style=meson configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled -Dlibmpv=true -Dcplugins=enabled @@ -13,7 +13,6 @@ configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled $(vopt_feature lua lua) $(vopt_feature openal openal) $(vopt_feature pulseaudio pulse) - $(vopt_feature sdl2 sdl2) $(vopt_feature vapoursynth vapoursynth) $(vopt_feature vdpau vdpau) $(vopt_feature vulkan vulkan) @@ -29,9 +28,8 @@ makedepends="MesaLib-devel ffmpeg6-devel harfbuzz-devel libXv-devel libass-devel $(vopt_if jack jack-devel) $(vopt_if javascript mujs-devel) $(vopt_if lcms lcms2-devel) $(vopt_if lua lua52-devel) $(vopt_if openal libopenal-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if pipewire pipewire-devel) - $(vopt_if sdl2 SDL2-devel) $(vopt_if vapoursynth vapoursynth-devel) - $(vopt_if vdpau libvdpau-devel) $(vopt_if sndio sndio-devel) - $(vopt_if vulkan "vulkan-loader-devel") + $(vopt_if vapoursynth vapoursynth-devel) $(vopt_if vdpau libvdpau-devel) + $(vopt_if sndio sndio-devel) $(vopt_if vulkan "vulkan-loader-devel") $(vopt_if wayland "wayland-devel wayland-protocols libxkbcommon-devel") $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel libXpresent-devel")" depends="desktop-file-utils hicolor-icon-theme" @@ -41,17 +39,16 @@ license="GPL-2.0-or-later" homepage="https://mpv.io" changelog="https://github.com/mpv-player/mpv/releases" distfiles="https://github.com/mpv-player/mpv/archive/v${version}.tar.gz" -checksum=10a0f4654f62140a6dd4d380dcf0bbdbdcf6e697556863dc499c296182f081a3 +checksum=ee21092a5ee427353392360929dc64645c54479aefdb5babc5cfbb5fad626209 python_version=3 -build_options="alsa caca jack javascript lcms lua openal pulseaudio pipewire sdl2 - sndio vapoursynth vdpau vulkan wayland x11" +build_options="alsa caca jack javascript lcms lua openal pulseaudio pipewire sndio + vapoursynth vdpau vulkan wayland x11" build_options_default="alsa jack javascript lcms lua pulseaudio pipewire vdpau vulkan sndio wayland x11" desc_option_caca="Enable support for libcaca video output" desc_option_lcms="Enable support for LittleCMS 2 engine" desc_option_openal="Enable support for OpenAL audio output" -vopt_conflict sdl2 wayland post_install() { vbin TOOLS/umpv