From 458dce085e0ba6425a118a74b14ebf86f1502bc0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 14 Apr 2017 22:05:24 +0100 Subject: drop media-video/mpv , use upstream gentoo ebuild --- ....19.0-make-ffmpeg-version-check-non-fatal.patch | 28 ---------------------- 1 file changed, 28 deletions(-) delete mode 100644 media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch (limited to 'media-video/mpv/files') diff --git a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch deleted file mode 100644 index 96a1f566..00000000 --- a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch +++ /dev/null @@ -1,28 +0,0 @@ -player: make ffmpeg/libav version check non-fatal - -We already enforce mpv rebuilds when ffmpeg/libav SONAME changes. - -diff --git a/player/main.c b/player/main.c -index 67dde34..ee133a9 100644 ---- a/player/main.c -+++ b/player/main.c -@@ -419,13 +419,12 @@ int mp_initialize(struct MPContext *mpctx, char **options) - 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; -+ 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 (opts->dump_stats && opts->dump_stats[0]) { -- cgit v1.2.3