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
cvs diff -r1.41 -r1.42 pkgsrc/multimedia/mpv/Makefile (switch to unified diff)

--- pkgsrc/multimedia/mpv/Makefile 2016/10/20 08:27:01 1.41
+++ pkgsrc/multimedia/mpv/Makefile 2016/11/03 14:41:28 1.42
@@ -1,66 +1,67 @@ @@ -1,66 +1,67 @@
1# $NetBSD: Makefile,v 1.41 2016/10/20 08:27:01 leot Exp $ 1# $NetBSD: Makefile,v 1.42 2016/11/03 14:41:28 leot Exp $
2 2
3DISTNAME= mpv-0.21.0 3DISTNAME= mpv-0.21.0
 4PKGREVISION= 1
4CATEGORIES= multimedia 5CATEGORIES= multimedia
5MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
7 8
8MAINTAINER= leot@NetBSD.org 9MAINTAINER= leot@NetBSD.org
9HOMEPAGE= http://mpv.io/ 10HOMEPAGE= http://mpv.io/
10COMMENT= Video player based on MPlayer and mplayer2 11COMMENT= Video player based on MPlayer and mplayer2
11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
12 13
13# needs sem_timedwait(3) 14# needs sem_timedwait(3)
14NOT_FOR_PLATFORM= NetBSD-[1-6]*-* 15NOT_FOR_PLATFORM= NetBSD-[1-6]*-*
15 16
16NOT_PAX_MPROTECT_SAFE+= bin/mpv 17NOT_PAX_MPROTECT_SAFE+= bin/mpv
17 18
18BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils 19BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
19# ${WRKSRC}/bootstrap.py mentions needed version 20# ${WRKSRC}/bootstrap.py mentions needed version
20BUILD_DEPENDS+= waf>=1.8.12:../../devel/waf 21BUILD_DEPENDS+= waf>=1.8.12:../../devel/waf
21 22
22PYTHON_FOR_BUILD_ONLY= yes 23PYTHON_FOR_BUILD_ONLY= yes
23 24
24USE_TOOLS+= perl pkg-config 25USE_TOOLS+= perl pkg-config
25 26
26MAKE_DIRS= ${PKG_SYSCONFDIR}/mpv 27MAKE_DIRS= ${PKG_SYSCONFDIR}/mpv
27INSTALLATION_DIRS= share/examples/mpv 28INSTALLATION_DIRS= share/examples/mpv
28CONF_FILES+= share/examples/mpv/encoding-profiles.conf ${PKG_SYSCONFDIR}/mpv/encoding-profiles.conf 29CONF_FILES+= share/examples/mpv/encoding-profiles.conf ${PKG_SYSCONFDIR}/mpv/encoding-profiles.conf
29 30
30SUBST_CLASSES+= audio 31SUBST_CLASSES+= audio
31SUBST_SED.audio+= -e "s,/dev/dsp,${DEVOSSAUDIO}," 32SUBST_SED.audio+= -e "s,/dev/dsp,${DEVOSSAUDIO},"
32SUBST_FILES.audio+= stream/audio_in.c waftools/checks/custom.py wscript 33SUBST_FILES.audio+= stream/audio_in.c waftools/checks/custom.py wscript
33SUBST_STAGE.audio= pre-configure 34SUBST_STAGE.audio= pre-configure
34SUBST_MESSAGE.audio= Fixing path to audio device. 35SUBST_MESSAGE.audio= Fixing path to audio device.
35 36
36SUBST_CLASSES+= docutils 37SUBST_CLASSES+= docutils
37SUBST_SED.docutils+= -e "s,rst2man,rst2man-${PYVERSSUFFIX}," 38SUBST_SED.docutils+= -e "s,rst2man,rst2man-${PYVERSSUFFIX},"
38SUBST_FILES.docutils+= wscript 39SUBST_FILES.docutils+= wscript
39SUBST_STAGE.docutils= pre-configure 40SUBST_STAGE.docutils= pre-configure
40SUBST_MESSAGE.docutils= Fix docutils command names. 41SUBST_MESSAGE.docutils= Fix docutils command names.
41 42
42post-install: 43post-install:
43 cd ${DESTDIR}${PREFIX} && ${MV} etc/mpv/encoding-profiles.conf share/examples/mpv 44 cd ${DESTDIR}${PREFIX} && ${MV} etc/mpv/encoding-profiles.conf share/examples/mpv
44 45
45.include "options.mk" 46.include "options.mk"
46 47
47.include "../../mk/bsd.prefs.mk" 48.include "../../mk/bsd.prefs.mk"
48.if ${OPSYS} != "Darwin" 49.if ${OPSYS} != "Darwin"
49.include "../../graphics/MesaLib/buildlink3.mk" 50.include "../../graphics/MesaLib/buildlink3.mk"
50.include "../../x11/libXinerama/buildlink3.mk" 51.include "../../x11/libXinerama/buildlink3.mk"
51.include "../../x11/libXv/buildlink3.mk" 52.include "../../x11/libXv/buildlink3.mk"
52.include "../../x11/libXxf86vm/buildlink3.mk" 53.include "../../x11/libXxf86vm/buildlink3.mk"
53.include "../../mk/oss.buildlink3.mk" 54.include "../../mk/oss.buildlink3.mk"
54.endif 55.endif
55 56
56.include "../../devel/waf/waf.mk" 57.include "../../devel/waf/waf.mk"
57.include "../../devel/zlib/buildlink3.mk" 58.include "../../devel/zlib/buildlink3.mk"
58.include "../../lang/python/application.mk" 59.include "../../lang/python/application.mk"
59.include "../../multimedia/libass/buildlink3.mk" 60.include "../../multimedia/libass/buildlink3.mk"
60.include "../../multimedia/libdvdnav/buildlink3.mk" 61.include "../../multimedia/libdvdnav/buildlink3.mk"
61.include "../../multimedia/libdvdread/buildlink3.mk" 62.include "../../multimedia/libdvdread/buildlink3.mk"
62.include "../../multimedia/ffmpeg3/buildlink3.mk" 63.include "../../multimedia/ffmpeg3/buildlink3.mk"
63.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 64.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
64.include "../../sysutils/desktop-file-utils/desktopdb.mk" 65.include "../../sysutils/desktop-file-utils/desktopdb.mk"
65.include "../../mk/jpeg.buildlink3.mk" 66.include "../../mk/jpeg.buildlink3.mk"
66.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"
cvs diff -r1.27 -r1.28 pkgsrc/multimedia/mpv/distinfo (switch to unified diff)

