From 16544c232f3a65686970508ab5f90c47adfe9f53 Mon Sep 17 00:00:00 2001 From: tm512 Date: Thu, 6 Mar 2025 17:16:11 -0800 Subject: [PATCH] mpv: backport fix for pipewire-1.4.0 --- .../mpv/patches/0.39.0-pipewire-1.4-fix.patch | 33 +++++++++++++++++++ srcpkgs/mpv/template | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/mpv/patches/0.39.0-pipewire-1.4-fix.patch diff --git a/srcpkgs/mpv/patches/0.39.0-pipewire-1.4-fix.patch b/srcpkgs/mpv/patches/0.39.0-pipewire-1.4-fix.patch new file mode 100644 index 00000000000..bdeaade6f93 --- /dev/null +++ b/srcpkgs/mpv/patches/0.39.0-pipewire-1.4-fix.patch @@ -0,0 +1,33 @@ +https://github.com/mpv-player/mpv/commit/c9970b5ba66e25aeab36cdbdb91b973f2d3f8d90.patch +From c9970b5ba66e25aeab36cdbdb91b973f2d3f8d90 Mon Sep 17 00:00:00 2001 +From: llyyr +Date: Wed, 19 Feb 2025 19:08:36 +0530 +Subject: [PATCH] ao_pipewire: don't load client-rt.conf properties + +Deprecated in https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/24bcacc6195ffbf8e40c9ea1374eb6666252eadc + +Fixes: #15914 +--- + audio/out/ao_pipewire.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/audio/out/ao_pipewire.c b/audio/out/ao_pipewire.c +index 5e6bb1fa4fdf7..88c48ddca60e7 100644 +--- a/audio/out/ao_pipewire.c ++++ b/audio/out/ao_pipewire.c +@@ -510,10 +510,11 @@ static int pipewire_init_boilerplate(struct ao *ao) + if (pw_thread_loop_start(p->loop) < 0) + goto error; + +- context = pw_context_new( +- pw_thread_loop_get_loop(p->loop), +- pw_properties_new(PW_KEY_CONFIG_NAME, "client-rt.conf", NULL), +- 0); ++ struct pw_properties *props = NULL; ++#if !PW_CHECK_VERSION(1, 3, 81) ++ props = pw_properties_new(PW_KEY_CONFIG_NAME, "client-rt.conf", NULL); ++#endif ++ context = pw_context_new(pw_thread_loop_get_loop(p->loop), props, 0); + if (!context) + goto error; + diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index c1ce4c3a59a..778f5e6fd5b 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,7 +1,7 @@ # Template file for 'mpv' pkgname=mpv version=0.39.0 -revision=2 +revision=3 build_style=meson configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled -Dlibmpv=true -Dcplugins=enabled