6 changed files with 180 additions and 96 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/mpv-*.tar.gz
+SOURCES/mpv-0.35.1.tar.gz
--- a/.mpv.metadata
+++ b/.mpv.metadata
@ -0,0 +1 @@
+b8561e11e776b423055715bfe184d117cdf96732  SOURCES/mpv-0.35.1.tar.gz
--- a/SOURCES/0001-Added-Russian-description-and-summary-for-gnome-soft.patch
+++ b/SOURCES/0001-Added-Russian-description-and-summary-for-gnome-soft.patch
@ -0,0 +1,61 @@
+From 4b5a9b0d0d936c045e5edd11e67302dcccb005d3 Mon Sep 17 00:00:00 2001
+From: Sergey Cherevko <s.cherevko@msvsphere.ru>
+Date: Wed, 9 Aug 2023 10:43:44 +0300
+Subject: [PATCH] Added Russian description and summary for gnome-software.
+
+---
+ etc/mpv.desktop      | 3 ++-
+ etc/mpv.metainfo.xml | 8 ++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/etc/mpv.desktop b/etc/mpv.desktop
+index 19ab1fb..0edecdd 100644
+--- a/etc/mpv.desktop
+++ b/etc/mpv.desktop
+@@ -7,7 +7,7 @@ Name[da]=mpv-medieafspiller
+ Name[fr]=Lecteur multimédia mpv
+ Name[ja]=mpv メディアプレイヤー
+ Name[pl]=Odtwarzacz mpv
+-Name[ru]=Проигрыватель mpv
+Name[ru]=Проигрыватель мультимедиа mpv
+ Name[tr]=mpv Ortam Oynatıcı
+ Name[zh_CN]=mpv 媒体播放器
+ Name[zh_TW]=mpv 媒體播放器
+@@ -16,6 +16,7 @@ GenericName[cs]=Multimediální přehrávač
+ GenericName[da]=Multimedieafspiller
+ GenericName[fr]=Lecteur multimédia
+ GenericName[ja]=マルチメディアプレイヤー
+GenericName[ru]=Проигрыватель мультимедиа
+ GenericName[tr]=Çoklu ortam oynatıcı
+ GenericName[zh_CN]=多媒体播放器
+ GenericName[zh_TW]=多媒體播放器
+diff --git a/etc/mpv.metainfo.xml b/etc/mpv.metainfo.xml
+index 618abd3..4a8b352 100644
+--- a/etc/mpv.metainfo.xml
+++ b/etc/mpv.metainfo.xml
+@@ -2,7 +2,9 @@
+ <component type="desktop-application">
+     <id>io.mpv.mpv</id>
+     <name>mpv</name>
+    <name xml:lang="ru">Проигрыватель мультимедиа mpv</name>
+     <summary>A free, open source, and cross-platform media player</summary>
+    <summary xml:lang="ru">Бесплатный кроссплатформенный медиаплеер с открытым исходным кодом.</summary>
+     <description>
+         <p>mpv is a free (as in freedom) media player for the command line. It supports a wide variety of media file formats, audio and video codecs, and subtitle types.</p>
+         <p>mpv has an OpenGL, Vulkan, and D3D11 based video output that is capable of many features loved by videophiles, such as video scaling with popular high quality algorithms, color management, frame timing, interpolation, HDR, and more.</p>
+@@ -10,6 +12,12 @@
+         <p>mpv can leverage most hardware decoding APIs on all platforms. Hardware decoding can be enabled at runtime on demand.</p>
+         <p>Powerful scripting capabilities can make the player do almost anything. There is a large selection of user scripts on the wiki.</p>
+         <p>A straightforward C API was designed from the ground up to make mpv usable as a library and facilitate easy integration into other applications.</p>
+        <p xml:lang="ru">mpv - это бесплатный медиаплеер для командной строки. Он поддерживает широкий спектр форматов медиафайлов, аудио- и видеокодеков, а также типов субтитров.</p>
+        <p xml:lang="ru">mpv имеет видеовыход на основе OpenGL, Vulkan и D3D11, который поддерживает многие функции, любимые видеофилами, такие как масштабирование видео с помощью популярных алгоритмов высокого качества, управление цветом, синхронизация кадров, интерполяция, HDR и многое другое.</p>
+        <p xml:lang="ru">Хотя mpv стремится к минимализму и не имеет реального графического интерфейса, он имеет небольшой контроллер поверх видео для базового управления.</p>
+        <p xml:lang="ru">mpv может использовать большинство API аппаратного декодирования на всех платформах. Аппаратное декодирование может быть включено во время выполнения по требованию.</p>
+        <p xml:lang="ru">Мощные возможности сценариев могут заставить игрока делать практически все что угодно. На вики есть большой выбор пользовательских скриптов.</p>
+        <p xml:lang="ru">Простой C API был разработан с нуля, чтобы сделать mpv пригодным для использования в качестве библиотеки и упростить интеграцию с другими приложениями.</p>
+     </description>
+     <metadata_license>CC0-1.0</metadata_license>
+     <project_license>GPL-2.0-or-later AND LGPL-2.0-or-later</project_license>
+-- 
+2.39.2
+
--- a/SOURCES/mpv-0.35.1-yt-dlp-hook-fix.patch
+++ b/SOURCES/mpv-0.35.1-yt-dlp-hook-fix.patch
@ -0,0 +1,64 @@
+From 985655ebfd77ceddc44d76f8cc6dc446002f34ee Mon Sep 17 00:00:00 2001
+From: Christoph Heinrich <christoph.heinrich@student.tugraz.at>
+Date: Fri, 3 Mar 2023 00:45:45 +0100
+Subject: [PATCH 1/2] ytdl_hook: init fragment requires other fragments
+
+With dash the first fragment was always considered an init fragment if
+there wasn't a duration. However that only makes sense when there are
+also other fragments, so check if there are other fragments in addition
+to the lack of a duration.
+---
+ player/lua/ytdl_hook.lua | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua
+index 27e5f4544b2..9e50b3a80b8 100644
+--- a/player/lua/ytdl_hook.lua
+++ b/player/lua/ytdl_hook.lua
+@@ -297,7 +297,7 @@ local function edl_track_joined(fragments, protocol, is_live, base)
+         local args = ""
+ 
+         -- assume MP4 DASH initialization segment
+-        if not fragments[1].duration then
+        if not fragments[1].duration and #fragments > 1 then
+             msg.debug("Using init segment")
+             args = args .. ",init=" .. edl_escape(join_url(base, fragments[1]))
+             offset = 2
+
+From a5961ad096b1361a12f836c8b170fc748f46962a Mon Sep 17 00:00:00 2001
+From: Christoph Heinrich <christoph.heinrich@student.tugraz.at>
+Date: Fri, 3 Mar 2023 00:50:58 +0100
+Subject: [PATCH 2/2] ytdl_hook: only log error when no fallback url available
+
+An error indicates that something doesn't work, but as long as a
+safe url is available, playback is still expected to work.
+
+Thus reduce logging level of MP4 DASH without fragments message and
+add a new error message for when there is no safe url available either.
+
+Also adds a missing space.
+---
+ player/lua/ytdl_hook.lua | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua
+index 9e50b3a80b8..77f7446ed22 100644
+--- a/player/lua/ytdl_hook.lua
+++ b/player/lua/ytdl_hook.lua
+@@ -309,7 +309,7 @@ local function edl_track_joined(fragments, protocol, is_live, base)
+         -- if not available in all, give up.
+         for i = offset, #fragments do
+             if not fragments[i].duration then
+-                msg.error("EDL doesn't support fragments" ..
+                msg.verbose("EDL doesn't support fragments " ..
+                          "without duration with MP4 DASH")
+                 return nil
+             end
+@@ -423,6 +423,7 @@ local function formats_to_edl(json, formats, use_all_formats)
+             track.protocol, json.is_live,
+             track.fragment_base_url)
+         if not edl_track and not url_is_safe(track.url) then
+            msg.error("No safe URL or supported fragmented stream available")
+             return nil
+         end
+ 
--- a/SPECS/mpv.spec
+++ b/SPECS/mpv.spec
@ -1,18 +1,21 @@
 Name:           mpv
