commit: cdd878ca5c47cafbb29bfe9cbb9e9ee64ec70fc9
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Feb 12 21:15:50 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 21:41:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd878ca
media-video/mpv: make message less scary in ffmpeg patch
"Most likely a broken build" isn't the best thing to tell our users
especially because in most cases it isn't a broken build.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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
index 96a1f566a6..7c8d5b44c8 100644
--- 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
@@ -3,7 +3,7 @@ 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
+index 67dde3449..696d2e716 100644
--- a/player/main.c
+++ b/player/main.c
@@ -419,13 +419,12 @@ int mp_initialize(struct MPContext *mpctx, char
**options)
@@ -20,9 +20,9 @@ index 67dde34..ee133a9 100644
+ 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");
++ "This could result in misbehavior and crashes.\n\n"
++ "Upstream does not support this configuration.\n"
++ "Please rebuild mpv in case of any problems.\n");
}
if (opts->dump_stats && opts->dump_stats[0]) {
