diff options
author | wiz <wiz> | 2014-10-12 16:00:30 +0000 |
---|---|---|
committer | wiz <wiz> | 2014-10-12 16:00:30 +0000 |
commit | e64f10ba9854c4dd9e59a215bf554cc87f6a03cb (patch) | |
tree | c6f2b1ff3ab8a1e3561cb302da97909f619e5e9d /multimedia/mpv/patches | |
parent | 69f1dd454e37d33da7a7484396f8f2e1030d2f61 (diff) | |
download | pkgsrc-e64f10ba9854c4dd9e59a215bf554cc87f6a03cb.tar.gz |
Fix build with waf-1.8 and depend on it.
Diffstat (limited to 'multimedia/mpv/patches')
-rw-r--r-- | multimedia/mpv/patches/patch-waftools_generators_headers.py | 14 | ||||
-rw-r--r-- | multimedia/mpv/patches/patch-waftools_waf__customizations.py | 39 |
2 files changed, 53 insertions, 0 deletions
diff --git a/multimedia/mpv/patches/patch-waftools_generators_headers.py b/multimedia/mpv/patches/patch-waftools_generators_headers.py new file mode 100644 index 00000000000..fefe5c7c2f2 --- /dev/null +++ b/multimedia/mpv/patches/patch-waftools_generators_headers.py @@ -0,0 +1,14 @@ +$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 new file mode 100644 index 00000000000..73abe794f0e --- /dev/null +++ b/multimedia/mpv/patches/patch-waftools_waf__customizations.py @@ -0,0 +1,39 @@ +$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): |