From 455475575bcfa30aa60a377235bfaf2fd7bc2da7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 Jul 2016 09:20:58 +0100 Subject: Use locked_sstream. Replace once parse_stream with parse_memory. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index d2375c40..43f47e33 100644 --- a/cscript +++ b/cscript @@ -35,9 +35,9 @@ import os def dependencies(target): if target.platform == 'windows' and target.version == 'xp': - return (('libcxml', 'v0.15.1'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', 'v0.1.2')) + return (('libcxml', 'b08e6b4'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', 'v0.1.2')) else: - return (('libcxml', 'v0.15.1'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'v0.1.2')) + return (('libcxml', 'b08e6b4'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'v0.1.2')) def build(target, options): cmd = './waf configure --disable-examples --prefix=%s' % target.directory -- cgit v1.2.3 From 4db995b48f21f79dd195f6a50def92734aeba00c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 Jul 2016 09:48:37 +0100 Subject: Bump libcxml for build fix. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 43f47e33..6f6bc1d8 100644 --- a/cscript +++ b/cscript @@ -35,9 +35,9 @@ import os def dependencies(target): if target.platform == 'windows' and target.version == 'xp': - return (('libcxml', 'b08e6b4'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', 'v0.1.2')) + return (('libcxml', 'c1348c5'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', 'v0.1.2')) else: - return (('libcxml', 'b08e6b4'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'v0.1.2')) + return (('libcxml', 'c1348c5'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'v0.1.2')) def build(target, options): cmd = './waf configure --disable-examples --prefix=%s' % target.directory -- cgit v1.2.3 From b487f8323fbdb03ddc5d047c1636d333fa144b60 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 Jul 2016 10:05:34 +0100 Subject: Bump asdcplib for stringstream fix. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 6f6bc1d8..a91f8407 100644 --- a/cscript +++ b/cscript @@ -35,9 +35,9 @@ import os def dependencies(target): if target.platform == 'windows' and target.version == 'xp': - return (('libcxml', 'c1348c5'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', 'v0.1.2')) + return (('libcxml', 'c1348c5'), ('openjpeg-cdist', '5d8bffd'), ('asdcplib-cth', '4c8a027')) else: - return (('libcxml', 'c1348c5'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'v0.1.2')) + return (('libcxml', 'c1348c5'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', '4c8a027')) def build(target, options): cmd = './waf configure --disable-examples --prefix=%s' % target.directory -- cgit v1.2.3 From dc52dfc8e5a5e89005098bbec56331f9f0c6d3aa Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 Jul 2016 13:27:44 +0100 Subject: Don't build test on Windows; rand_r() not available. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index a91f8407..7a09f0a0 100644 --- a/cscript +++ b/cscript @@ -48,7 +48,7 @@ def build(target, options): if (target.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'): target.append_with_space('CXXFLAGS', '-std=c++11') elif target.platform == 'windows': - cmd += ' --target-windows --disable-gcov' + cmd += ' --target-windows --disable-gcov --disable-tests' if target.version == 'xp': # OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771 cmd += ' --jpeg=oj1' -- cgit v1.2.3