-Version:        0.37.0
-Release:        2%{?dist}
+Version:        0.35.1
+Release:        2%{?dist}.inferit.3

 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary:        Movie player playing most video formats and DVDs
 URL:            https://%{name}.io/
 Source0:        https://github.com/%{name}-player/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz

+# https://github.com/mpv-player/mpv/pull/11398
+Patch100:       %{name}-0.35.1-yt-dlp-hook-fix.patch
+Patch500:       0001-Added-Russian-description-and-summary-for-gnome-soft.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc
 BuildRequires:  libappstream-glib
-BuildRequires:  libatomic
-BuildRequires:  meson
 BuildRequires:  python3-docutils
+BuildRequires:  waf-python3

 BuildRequires:  perl(Encode)
 BuildRequires:  perl(Math::BigInt)
@ -21,6 +24,7 @@ BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(caca)
 BuildRequires:  pkgconfig(dvdnav)
 BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(enca)
 BuildRequires:  pkgconfig(ffnvcodec)
 BuildRequires:  pkgconfig(gbm)
 BuildRequires:  pkgconfig(gl)
@ -28,26 +32,25 @@ BuildRequires:  pkgconfig(jack)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libarchive) >= 3.4.0
 BuildRequires:  pkgconfig(libass)
-BuildRequires:  pkgconfig(libavcodec) >= 59.27.100
-BuildRequires:  pkgconfig(libavdevice) >= 58.13.100
-BuildRequires:  pkgconfig(libavfilter) >= 7.110.100
-BuildRequires:  pkgconfig(libavformat) >= 59.24.100
-BuildRequires:  pkgconfig(libavutil) >= 57.24.100
+BuildRequires:  pkgconfig(libavcodec) >= 58.16.100
+BuildRequires:  pkgconfig(libavdevice) >= 57.0.0
+BuildRequires:  pkgconfig(libavfilter) >= 7.14.100
+BuildRequires:  pkgconfig(libavformat) >= 58.9.100
+BuildRequires:  pkgconfig(libavutil) >= 56.12.100
 BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcdio_paranoia)
 BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libguess)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libpipewire-0.3) >= 0.3.19
