summaryrefslogtreecommitdiff
path: root/media-video/mpv/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2016-12-29 15:49:33 +0000
committerV3n3RiX <venerix@redcorelinux.org>2016-12-29 15:49:33 +0000
commitcdaf772ed8b4b1d18bd7b1b13ef0d1be19a122c5 (patch)
treec5d72099fae1a1e9735be962ddf8b8eb181dd9a2 /media-video/mpv/files
parentcf0d6dc8ee6cc8da55dedb022e41f92cec3be926 (diff)
we only use unstable mpv, but starting with v0.23 it pulls it pulls in unstable ffmpeg, which in turn pulls in more unstable stuff...we don't want that since we're based on gentoo stable...so freeze mpv to v0.22 untill new ffmpeg hits stable tree
Diffstat (limited to 'media-video/mpv/files')
-rw-r--r--media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch28
1 files changed, 28 insertions, 0 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
new file mode 100644
index 00000000..96a1f566
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch
@@ -0,0 +1,28 @@
+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]) {