From e912558e980ff103a53e46946bbfcf7dcf6cfe7ae9d801d5bdd218b3d7618239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 9 May 2017 15:34:59 +0000 Subject: [PATCH] - Refresh patch mpv-make-ffmpeg-version-check-non-fatal.patch * Rather delete the warning as whole, in OBS concept we detect abi changes and it misleads the users of stable distributions to worry something broke OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpv?expand=0&rev=96 --- mpv-make-ffmpeg-version-check-non-fatal.patch | 29 +++++++++---------- mpv.changes | 8 +++++ 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/mpv-make-ffmpeg-version-check-non-fatal.patch b/mpv-make-ffmpeg-version-check-non-fatal.patch index c324467..a87c8c8 100644 --- a/mpv-make-ffmpeg-version-check-non-fatal.patch +++ b/mpv-make-ffmpeg-version-check-non-fatal.patch @@ -2,14 +2,17 @@ player: make ffmpeg/libav version check non-fatal We already enforce mpv rebuilds when ffmpeg/libav SONAME changes. -Index: mpv-0.21.0/player/main.c +Index: mpv-0.25.0/player/main.c =================================================================== ---- mpv-0.21.0.orig/player/main.c -+++ mpv-0.21.0/player/main.c -@@ -432,13 +432,12 @@ int mp_initialize(struct MPContext *mpct - 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. +--- mpv-0.25.0.orig/player/main.c ++++ mpv-0.25.0/player/main.c +@@ -438,18 +438,6 @@ int mp_initialize(struct MPContext *mpct + + 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. " @@ -17,12 +20,8 @@ Index: mpv-0.21.0/player/main.c - "misbehavior and crashes.\n\nmpv does not support this " - "configuration and will not run - rebuild mpv instead.\n"); - return -1; -+ print_libav_versions(mpctx->log, MSGL_WARN); -+ MP_WARN(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\nUpstream does not support this " -+ "configuration.\nPlease rebuild mpv in case of any problems.\n"); - } - +- } +- if (!mpctx->playlist->first && !opts->player_idle_mode) + return -3; + diff --git a/mpv.changes b/mpv.changes index ca427f8..35c4a29 100644 --- a/mpv.changes +++ b/mpv.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 9 15:35:17 UTC 2017 - tchvatal@suse.com + +- Refresh patch mpv-make-ffmpeg-version-check-non-fatal.patch + * Rather delete the warning as whole, in OBS concept we detect + abi changes and it misleads the users of stable distributions + to worry something broke + ------------------------------------------------------------------- Tue May 2 14:02:12 UTC 2017 - tchvatal@suse.com