Accepting request 1249205 from multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/1249205
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mpv?expand=0&rev=126
This commit is contained in:
Dominique Leuenberger 2025-02-28 16:39:52 +00:00 committed by Git OBS Bridge
commit 06e448c740
3 changed files with 42 additions and 0 deletions

View File

@ -0,0 +1,32 @@
From c9970b5ba66e25aeab36cdbdb91b973f2d3f8d90 Mon Sep 17 00:00:00 2001
From: llyyr <llyyr.public@gmail.com>
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;

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Feb 28 08:49:14 UTC 2025 - Enrico Belleri <kilgore.trout@idesmi.eu>
- Add 0001-dont-load-client-rt-conf.patch:
fix warning "pw.conf setting config.name to client-rt.conf is
deprecated" introduced with Pipewire 1.3.81
(https://github.com/mpv-player/mpv/issues/15914)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 18 11:08:35 UTC 2024 - llyyr@yukari.in Wed Dec 18 11:08:35 UTC 2024 - llyyr@yukari.in

View File

@ -31,6 +31,8 @@ Source: %{name}-%{version}.tar.xz
Source2: %{name}.changes Source2: %{name}.changes
# PATCH-FIX-OPENSUSE do not require equal libav versions, obs rebuilds as needed # PATCH-FIX-OPENSUSE do not require equal libav versions, obs rebuilds as needed
Patch0: mpv-make-ffmpeg-version-check-non-fatal.patch Patch0: mpv-make-ffmpeg-version-check-non-fatal.patch
# PATCH-FIX-UPSTREAM pw.conf setting config.name to client-rt.conf is deprecated (https://github.com/mpv-player/mpv/issues/15914)
Patch1: 0001-dont-load-client-rt-conf.patch
BuildRequires: bash BuildRequires: bash
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: linux-kernel-headers BuildRequires: linux-kernel-headers