commit 7588d0090edaf393a13b3bdc9baadf9828a53d3a
Author: Jan Palus <[email protected]>
Date: Sun Jul 23 21:07:02 2023 +0200
up to 0.36.0
mpv.spec | 23 +++++++++++-----------
ytdl.patch | 64 --------------------------------------------------------------
2 files changed, 11 insertions(+), 76 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index 0637153..8d4537c 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -12,24 +12,24 @@
Summary: Movie player based on MPlayer and mplayer2
Summary(pl.UTF-8): Odtwarzacz filmów oparty na projektach MPlayer i
mplayer2
Name: mpv
-Version: 0.35.1
-Release: 4
+Version: 0.36.0
+Release: 1
License: GPL v2+
Group: Applications/Multimedia
#Source0Download: http://github.com/mpv-player/mpv/releases
Source0:
https://github.com/mpv-player/mpv/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 68460d9eb1b42bc6dc13713d4303049b
+# Source0-md5: 3ac8bb1fec1c09293a574e615446bb3b
Source1: %{name}.conf
-Patch0: ytdl.patch
URL: http://mpv.io/
BuildRequires: EGL-devel
BuildRequires: Mesa-libgbm-devel >= 17.1.0
BuildRequires: OpenAL-devel >= 1.13
BuildRequires: OpenGL-devel
BuildRequires: SDL2-devel
+BuildRequires: Vulkan-Loader-devel >= 1.3.238
BuildRequires: alsa-lib-devel >= 1.0.18
BuildRequires: docutils
-BuildRequires: ffmpeg-devel >= 4.0
+BuildRequires: ffmpeg-devel >= 4.4
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: lcms2-devel >= 2.6
BuildRequires: libarchive-devel >= 3.4.0
@@ -52,7 +52,7 @@ BuildRequires: libva-glx-devel >= 1.4.0
BuildRequires: libvdpau-devel >= 0.2
BuildRequires: lua52-devel
%{?with_js:BuildRequires: mujs-devel >= 1.0.0}
-BuildRequires: nv-codec-headers >= 8.2.15.7
+BuildRequires: nv-codec-headers >= 11.1.5.1
BuildRequires: pipewire-devel >= 0.3.19
BuildRequires: pkgconfig
BuildRequires: pulseaudio-devel >= 1.0
@@ -63,9 +63,9 @@ BuildRequires: rpmbuild(macros) >= 2.007
BuildRequires: uchardet-devel
%{?with_vapoursynth:BuildRequires: vapoursynth-devel >= 24}
BuildRequires: waf >= 2.0.21
-BuildRequires: wayland-devel >= 1.15.0
+BuildRequires: wayland-devel >= 1.20.0
BuildRequires: wayland-egl-devel
-BuildRequires: wayland-protocols >= 1.24
+BuildRequires: wayland-protocols >= 1.32
BuildRequires: xorg-lib-libX11-devel >= 1.0.0
BuildRequires: xorg-lib-libXScrnSaver-devel >= 1.0.0
BuildRequires: xorg-lib-libXdamage-devel
@@ -76,7 +76,7 @@ BuildRequires: xorg-lib-libXrandr-devel >= 1.2.0
BuildRequires: xorg-lib-libXv-devel
BuildRequires: xorg-lib-libxkbcommon-devel >= 0.3.0
BuildRequires: xorg-proto-xproto-devel
-%{?with_zimg:BuildRequires: zimg-devel >= 2.9}
+%{?with_zimg:BuildRequires: zimg-devel >= 3.0.5}
BuildRequires: zlib-devel
Requires: OpenAL >= 1.13
Requires: OpenGL
@@ -93,7 +93,7 @@ Requires: libdvdnav >= 4.2.0
Requires: libdvdread >= 4.1.0
%endif
Requires: pipewire-libs >= 0.3.19
-%{?with_libplacebo:Requires: libplacebo >= 4.157.0}
+%{?with_libplacebo:%requires_ge_to libplacebo libplacebo-devel}
Requires: libva >= 1.4.0
Requires: libva-glx >= 1.4.0
Requires: libvdpau >= 0.2
@@ -109,7 +109,7 @@ Requires: xorg-lib-libXext >= 1.0.0
Requires: xorg-lib-libXinerama >= 1.0.0
Requires: xorg-lib-libXrandr >= 1.2.0
Requires: xorg-lib-libxkbcommon >= 0.3.0
-%{?with_zimg:Requires: zimg >= 2.9}
+%{?with_zimg:Requires: zimg >= 3.0.5}
Suggests: yt-dlp
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -171,7 +171,6 @@ Dopełnianie parametrów mpv dla powłoki ZSH.
%prep
%setup -q
-%patch0 -p1
%build
%waf configure \
diff --git a/ytdl.patch b/ytdl.patch
deleted file mode 100644
index 81792de..0000000
--- a/ytdl.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 985655ebfd77ceddc44d76f8cc6dc446002f34ee Mon Sep 17 00:00:00 2001
-From: Christoph Heinrich <[email protected]>
-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 <[email protected]>
-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
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mpv.git/commitdiff/88ee6beb2d11eb707a2ca3788ca9a65e96c3f585
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
