Upgrade to 0.35.1

mpv-config.patch

@@ -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.
- #
-

mpv-rename-local-function-conflicting-with-pause.patch

@@ -1,52 +0,0 @@
-From 3da08a1789cf2f6d622094ae2cf0c2eb876480f0 Mon Sep 17 00:00:00 2001
-From: weidong <weidong@uniontech.com>
-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 <weidong@uniontech.com>
----
- 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
-

mpv.spec

@@ -1,20 +1,11 @@
 Name:           mpv
-Version:        0.32.0
-Release:        2
+Version:        0.35.1
+Release:        1
 Summary:        Movie player playing most video formats and DVDs
-License:        GPLv2+ and LGPLv2+
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 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
 BuildRequires:  gcc
@@ -23,6 +14,7 @@ BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(enca)
 BuildRequires:  pkgconfig(libavutil) >= 56.12.100
 BuildRequires:  pkgconfig(libavcodec) >= 58.16.100
+BuildRequires:  pkgconfig(libavdevice) >= 57.0.0
 BuildRequires:  pkgconfig(libavformat) >= 58.9.100
 BuildRequires:  pkgconfig(libswscale) >= 5.0.101
 BuildRequires:  pkgconfig(libavfilter) >= 7.14.100
@@ -46,6 +38,7 @@ BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcdio_paranoia)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(libpipewire-0.3) >= 0.3.19
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libquvi-0.9)
 BuildRequires:  pkgconfig(libva)
@@ -60,9 +53,11 @@ BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-protocols)
 BuildRequires:  pkgconfig(wayland-scanner)
 BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xdamage)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xinerama)
 BuildRequires:  pkgconfig(xkbcommon)
+BuildRequires:  pkgconfig(xpresent)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xscrnsaver)
 BuildRequires:  pkgconfig(xv)
@@ -121,12 +116,12 @@ 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 \
-    --disable-vaapi \
-    --enable-dvbin
+    --enable-dvbin \
+    --enable-gl-x11 \
+    --enable-wayland
     
 
 %{_bindir}/waf -v build %{?_smp_mflags}
@@ -147,8 +142,11 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
 %dir %{_datadir}/bash-completion/completions/
 %{_datadir}/bash-completion/completions/%{name}
 %{_datadir}/icons/hicolor/*/apps/%{name}*.*
+%dir %{_datadir}/zsh/
+%dir %{_datadir}/zsh/site-functions/
 %{_datadir}/zsh/site-functions/_mpv
 %{_mandir}/man1/%{name}.*
+%{_metainfodir}/%{name}.metainfo.xml
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/encoding-profiles.conf
 
@@ -162,6 +160,11 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
 %{_libdir}/pkgconfig/mpv.pc
 
 %changelog
+* Mon Feb 27 2023 jchzhou <zhoujiacheng@iscas.ac.cn> - 0.35.1-1
+- Update to 0.35.1
+- Enabled VA-API support
+- Enabled Wayland backend & native PipeWire output support
+
 * Tue Aug 10 2021 weidong <weidong@uniontech.com> - 0.32.0-2
 - rename local function conflicting with pause
 

ppc_fix.patch

@@ -1,20 +0,0 @@
---- a/audio/out/ao_sdl.c
-+++ b/audio/out/ao_sdl.c
-@@ -28,7 +28,6 @@
- #include "options/m_option.h"
- #include "osdep/timer.h"
- 
--#include <SDL.h>
- 
- struct priv
- {
-@@ -36,6 +35,8 @@
- 
-     float buflen;
- };
-+
-+#include <SDL.h>
- 
- static const int fmtmap[][2] = {
-     {AF_FORMAT_U8,      AUDIO_U8},
-