diff options
-rw-r--r-- | multimedia/mpv/Makefile | 4 | ||||
-rw-r--r-- | multimedia/mpv/distinfo | 10 | ||||
-rw-r--r-- | multimedia/mpv/options.mk | 14 | ||||
-rw-r--r-- | multimedia/mpv/patches/patch-waftools_generators_headers.py | 14 | ||||
-rw-r--r-- | multimedia/mpv/patches/patch-waftools_waf__customizations.py | 39 |
5 files changed, 8 insertions, 73 deletions
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index e3e2cc21102..385ae1d4962 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2014/10/22 19:42:48 gls Exp $ +# $NetBSD: Makefile,v 1.11 2015/01/20 12:19:24 wiz Exp $ -DISTNAME= mpv-0.6.1 +DISTNAME= mpv-0.7.2 CATEGORIES= multimedia MASTER_SITES= -https://github.com/mpv-player/mpv/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX} diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index fa01d5b12eb..134033eaa30 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.6 2014/10/22 19:42:48 gls Exp $ +$NetBSD: distinfo,v 1.7 2015/01/20 12:19:24 wiz Exp $ -SHA1 (mpv-0.6.1.tar.gz) = 5d66e5fe6c4e3c84049e9516fa31eb1d6dee13f7 -RMD160 (mpv-0.6.1.tar.gz) = 9a1ea0301179abee90e98b794c637dd32915062c -Size (mpv-0.6.1.tar.gz) = 2599417 bytes -SHA1 (patch-waftools_generators_headers.py) = 4309fadacf3406318c342eb5e925178a8ea88ff9 -SHA1 (patch-waftools_waf__customizations.py) = 54d5d4dc7b58b4c3e4e71724276244a2f00413a6 +SHA1 (mpv-0.7.2.tar.gz) = 756cbc08f7770e2b3b2236f1907cb85ea1543155 +RMD160 (mpv-0.7.2.tar.gz) = 3b09c1dae69e3e5811e94cfa2c83d5f95768f503 +Size (mpv-0.7.2.tar.gz) = 2658772 bytes diff --git a/multimedia/mpv/options.mk b/multimedia/mpv/options.mk index b7f306e22cc..cc36e44b931 100644 --- a/multimedia/mpv/options.mk +++ b/multimedia/mpv/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.3 2014/10/22 19:42:48 gls Exp $ +# $NetBSD: options.mk,v 1.4 2015/01/20 12:19:24 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mpv -PKG_SUPPORTED_OPTIONS= caca lua pulseaudio sdl v4l2 quvi +PKG_SUPPORTED_OPTIONS= caca lua pulseaudio sdl v4l2 PKG_SUGGESTED_OPTIONS= lua .include "../../mk/bsd.options.mk" @@ -54,13 +54,3 @@ WAF_CONFIGURE_ARGS+= --enable-libv4l2 .else WAF_CONFIGURE_ARGS+= --disable-libv4l2 .endif - -### -### Quvi (Youtube) support -### -.if !empty(PKG_OPTIONS:Mquvi) -WAF_CONFIGURE_ARGS+= --enable-libquvi4 -.include "../../net/libquvi/buildlink3.mk" -.else -WAF_CONFIGURE_ARGS+= --disable-libquvi4 -.endif diff --git a/multimedia/mpv/patches/patch-waftools_generators_headers.py b/multimedia/mpv/patches/patch-waftools_generators_headers.py deleted file mode 100644 index fefe5c7c2f2..00000000000 --- a/multimedia/mpv/patches/patch-waftools_generators_headers.py +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-waftools_generators_headers.py,v 1.1 2014/10/12 16:00:30 wiz Exp $ - -waf-1.8.x compatibility. -https://github.com/mpv-player/mpv/commit/d906d091627a9be8d0d1e13f54d737eca6dc16ff - ---- waftools/generators/headers.py.orig 2014-09-30 18:52:47.000000000 +0000 -+++ waftools/generators/headers.py -@@ -1,5 +1,5 @@ - def __cp_to_variant__(ctx, variant, basename): -- src = ctx.bldnode.search(basename).read() -+ src = ctx.bldnode.search_node(basename).read() - node = ctx.bldnode.make_node("{0}/{1}".format(variant, basename)) - node.parent.mkdir() - node.write(src) 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 73abe794f0e..00000000000 --- a/multimedia/mpv/patches/patch-waftools_waf__customizations.py +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-waftools_waf__customizations.py,v 1.1 2014/10/12 16:00:30 wiz Exp $ - -waf-1.8.x compatibility -https://github.com/mpv-player/mpv/commit/d906d091627a9be8d0d1e13f54d737eca6dc16ff - ---- waftools/waf_customizations.py.orig 2014-09-30 18:52:47.000000000 +0000 -+++ waftools/waf_customizations.py -@@ -30,28 +30,14 @@ def m_hook(self, node): - - def build(ctx): - from waflib import Task -- import syms -+ -+ def nice_path(node): -+ node.path_from(node.ctx.launch_node()) - - cls = Task.classes['cprogram'] - class cprogram(cls): - run_str = cls.hcode + '${LAST_LINKFLAGS}' - -- def __str__(self): -- tgt_str = ' '.join([a.nice_path() for a in self.outputs]) -- return 'linking -> {0}\n'.format(tgt_str) -- -- cls = Task.classes['cshlib'] -- class cshlib(cls): -- def __str__(self): -- tgt_str = ' '.join([a.nice_path() for a in self.outputs]) -- return 'linking -> {0}\n'.format(tgt_str) -- -- cls = Task.classes['compile_sym'] -- class compile_sym(cls): -- def __str__(self): -- tgt_str = ' '.join([a.nice_path() for a in self.outputs]) -- return 'compile_sym -> {0}\n'.format(tgt_str) -- - cls = Task.classes['macplist'] - class macplist(cls): - def run(self): |