+++ /dev/null
-diff -urN mpv-0.4.1.orig/waftools/checks/custom.py mpv-0.4.1/waftools/checks/custom.py
---- mpv-0.4.1.orig/waftools/checks/custom.py 2014-07-13 14:14:32.237927069 +0200
-+++ mpv-0.4.1/waftools/checks/custom.py 2014-07-13 14:13:33.231257514 +0200
-@@ -66,6 +66,7 @@
- ( '51', 'lua >= 5.1.0 lua < 5.2.0'),
- ( '51deb', 'lua5.1 >= 5.1.0'), # debian
- ( '51fbsd', 'lua-5.1 >= 5.1.0'), # FreeBSD
-+ ( '51pld', 'lua51 >= 5.1.0'), # PLD
- ( '52', 'lua >= 5.2.0 lua < 5.3.0' ),
- ( '52deb', 'lua5.2 >= 5.2.0'), # debian
- ( '52fbsd', 'lua-5.2 >= 5.2.0'), # FreeBSD
# Conditional build:
%bcond_without caca # CACA
%bcond_without dvdnav # dvdnav support
+%bcond_without js # JavaScript scripting support
%bcond_without libplacebo # libplacebo support
%bcond_without rubberband # librubberband support
-%bcond_without samba # Samba support (makes mpv GPLv3)
%bcond_without shaderc # libshaderc SPIR-V compiler
%bcond_without vapoursynth # VapourSynth filter bridge
%bcond_without zimg # libzimg support (high quality software scaler)
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.32.0
-Release: 7
-License: GPL v%{!?with_samba:2}%{?with_samba:3}+
+Version: 0.33.0
+Release: 1
+License: GPL v2+
Group: Applications/Multimedia
#Source0Download: http://github.com/mpv-player/mpv/releases
Source0: http://github.com/mpv-player/mpv/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 1f7d23afe7a8639dedc9f7beef4e90d7
+# Source0-md5: b08d25d3a44c3362984636e5dfa78ecc
Source1: %{name}.conf
-Patch0: %{name}-lua.patch
-Patch1: %{name}-shaderc.patch
-Patch2: rtsp.patch
+Patch0: %{name}-shaderc.patch
URL: http://mpv.io/
BuildRequires: EGL-devel
BuildRequires: Mesa-libgbm-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: lcms2-devel >= 2.6
BuildRequires: libarchive-devel >= 3.4.0
-BuildRequires: libass-devel >= 0.12.1
+BuildRequires: libass-devel >= 0.12.2
%ifarch i386 i486
BuildRequires: libatomic-devel
%endif
BuildRequires: libdvdread-devel >= 4.1.0
%endif
BuildRequires: libjpeg-devel
-%{?with_libplacebo:BuildRequires: libplacebo-devel >= 0.18.0}
-%{?with_samba:BuildRequires: libsmbclient-devel}
+%{?with_libplacebo:BuildRequires: libplacebo-devel >= 1.18.0}
BuildRequires: libva-devel >= 1.4.0
BuildRequires: libva-glx-devel >= 1.4.0
BuildRequires: libvdpau-devel >= 0.2
-BuildRequires: lua51-devel
+BuildRequires: lua52-devel
+%{?with_js:BuildRequires: mujs-devel >= 1.0.0}
BuildRequires: nv-codec-headers >= 8.2.15.7
BuildRequires: pkgconfig
BuildRequires: pulseaudio-devel >= 1.0
%{?with_shaderc:BuildRequires: shaderc-devel >= 2019.0}
BuildRequires: uchardet-devel
%{?with_vapoursynth:BuildRequires: vapoursynth-devel >= 24}
-BuildRequires: waf >= 1.8.12
+BuildRequires: waf >= 2.0.21
BuildRequires: wayland-devel >= 1.15.0
BuildRequires: wayland-egl-devel
BuildRequires: wayland-protocols >= 1.14
%requires_eq_to ffmpeg-libs ffmpeg-devel
Requires: lcms2 >= 2.6
Requires: libarchive >= 3.4.0
-Requires: libass >= 0.12.1
+Requires: libass >= 0.12.2
Requires: libbluray >= 0.3.0
%{?with_caca:Requires: libcaca >= 0.99-0.beta18.1}
Requires: libdrm >= 2.4.74
Requires: libdvdnav >= 4.2.0
Requires: libdvdread >= 4.1.0
%endif
-%{?with_libplacebo:Requires: libplacebo >= 0.18.0}
+%{?with_libplacebo:Requires: libplacebo >= 1.18.0}
Requires: libva >= 1.4.0
Requires: libva-glx >= 1.4.0
Requires: libvdpau >= 0.2
+%{?with_js:Requires: mujs >= 1.0.0}
Requires: pulseaudio-libs >= 1.0
%{?with_rubberband:Requires: rubberband-libs >= 1.8.0}
%{?with_shaderc:Requires: shaderc >= 2019.0}
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
%waf configure \
--enable-gl-x11 \
--enable-iconv \
--enable-jack \
+ %{__enable_disable js javascript} \
--enable-jpeg \
--enable-lcms2 \
- --enable-libass \
- --enable-libass-osd \
--enable-libavdevice \
--enable-libbluray \
--enable-libmpv-shared \
%{__enable_disable libplacebo} \
%{__enable_disable rubberband} \
- %{__enable_disable samba libsmbclient} \
--enable-openal \
- --enable-oss-audio \
--enable-pulse \
--enable-sdl2 \
%{__enable_disable shaderc} \
--enable-x11 \
--enable-xv \
%{__enable_disable zimg} \
- --lua=51pld \
+ --lua=52deb \
--bashdir=%{bash_compdir} \
--zshdir=%{zsh_compdir}
+++ /dev/null
-From 6726b7a1ba5248e4edcab3dbd24c730551afb012 Mon Sep 17 00:00:00 2001
-From: wm4 <wm4@nowhere>
-Date: Thu, 20 Feb 2020 15:28:49 +0100
-Subject: [PATCH] demux_lavf: signal no seeking for RTSP streams without
- duration
-
-RTSP supports seeking, but at least the libavformat implementation makes
-this dependent on runtime behavior. So you have to perform a seek, and
-check if it fails. But even if you do this, the stream is interrupted
-and restarted, and there seem to be other issues.
-
-Assume that RTSP with unknown duration means it's a live stream, and
-disable seeking in this case, as suggested by the issue reporter.
-
-Fixes: #7472
----
- demux/demux_lavf.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
-index 62fecde8ea..fe127cdb08 100644
---- a/demux/demux_lavf.c
-+++ b/demux/demux_lavf.c
-@@ -146,6 +146,7 @@ struct format_hack {
- bool is_network : 1;
- bool no_seek : 1;
- bool no_pcm_seek : 1;
-+ bool no_seek_on_no_duration : 1;
- };
-
- #define BLACKLIST(fmt) {fmt, .ignore = true}
-@@ -174,6 +175,7 @@ static const struct format_hack format_hacks[] = {
- {"matroska", .skipinfo = true, .no_pcm_seek = true, .use_stream_ids = true},
-
- {"v4l2", .no_seek = true},
-+ {"rtsp", .no_seek_on_no_duration = true},
-
- // In theory, such streams might contain timestamps, but virtually none do.
- {"h264", .if_flags = AVFMT_NOTIMESTAMPS },
-@@ -1090,6 +1092,9 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check)
- demuxer->duration = duration;
- }
-
-+ if (demuxer->duration < 0 && priv->format_hack.no_seek_on_no_duration)
-+ demuxer->seekable = false;
-+
- // In some cases, libavformat will export bogus bullshit timestamps anyway,
- // such as with mjpeg.
- if (priv->avif_flags & AVFMT_NOTIMESTAMPS) {
projects / packages / mpv.git / commitdiff