Sun Oct 12 16:00:30 2014 UTC ()
Fix build with waf-1.8 and depend on it.


(wiz)
diff -r1.7 -r1.8 pkgsrc/multimedia/mpv/Makefile
diff -r1.4 -r1.5 pkgsrc/multimedia/mpv/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/mpv/patches/patch-waftools_generators_headers.py
diff -r0 -r1.1 pkgsrc/multimedia/mpv/patches/patch-waftools_waf__customizations.py
cvs diff -r1.7 -r1.8 pkgsrc/multimedia/mpv/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/Makefile 2014/10/07 07:31:38 1.7
+++ pkgsrc/multimedia/mpv/Makefile 2014/10/12 16:00:30 1.8
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.7 2014/10/07 07:31:38 wiz Exp $ 1# $NetBSD: Makefile,v 1.8 2014/10/12 16:00:30 wiz Exp $
2 2
3DISTNAME= mpv-0.6.0 3DISTNAME= mpv-0.6.0
4CATEGORIES= multimedia 4CATEGORIES= multimedia
5MASTER_SITES= -https://github.com/mpv-player/mpv/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX} 5MASTER_SITES= -https://github.com/mpv-player/mpv/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://mpv.io/ 8HOMEPAGE= http://mpv.io/
9COMMENT= Video player based on MPlayer and mplayer2 9COMMENT= Video player based on MPlayer and mplayer2
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils 12BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
13# ${WRKSRC}/bootstrap.py mentions needed version 13# ${WRKSRC}/bootstrap.py mentions needed version
14BUILD_DEPENDS+= waf>=1.7.16:../../devel/waf 14BUILD_DEPENDS+= waf>=1.8:../../devel/waf
15 15
16PYTHON_FOR_BUILD_ONLY= yes 16PYTHON_FOR_BUILD_ONLY= yes
17PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-docutils 17PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-docutils
18 18
19USE_TOOLS+= perl pkg-config 19USE_TOOLS+= perl pkg-config
20 20
21MAKE_DIRS= ${PKG_SYSCONFDIR}/mpv 21MAKE_DIRS= ${PKG_SYSCONFDIR}/mpv
22INSTALLATION_DIRS= share/examples/mpv 22INSTALLATION_DIRS= share/examples/mpv
23CONF_FILES+= share/examples/mpv/encoding-profiles.conf ${PKG_SYSCONFDIR}/mpv/encoding-profiles.conf 23CONF_FILES+= share/examples/mpv/encoding-profiles.conf ${PKG_SYSCONFDIR}/mpv/encoding-profiles.conf
24 24
25SUBST_CLASSES+= audio 25SUBST_CLASSES+= audio
26SUBST_SED.audio+= -e "s,/dev/dsp,${DEVOSSAUDIO}," 26SUBST_SED.audio+= -e "s,/dev/dsp,${DEVOSSAUDIO},"
27SUBST_FILES.audio+= stream/audio_in.c waftools/checks/custom.py wscript 27SUBST_FILES.audio+= stream/audio_in.c waftools/checks/custom.py wscript
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/mpv/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/distinfo 2014/10/07 07:31:38 1.4
+++ pkgsrc/multimedia/mpv/distinfo 2014/10/12 16:00:30 1.5
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
1$NetBSD: distinfo,v 1.4 2014/10/07 07:31:38 wiz Exp $ 1$NetBSD: distinfo,v 1.5 2014/10/12 16:00:30 wiz Exp $
2 2
3SHA1 (mpv-0.6.0.tar.gz) = 60188f045ab177106b10443cf592184e5a4efd59 3SHA1 (mpv-0.6.0.tar.gz) = 60188f045ab177106b10443cf592184e5a4efd59
4RMD160 (mpv-0.6.0.tar.gz) = f273e8751bfe290ab6e4c3d234c46f0ccd44a6e7 4RMD160 (mpv-0.6.0.tar.gz) = f273e8751bfe290ab6e4c3d234c46f0ccd44a6e7
5Size (mpv-0.6.0.tar.gz) = 2598489 bytes 5Size (mpv-0.6.0.tar.gz) = 2598489 bytes
 6SHA1 (patch-waftools_generators_headers.py) = 4309fadacf3406318c342eb5e925178a8ea88ff9
 7SHA1 (patch-waftools_waf__customizations.py) = 54d5d4dc7b58b4c3e4e71724276244a2f00413a6
File Added: pkgsrc/multimedia/mpv/patches/Attic/patch-waftools_generators_headers.py
$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)
File Added: pkgsrc/multimedia/mpv/patches/Attic/patch-waftools_waf__customizations.py
$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):