diff --git a/mpv-rename-local-function-conflicting-with-pause.patch b/mpv-rename-local-function-conflicting-with-pause.patch new file mode 100644 index 0000000000000000000000000000000000000000..cb2005d833da661f4014e0863ef04c9571c0cf1f --- /dev/null +++ b/mpv-rename-local-function-conflicting-with-pause.patch @@ -0,0 +1,52 @@ +From 3da08a1789cf2f6d622094ae2cf0c2eb876480f0 Mon Sep 17 00:00:00 2001 +From: weidong +Date: Tue, 10 Aug 2021 17:26:07 +0800 +Subject: [PATCH] mpv: rename local function conflicting with pause +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +../audio/out/ao_pulse.c:556:13: error: conflicting types for ‘pause’ + 556 | static void pause(struct ao *ao) + | ^~~~~ +In file included from /usr/include/bits/sigstksz.h:24, + from /usr/include/signal.h:328, + from /usr/include/sys/param.h:28, + from /usr/include/pulse/sample.h:26, + from /usr/include/pulse/def.h:28, + from /usr/include/pulse/direction.h:23, + from /usr/include/pulse/pulseaudio.h:24, + from ../audio/out/ao_pulse.c:29: +/usr/include/unistd.h:489:12: note: previous declaration of ‘pause’ was here + 489 | extern int pause (void); + +Signed-off-by: weidong +--- + audio/out/ao_pulse.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c +index 5b4ced6..51ce304 100644 +--- a/audio/out/ao_pulse.c ++++ b/audio/out/ao_pulse.c +@@ -553,7 +553,7 @@ static void reset(struct ao *ao) + } + + // Pause the audio stream by corking it on the server +-static void pause(struct ao *ao) ++static void set_pause(struct ao *ao) + { + cork(ao, true); + } +@@ -824,7 +824,7 @@ const struct ao_driver audio_out_pulse = { + .get_space = get_space, + .play = play, + .get_delay = get_delay, +- .pause = pause, ++ .pause = set_pause, + .resume = resume, + .drain = drain, + .wait = wait_audio, +-- +2.20.1 + diff --git a/mpv.spec b/mpv.spec index 5113f353d640cdef401d2127037ae54308584a35..704fb4486b2b917d6ef1e8bed2ad3b87f4e069af 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv Version: 0.32.0 -Release: 1 +Release: 2 Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ @@ -12,6 +12,8 @@ Patch0: %{name}-config.patch # Fix ppc as upstream refuse to fix the issue # https://github.com/mpv-player/mpv/issues/3776 Patch1: ppc_fix.patch +# Fix pause conflicting +Patch2: mpv-rename-local-function-conflicting-with-pause.patch BuildRequires: pkgconfig(alsa) BuildRequires: desktop-file-utils @@ -160,5 +162,8 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Tue Aug 10 2021 weidong - 0.32.0-2 +- rename local function conflicting with pause + * Thu May 13 2021 He Rengui - 0.32.0-1 - package init