| 1 |
commit: cdd878ca5c47cafbb29bfe9cbb9e9ee64ec70fc9 |
| 2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Feb 12 21:15:50 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 14 21:41:03 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd878ca |
| 7 |
|
| 8 |
media-video/mpv: make message less scary in ffmpeg patch |
| 9 |
|
| 10 |
"Most likely a broken build" isn't the best thing to tell our users |
| 11 |
especially because in most cases it isn't a broken build. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 14 |
|
| 15 |
.../files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch | 8 ++++---- |
| 16 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index 96a1f566a6..7c8d5b44c8 100644 |
| 20 |
--- a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch |
| 21 |
+++ b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch |
| 22 |
@@ -3,7 +3,7 @@ player: make ffmpeg/libav version check non-fatal |
| 23 |
We already enforce mpv rebuilds when ffmpeg/libav SONAME changes. |
| 24 |
|
| 25 |
diff --git a/player/main.c b/player/main.c |
| 26 |
-index 67dde34..ee133a9 100644 |
| 27 |
+index 67dde3449..696d2e716 100644 |
| 28 |
--- a/player/main.c |
| 29 |
+++ b/player/main.c |
| 30 |
@@ -419,13 +419,12 @@ int mp_initialize(struct MPContext *mpctx, char **options) |
| 31 |
@@ -20,9 +20,9 @@ index 67dde34..ee133a9 100644 |
| 32 |
+ print_libav_versions(mpctx->log, MSGL_WARN); |
| 33 |
+ MP_WARN(mpctx, "\nmpv was compiled against a different version of " |
| 34 |
+ "FFmpeg/Libav than the shared\nlibrary it is linked against. " |
| 35 |
-+ "This is most likely a broken build and could\nresult in " |
| 36 |
-+ "misbehavior and crashes.\n\nUpstream does not support this " |
| 37 |
-+ "configuration.\nPlease rebuild mpv in case of any problems.\n"); |
| 38 |
++ "This could result in misbehavior and crashes.\n\n" |
| 39 |
++ "Upstream does not support this configuration.\n" |
| 40 |
++ "Please rebuild mpv in case of any problems.\n"); |
| 41 |
} |
| 42 |
|
| 43 |
if (opts->dump_stats && opts->dump_stats[0]) { |
Archives