diff options
| author | wiz <wiz> | 2015-02-19 08:59:57 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2015-02-19 08:59:57 +0000 |
| commit | 8596ff07e23ac94469f336cc6cfb33a1100fc5a8 (patch) | |
| tree | 53ce3956c8863e5b3ae3e6602ed1a4e659bff454 /multimedia/mpv/patches | |
| parent | f3ff12963b13fcdf5774cb23082052b65dd5933c (diff) | |
| download | pkgsrc-8596ff07e23ac94469f336cc6cfb33a1100fc5a8.tar.gz | |
Fix build with waf-1.8.6.
Diffstat (limited to 'multimedia/mpv/patches')
| -rw-r--r-- | multimedia/mpv/patches/patch-waftools_waf__customizations.py | 22 |
1 files changed, 22 insertions, 0 deletions
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): |