diff options
| author | leot <leot@pkgsrc.org> | 2016-11-03 14:41:28 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2016-11-03 14:41:28 +0000 |
| commit | 09a0f3f6dc8109605b2faa7d5dd69c4aeb7aae0c (patch) | |
| tree | 6f7c602d140f65873406e34bd45f176c8b02224a /multimedia | |
| parent | 081de6493d29ae72b2650edcf781879eef7619b9 (diff) | |
| download | pkgsrc-09a0f3f6dc8109605b2faa7d5dd69c4aeb7aae0c.tar.gz | |
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!
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mpv/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/mpv/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/mpv/patches/patch-player_main.c | 26 |
3 files changed, 30 insertions, 2 deletions
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 73b1bec6ec2..5dce6c4f47a 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.41 2016/10/20 08:27:01 leot Exp $ +# $NetBSD: Makefile,v 1.42 2016/11/03 14:41:28 leot Exp $ DISTNAME= mpv-0.21.0 +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/} GITHUB_TAG= v${PKGVERSION_NOREV} diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index 56168058b53..543f041f29f 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.27 2016/10/20 08:27:01 leot Exp $ +$NetBSD: distinfo,v 1.28 2016/11/03 14:41:28 leot Exp $ SHA1 (mpv-0.21.0.tar.gz) = 8f90df723faab7fe019c9b29898f656688e22796 RMD160 (mpv-0.21.0.tar.gz) = 7ca393d2d80cc3f56cf93a871e39b332883a0899 SHA512 (mpv-0.21.0.tar.gz) = f4072fc3a351643f94c64c8da43560458d53072e61d099670903319f21576ccbdfa053a57c1ac09fe51e067e5055e1bb691ee93645ea2dea04b95fd96d937d16 Size (mpv-0.21.0.tar.gz) = 2812584 bytes +SHA1 (patch-player_main.c) = fefba566f5130d24b748b7ab4ecc48bf42bc6bdd diff --git a/multimedia/mpv/patches/patch-player_main.c b/multimedia/mpv/patches/patch-player_main.c new file mode 100644 index 00000000000..c656cc244ef --- /dev/null +++ b/multimedia/mpv/patches/patch-player_main.c @@ -0,0 +1,26 @@ +$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; + |