diff options
| author | wiz <wiz@pkgsrc.org> | 2015-02-19 08:59:57 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2015-02-19 08:59:57 +0000 |
| commit | fa18a2f3978a3c5761c24554adfb4a297d37f41c (patch) | |
| tree | 53ce3956c8863e5b3ae3e6602ed1a4e659bff454 /multimedia | |
| parent | 0c31e7838f5f4afb6a44fe6dfd7fd17c9aeec917 (diff) | |
| download | pkgsrc-fa18a2f3978a3c5761c24554adfb4a297d37f41c.tar.gz | |
Fix build with waf-1.8.6.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mpv/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/mpv/patches/patch-waftools_waf__customizations.py | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index b7a0f2a9620..a090f628e91 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/02/01 18:55:33 wiz Exp $ +$NetBSD: distinfo,v 1.9 2015/02/19 08:59:57 wiz Exp $ SHA1 (mpv-0.7.3.tar.gz) = ea160d28738e1e2084a02eebf721831b38915fd4 RMD160 (mpv-0.7.3.tar.gz) = fe7005074e8554ad150f551e56006d5f49b543ed Size (mpv-0.7.3.tar.gz) = 2672554 bytes +SHA1 (patch-waftools_waf__customizations.py) = 122b3f797f47c64e58f4d221fad291f8d53d24b6 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..36ece3830a6 --- /dev/null +++ b/multimedia/mpv/patches/patch-waftools_waf__customizations.py @@ -0,0 +1,22 @@ +$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): |