Fix build with waf-1.8 and depend on it.

4 files changed, 58 insertions, 3 deletions

diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index f944ab8e9cf..f675ac736bb 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/10/07 07:31:38 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/10/12 16:00:30 wiz Exp $
 
 DISTNAME=	mpv-0.6.0
 CATEGORIES=	multimedia
@@ -11,7 +11,7 @@ LICENSE=	gnu-gpl-v2
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
 # ${WRKSRC}/bootstrap.py mentions needed version
-BUILD_DEPENDS+=	waf>=1.7.16:../../devel/waf
+BUILD_DEPENDS+=	waf>=1.8:../../devel/waf
 
 PYTHON_FOR_BUILD_ONLY=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-docutils
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
index fd57ca98e9d..12480b14e21 100644
--- a/multimedia/mpv/distinfo
+++ b/multimedia/mpv/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.4 2014/10/07 07:31:38 wiz Exp $
+$NetBSD: distinfo,v 1.5 2014/10/12 16:00:30 wiz Exp $
 
 SHA1 (mpv-0.6.0.tar.gz) = 60188f045ab177106b10443cf592184e5a4efd59
 RMD160 (mpv-0.6.0.tar.gz) = f273e8751bfe290ab6e4c3d234c46f0ccd44a6e7
 Size (mpv-0.6.0.tar.gz) = 2598489 bytes
+SHA1 (patch-waftools_generators_headers.py) = 4309fadacf3406318c342eb5e925178a8ea88ff9
+SHA1 (patch-waftools_waf__customizations.py) = 54d5d4dc7b58b4c3e4e71724276244a2f00413a6
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):