diff --git a/mpv-0.32.0.tar.gz b/mpv-0.34.1.tar.gz similarity index 33% rename from mpv-0.32.0.tar.gz rename to mpv-0.34.1.tar.gz index 223de593c17ed13b47b7bfea614e152960ad0277..880cfc1f726746cb869a63e32684a7ad6825df21 100644 Binary files a/mpv-0.32.0.tar.gz and b/mpv-0.34.1.tar.gz differ diff --git a/mpv-config.patch b/mpv-config.patch deleted file mode 100644 index a411259b3554fa336f0967f7ddf44f0c2a1c8b8f..0000000000000000000000000000000000000000 --- a/mpv-config.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/etc/mpv.conf -+++ b/etc/mpv.conf -@@ -8,7 +8,7 @@ - # no builtin or example mpv.conf with all the defaults. - # - # --# Configuration files are read system-wide from /usr/local/etc/mpv.conf -+# Configuration files are read system-wide from /etc/mpv/mpv.conf - # and per-user from ~/.config/mpv/mpv.conf, where per-user settings override - # system-wide settings, all of which are overridden by the command line. - # - diff --git a/mpv-rename-local-function-conflicting-with-pause.patch b/mpv-rename-local-function-conflicting-with-pause.patch deleted file mode 100644 index cb2005d833da661f4014e0863ef04c9571c0cf1f..0000000000000000000000000000000000000000 --- a/mpv-rename-local-function-conflicting-with-pause.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 704fb4486b2b917d6ef1e8bed2ad3b87f4e069af..1af4e30f7d17e0e2f88b556fcb79a771875c0c27 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,19 +1,13 @@ Name: mpv -Version: 0.32.0 -Release: 2 +Version: 0.34.1 +Release: 1 Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://mpv.io/ Source0: https://github.com/mpv-player/mpv/archive/v%{version}/%{name}-%{version}.tar.gz -# set defaults for Fedora -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 @@ -121,7 +115,6 @@ sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc. --enable-libmpv-shared \ --enable-sdl2 \ --enable-libarchive \ - --enable-libsmbclient \ --enable-dvdnav \ --enable-cdda \ --enable-html-build \ @@ -162,6 +155,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Tue Jul 26 2022 tianlijing - 0.34.1-1 +- update to 0.34.1 + * Tue Aug 10 2021 weidong - 0.32.0-2 - rename local function conflicting with pause