-# Explictily build against libplacebo6 rhbz#2264138
-BuildRequires:  (pkgconfig(libplacebo) >= 6 with pkgconfig(libplacebo) < 7)
+BuildRequires:  pkgconfig(libplacebo)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(libswresample) >= 3.9.100
-BuildRequires:  pkgconfig(libswscale) >= 5.9.100
+BuildRequires:  pkgconfig(libswresample) >= 3.0.100
+BuildRequires:  pkgconfig(libswscale) >= 5.0.101
 BuildRequires:  pkgconfig(libva)
 BuildRequires:  pkgconfig(lua-5.1)
 BuildRequires:  pkgconfig(mujs)
-BuildRequires:  pkgconfig(openal)
 BuildRequires:  pkgconfig(rubberband)
 BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(shaderc)
@ -118,75 +121,31 @@ This package contains development header files and libraries for Mpv.
 %prep
 %autosetup -p1
 sed -e "s|/usr/local/etc|%{_sysconfdir}/%{name}|" -i etc/%{name}.conf
+sed -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc.standard_includes.append('$(pkgconf --variable=includedir libavcodec)')|" -i wscript

 %build
-%meson --auto-features=auto \
-    -Dalsa=enabled \
-    -Dbuild-date=false \
-    -Dcaca=enabled \
-    -Dcdda=enabled \
-    -Dcplayer=true \
-    -Dcplugins=enabled \
-    -Dcuda-hwaccel=enabled \
-    -Dcuda-interop=enabled \
-    -Ddmabuf-wayland=enabled \
-    -Ddrm=enabled \
-    -Ddvbin=enabled \
-    -Ddvdnav=enabled \
-    -Degl-drm=enabled \
-    -Degl-wayland=enabled \
-    -Degl-x11=enabled \
-    -Degl=enabled \
-    -Dgbm=enabled \
-    -Dgl-x11=enabled \
-    -Dgl=enabled \
-    -Dhtml-build=enabled \
-    -Diconv=enabled \
-    -Djack=enabled \
-    -Djavascript=enabled \
-    -Djpeg=enabled \
-    -Dlcms2=enabled \
-    -Dlibarchive=enabled \
-    -Dlibavdevice=enabled \
-    -Dlibbluray=enabled \
-    -Dlibmpv=true \
-    -Dlua=enabled \
-    -Dmanpage-build=enabled \
-    -Dopenal=enabled \
-    -Dopensles=disabled \
-    -Doss-audio=disabled \
-    -Dpipewire=enabled \
-    -Dplain-gl=enabled \
-    -Dpulse=enabled \
-    -Drubberband=enabled \
-    -Dsdl2-audio=enabled \
-    -Dsdl2-gamepad=enabled \
-    -Dsdl2-video=enabled \
-    -Dsdl2=enabled \
-    -Dshaderc=enabled \
-    -Dsndio=disabled \
-    -Dspirv-cross=disabled \
-    -Duchardet=enabled \
-    -Dvaapi-drm=enabled \
-    -Dvaapi-wayland=enabled \
-    -Dvaapi-x11=enabled \
-    -Dvaapi=enabled \
-    -Dvapoursynth=enabled \
-    -Dvdpau-gl-x11=enabled \
-    -Dvdpau=enabled \
-    -Dvector=enabled \
-    -Dvulkan-interop=disabled \
-    -Dvulkan=enabled \
-    -Dwayland=enabled \
-    -Dwerror=false \
-    -Dx11=enabled \
-    -Dxv=enabled \
-    -Dzimg=enabled \
-    -Dzlib=enabled
-%meson_build
+%set_build_flags
+waf configure \
+    --prefix=%{_prefix} \
+    --bindir=%{_bindir} \
+    --libdir=%{_libdir} \
+    --mandir=%{_mandir} \
+    --docdir=%{_docdir}/%{name} \
+    --confdir=%{_sysconfdir}/%{name} \
+    --disable-build-date \
+    --enable-libmpv-shared \
+    --enable-sdl2 \
+    --enable-libarchive \
+    --enable-dvdnav \
+    --enable-cdda \
+    --enable-html-build \
+    --enable-dvbin \
+    --enable-gl-x11 \
+    --enable-wayland
+waf -v build %{?_smp_mflags}

 %install
