Thu Nov 3 14:41:28 2016 UTC ()
Make mpv agnostic regarding possible mismatches of built vs running
dependencies. Given the existence of BUILDLINK_A[BP]I_DEPENDS and
PKGREVISION bumps our use in pkgsrc can be considered a legitimate
one.
Delete the print_libav_versions() check to reflect that.
Bump PKGREVISION.
Thanks to <wiz> for noticing that!
(leot)
diff -r1.41 -r1.42 pkgsrc/multimedia/mpv/Makefile
diff -r1.27 -r1.28 pkgsrc/multimedia/mpv/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/mpv/patches/patch-player_main.c
--- pkgsrc/multimedia/mpv/Makefile 2016/10/20 08:27:01 1.41
+++ pkgsrc/multimedia/mpv/Makefile 2016/11/03 14:41:28 1.42
--- pkgsrc/multimedia/mpv/distinfo 2016/10/20 08:27:01 1.27
+++ pkgsrc/multimedia/mpv/distinfo 2016/11/03 14:41:28 1.28
$NetBSD: patch-player_main.c,v 1.1 2016/11/03 14:41:28 leot Exp $
Avoid to check mismatched built vs running libraries version.
The use in pkgsrc can be considered a legitimate one.
--- player/main.c.orig 2016-10-19 21:10:13.000000000 +0000
+++ player/main.c
@@ -429,18 +429,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. "
- "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;
- }
-
if (!mpctx->playlist->first && !opts->player_idle_mode)
return -3;