diff options
author | adam <adam@pkgsrc.org> | 2015-02-28 11:53:31 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2015-02-28 11:53:31 +0000 |
commit | 826518e5134ebdfde774f16e6a88f20cee8a3607 (patch) | |
tree | ba936989c195c50a420163eba98d66cda1b4e32e /multimedia/mpv | |
parent | 704b110846fa101c9577de795ce083ec1b14a65e (diff) | |
download | pkgsrc-826518e5134ebdfde774f16e6a88f20cee8a3607.tar.gz |
Changes 0.8.2:
Fix OSD placement accidentally messed up in 0.8.1.
Diffstat (limited to 'multimedia/mpv')
-rw-r--r-- | multimedia/mpv/Makefile | 20 | ||||
-rw-r--r-- | multimedia/mpv/distinfo | 9 | ||||
-rw-r--r-- | multimedia/mpv/patches/patch-waftools_waf__customizations.py | 22 |
3 files changed, 16 insertions, 35 deletions
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index d44033a87e7..4a89325c741 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2015/02/26 09:46:11 markd Exp $ +# $NetBSD: Makefile,v 1.16 2015/02/28 11:53:31 adam Exp $ -DISTNAME= mpv-0.8.0 -PKGREVISION= 1 +DISTNAME= mpv-0.8.2 CATEGORIES= multimedia MASTER_SITES= -https://github.com/mpv-player/mpv/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX} @@ -39,19 +38,24 @@ post-install: cd ${DESTDIR}${PREFIX} && ${MV} etc/mpv/encoding-profiles.conf share/examples/mpv .include "options.mk" + +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} != "Darwin" +.include "../../graphics/MesaLib/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" +.include "../../x11/libXv/buildlink3.mk" +.include "../../x11/libXxf86vm/buildlink3.mk" +.include "../../mk/oss.buildlink3.mk" +.endif + .include "../../devel/waf/waf.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/MesaLib/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../multimedia/libass/buildlink3.mk" .include "../../multimedia/libdvdnav/buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" -.include "../../x11/libXinerama/buildlink3.mk" -.include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/libXv/buildlink3.mk" .include "../../multimedia/ffmpeg2/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/jpeg.buildlink3.mk" -.include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index 383480ea7d3..2dc72a248b7 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.10 2015/02/19 09:16:15 wiz Exp $ +$NetBSD: distinfo,v 1.11 2015/02/28 11:53:31 adam Exp $ -SHA1 (mpv-0.8.0.tar.gz) = 8185c54989a92d7e622850ef869180cf3e239d2f -RMD160 (mpv-0.8.0.tar.gz) = 19e3a861d70cca9668313a069442f5254f7b63e9 -Size (mpv-0.8.0.tar.gz) = 2661713 bytes -SHA1 (patch-waftools_waf__customizations.py) = 122b3f797f47c64e58f4d221fad291f8d53d24b6 +SHA1 (mpv-0.8.2.tar.gz) = 2b9f7978341924d0d1763de3f1d1c9dfba5d4ac0 +RMD160 (mpv-0.8.2.tar.gz) = 69d7091cf4264afef2e074ea5eefe236810e95f9 +Size (mpv-0.8.2.tar.gz) = 2663666 bytes diff --git a/multimedia/mpv/patches/patch-waftools_waf__customizations.py b/multimedia/mpv/patches/patch-waftools_waf__customizations.py deleted file mode 100644 index 36ece3830a6..00000000000 --- a/multimedia/mpv/patches/patch-waftools_waf__customizations.py +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-waftools_waf__customizations.py,v 1.3 2015/02/19 08:59:57 wiz Exp $ - -Fix build with waf-1.8.6 via -https://github.com/mpv-player/mpv/commit/14b231119d2c125bcdcba48d159a78097152e387#diff-d7a74afa06a68dd21074ca4ab9ff0478 - ---- waftools/waf_customizations.py.orig 2015-01-27 01:23:08.000000000 +0000 -+++ waftools/waf_customizations.py -@@ -33,7 +33,13 @@ def build(ctx): - - cls = Task.classes['cprogram'] - class cprogram(cls): -- run_str = cls.hcode + '${LAST_LINKFLAGS}' -+ try: -+ run_str = cls.orig_run_str + '${LAST_LINKFLAGS}' -+ except AttributeError: -+ try: -+ run_str = cls.hcode + '${LAST_LINKFLAGS}' -+ except TypeError: -+ run_str = cls.hcode.decode('iso8859-1') + '${LAST_LINKFLAGS}' - - cls = Task.classes['macplist'] - class macplist(cls): |