-%meson_install
+waf install --destdir=%{buildroot}

 %check
 appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metainfo.xml
@ -212,7 +171,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop

 %files libs
 %license LICENSE.GPL LICENSE.LGPL Copyright
-%{_libdir}/lib%{name}.so.2{,.*}
+%{_libdir}/lib%{name}.so.2*

 %files devel
 %{_includedir}/%{name}/
@ -220,23 +179,23 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 %{_libdir}/pkgconfig/%{name}.pc

 %changelog
-* Wed May 01 2024 Carl George <carlwgeorge@fedoraproject.org> - 0.37.0-2
- Build against libplacebo6
-
-* Wed May 01 2024 Neal Gompa <ngompa@fedoraproject.org> - 0.37.0-1
- Update to 0.37.0
+* Wed Oct 25 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 0.35.1-2.inferit.3
+- Fixed version in previos changelog record
+- Bump version
+- Rebuilt for MSVSphere 9.2

-* Wed May 01 2024 Sérgio Basto <sergio@serjux.com> - 0.36.0-3
- Remove unused build requires (https://github.com/rpmfusion/mpv/pull/19)
+* Fri Aug 11 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 0.35.1-2.inferit.2
+- Updated Russian description for gnome-software

-* Wed May 01 2024 Vitaly Zaitsev <vitaly@easycoding.org> - 0.36.0-2
- Switched to meson by upstream request.
+* Wed Aug 09 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 0.35.1-2.inferit.1
+- Added Russian description and summary for ArcMenu and gnome-software
+- Rebuilt for MSVSphere 9.2

-* Wed May 01 2024 Vitaly Zaitsev <vitaly@easycoding.org> - 0.36.0-1
- Updated to version 0.36.0.
+* Tue Jul 18 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 0.35.1-2.inferit
+- Rebuilt against new libplacebo

-* Fri Feb 16 2024 Carl George <carlwgeorge@fedoraproject.org> - 0.35.1-3
- Rebuild against libplacebo5 rhbz#2264138
+* Tue Jul 18 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 0.35.1-2
+- Rebuilt for MSVSphere 9.2

 * Tue Mar 07 2023 Maxwell G <maxwell@gtmx.me> - 0.35.1-2
 - Backport upstream patch to fix yt-dlp hook
--- a/1
+++ b/1
@ -1 +0,0 @@
-SHA512 (mpv-0.37.0.tar.gz) = a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
				`@ -0,0 +1 @@`
				`b8561e11e776b423055715bfe184d117cdf96732 SOURCES/mpv-0.35.1.tar.gz`
				`@ -1 +0,0 @@`
				`SHA512 (mpv-0.37.0.tar.gz) = a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257`