[mpv] Add patch to relax ffmpeg version check

commit 11199803f82123fdde883a7ecc1b914c0d1491c3 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Sat Dec 3 12:52:22 2016 +0000 Add patch to relax ffmpeg version check mpv-do-not-fail-with-minor-ffmpeg-updates.patch | 22 ++++++++++++++++++++++ mpv.spec | 11 ++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) --- diff --git a/mpv-do-not-fail-with-minor-ffmpeg-updates.patch b/mpv-do-not-fail-with-minor-ffmpeg-updates.patch new file mode 100644 index 0000000..e585828 --- /dev/null +++ b/mpv-do-not-fail-with-minor-ffmpeg-updates.patch @@ -0,0 +1,22 @@ +diff -Naur mpv-0.22.0.old/player/main.c mpv-0.22.0/player/main.c +--- mpv-0.22.0.old/player/main.c 2016-11-29 15:03:06.751829770 +0100 ++++ mpv-0.22.0/player/main.c 2016-11-29 15:04:40.258166553 +0100 +@@ -429,18 +429,6 @@ + + handle_deprecated_options(mpctx); + +- 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. +- 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. " +- "This is most likely a broken build and could\nresult in " +- "misbehavior and crashes.\n\nmpv does not support this " +- "configuration and will not run - rebuild mpv instead.\n"); +- return -1; +- } +- + if (!mpctx->playlist->first && !opts->player_idle_mode) + return -3; + diff --git a/mpv.spec b/mpv.spec index 42688b2..5daafad 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,6 +1,6 @@ Name: mpv Version: 0.22.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Movie player playing most video formats and DVDs License: GPLv2+ URL: http://%{name}.io/ @@ -9,6 +9,9 @@ Source0: https://github.com/%{name}-player/%{name}/archive/v%{version}.ta # set defaults for Fedora Patch0: %{name}-config.patch +# https://github.com/negativo17/mpv/blob/master/mpv-do-not-fail-with-minor-... +Patch1: mpv-do-not-fail-with-minor-ffmpeg-updates.patch + BuildRequires: pkgconfig(alsa) BuildRequires: desktop-file-utils BuildRequires: pkgconfig(dvdnav) @@ -85,8 +88,7 @@ Obsoletes: libmpv-devel < %{version}-%{release} Libmpv development header files and libraries. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build @@ -151,6 +153,9 @@ fi %{_libdir}/pkgconfig/mpv.pc %changelog +* Sat Dec 03 2016 leigh scott <leigh123linux(a)googlemail.com&gt; - 0.22.0-2 +- Add patch to relax ffmpeg version check + * Sat Nov 26 2016 leigh scott <leigh123linux(a)googlemail.com&gt; - 0.22.0-1 - update to 0.22.0