commit 2c519bf99cbc236b483b21fc729c3663c74ba969 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Wed Jul 25 07:58:04 2018 +0100 Update to 0.29.0 mpv-do-not-fail-with-minor-ffmpeg-updates.patch | 21 ++++++++++++--------- mpv.spec | 11 +++++++---- sources | 2 +- 3 files changed, 20 insertions(+), 14 deletions(-) --- diff --git a/mpv-do-not-fail-with-minor-ffmpeg-updates.patch b/mpv-do-not-fail-with-minor-ffmpeg-updates.patch index c421dc6..dbff2ae 100644 --- a/mpv-do-not-fail-with-minor-ffmpeg-updates.patch +++ b/mpv-do-not-fail-with-minor-ffmpeg-updates.patch @@ -1,13 +1,17 @@ -diff -Naur mpv-0.28.0.old/player/main.c mpv-0.28.0/player/main.c ---- mpv-0.28.0.old/player/main.c -+++ mpv-0.28.0/player/main.c -@@ -428,18 +428,6 @@ - if (handle_help_options(mpctx)) - return -2; +diff -Naur mpv-0.29.0.old/player/main.c mpv-0.29.0/player/main.c +--- mpv-0.29.0.old/player/main.c ++++ mpv-0.29.0/player/main.c +@@ -380,21 +380,6 @@ + if (handle_help_options(mpctx)) + return 1; // help +- - if (!print_libav_versions(mp_null_log, 0)) { - // Using mismatched libraries can be legitimate, but even then it's - // a bad idea. We don't acknowledge its usefulness and stability. +- // Distro maintainers who patch this out should be aware that mpv +- // intentionally ignores ABI in some places where it's not possible to +- // get by without violating it. - print_libav_versions(mpctx->log, MSGL_FATAL); - MP_FATAL(mpctx, "\nmpv was compiled against a different version of " - "FFmpeg/Libav than the shared\nlibrary it is linked against. " @@ -16,8 +20,7 @@ diff -Naur mpv-0.28.0.old/player/main.c mpv-0.28.0/player/main.c - "configuration and will not run - rebuild mpv instead.\n"); - return -1; - } -- - if (!mpctx->playlist->first && !opts->player_idle_mode) - return -3; + if (!mpctx->playlist->first && !opts->player_idle_mode) { + // nothing to play diff --git a/mpv.spec b/mpv.spec index 28c68a2..3cc36fa 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv -Version: 0.28.2 -Release: 6%{?dist} +Version: 0.29.0 +Release: 1%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ and LGPLv2+ URL: http://%{name}.io/ @@ -23,6 +23,7 @@ BuildRequires: pkgconfig(dvdread) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(enca) BuildRequires: ffmpeg-devel >= 3.5 +BuildRequires: nv-codec-headers BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(jack) @@ -60,7 +61,7 @@ BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(zlib) -BuildRequires: python2-docutils +BuildRequires: python3-docutils BuildRequires: perl(Math::BigInt) BuildRequires: perl(Math::BigRat) @@ -112,7 +113,6 @@ waf configure \ --enable-sdl2 \ --enable-libarchive \ --enable-libsmbclient \ - --enable-encoding \ --enable-dvdread \ --enable-dvdnav \ --enable-cdda \ @@ -149,6 +149,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir} %{_libdir}/pkgconfig/mpv.pc %changelog +* Wed Jul 25 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 0.29.0-1 +- Update to 0.29.0 + * Wed Jun 27 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 0.28.2-6 - Revert last commit diff --git a/sources b/sources index 77e8f6f..5c479af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b6538dec29a2a69574f4e3a3d688fb8b mpv-0.28.2.tar.gz +5a4844da6f3683e27a99db7703721a64 mpv-0.29.0.tar.gz