import mpv-0.37.0-2.el9

.gitignore

@@ -1 +1 @@
-/mpv-*.tar.gz
+SOURCES/mpv-0.37.0.tar.gz

.mpv.metadata

@@ -0,0 +1 @@
+1c580de6279ab121c0e4b3e216a7ea4fa91e282c  SOURCES/mpv-0.37.0.tar.gz

SPECS/mpv.spec

@@ -1,5 +1,5 @@
 Name:           mpv
-Version:        0.35.1
+Version:        0.37.0
 Release:        2%{?dist}
 
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -7,14 +7,12 @@ 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
-
 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)
@@ -23,7 +21,6 @@ BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(caca)
 BuildRequires:  pkgconfig(dvdnav)
 BuildRequires:  pkgconfig(egl)
-BuildRequires:  pkgconfig(enca)
 BuildRequires:  pkgconfig(ffnvcodec)
 BuildRequires:  pkgconfig(gbm)
 BuildRequires:  pkgconfig(gl)
@@ -31,25 +28,26 @@ BuildRequires:  pkgconfig(jack)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libarchive) >= 3.4.0
 BuildRequires:  pkgconfig(libass)
-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(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(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
-BuildRequires:  pkgconfig(libplacebo)
+# Explictily build against libplacebo6 rhbz#2264138
+BuildRequires:  (pkgconfig(libplacebo) >= 6 with pkgconfig(libplacebo) < 7)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(libswresample) >= 3.0.100
-BuildRequires:  pkgconfig(libswscale) >= 5.0.101
+BuildRequires:  pkgconfig(libswresample) >= 3.9.100
+BuildRequires:  pkgconfig(libswscale) >= 5.9.100
 BuildRequires:  pkgconfig(libva)
 BuildRequires:  pkgconfig(lua-5.1)
 BuildRequires:  pkgconfig(mujs)
+BuildRequires:  pkgconfig(openal)
 BuildRequires:  pkgconfig(rubberband)
 BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(shaderc)
@@ -120,31 +118,75 @@ 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
-%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}
+%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
 
 %install
-waf install --destdir=%{buildroot}
+%meson_install
 
 %check
 appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metainfo.xml
@@ -170,7 +212,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}/
@@ -178,6 +220,27 @@ 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 May 01 2024 Sérgio Basto <sergio@serjux.com> - 0.36.0-3
+- Remove unused build requires (https://github.com/rpmfusion/mpv/pull/19)
+
+* Wed May 01 2024 Vitaly Zaitsev <vitaly@easycoding.org> - 0.36.0-2
+- Switched to meson by upstream request.
+
+* Wed May 01 2024 Vitaly Zaitsev <vitaly@easycoding.org> - 0.36.0-1
+- Updated to version 0.36.0.
+
+* Fri Feb 16 2024 Carl George <carlwgeorge@fedoraproject.org> - 0.35.1-3
+- Rebuild against libplacebo5 rhbz#2264138
+
+* Mon Oct 30 2023 MSVSphere Packaging Team <packager@msvsphere-os.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
 

mpv-0.35.1-yt-dlp-hook-fix.patch

@@ -1,64 +0,0 @@
-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
- 

sources

@@ -1 +0,0 @@
-SHA512 (mpv-0.35.1.tar.gz) = 42f3564a9ed4d972d14b2c697b0163f06a8bb68a0606a86c34935181247c783e3cb62286b445799998def0919fb13fce8b8f6453f82652d5bfaea5929119127a