--- pkgsrc/multimedia/mpv/distinfo 2016/10/20 08:27:01 1.27
+++ pkgsrc/multimedia/mpv/distinfo 2016/11/03 14:41:28 1.28
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.27 2016/10/20 08:27:01 leot Exp $ 1$NetBSD: distinfo,v 1.28 2016/11/03 14:41:28 leot Exp $
2 2
3SHA1 (mpv-0.21.0.tar.gz) = 8f90df723faab7fe019c9b29898f656688e22796 3SHA1 (mpv-0.21.0.tar.gz) = 8f90df723faab7fe019c9b29898f656688e22796
4RMD160 (mpv-0.21.0.tar.gz) = 7ca393d2d80cc3f56cf93a871e39b332883a0899 4RMD160 (mpv-0.21.0.tar.gz) = 7ca393d2d80cc3f56cf93a871e39b332883a0899
5SHA512 (mpv-0.21.0.tar.gz) = f4072fc3a351643f94c64c8da43560458d53072e61d099670903319f21576ccbdfa053a57c1ac09fe51e067e5055e1bb691ee93645ea2dea04b95fd96d937d16 5SHA512 (mpv-0.21.0.tar.gz) = f4072fc3a351643f94c64c8da43560458d53072e61d099670903319f21576ccbdfa053a57c1ac09fe51e067e5055e1bb691ee93645ea2dea04b95fd96d937d16
6Size (mpv-0.21.0.tar.gz) = 2812584 bytes 6Size (mpv-0.21.0.tar.gz) = 2812584 bytes
 7SHA1 (patch-player_main.c) = fefba566f5130d24b748b7ab4ecc48bf42bc6bdd
File Added: pkgsrc/multimedia/mpv/patches/Attic/patch-player_main.c
$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;