From 3537c56d30582cbd9b5e87704cfa7d3d362343b3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 11:03:31 +0100 Subject: Don't build tests on Centos 7 either. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 5b9c3669b..665d39108 100644 --- a/cscript +++ b/cscript @@ -172,7 +172,7 @@ def build(target, options): if target.version == '6.5': cmd += ' --target-centos-6 --disable-tests' elif target.version == '7': - cmd += ' --target-centos-7' + cmd += ' --target-centos-7 --disable-tests' target.command(cmd) target.command('./waf') -- cgit v1.2.3 From 0f4cb98a8233c86dc4ed46cab6152cae44e64533 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 16:38:38 +0100 Subject: Bump libdcp version. --- cscript | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 665d39108..50f615681 100644 --- a/cscript +++ b/cscript @@ -157,7 +157,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '2dffa11'), - ('libdcp', '2001bef5b3a6256eedf1cada4977a3ba8a3732cd')) + ('libdcp', 'v0.98.0')) def build(target, options): cmd = './waf configure --prefix=%s' % target.directory diff --git a/wscript b/wscript index 897517b4f..2849d5759 100644 --- a/wscript +++ b/wscript @@ -59,7 +59,7 @@ def dynamic_openjpeg(conf): conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.2', mandatory=True) def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh): - conf.check_cfg(package='libdcp', atleast_version='0.96', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp', atleast_version='0.98', args='--cflags', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp'] conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt'] -- cgit v1.2.3 From 784440c45ee7469890a15ed612018eb66c2152dc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 16:46:56 +0100 Subject: Bump libdcp for 12bit merge. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 50f615681..9f0e3edf7 100644 --- a/cscript +++ b/cscript @@ -157,7 +157,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', '2dffa11'), - ('libdcp', 'v0.98.0')) + ('libdcp', 'd5accd6')) def build(target, options): cmd = './waf configure --prefix=%s' % target.directory -- cgit v1.2.3 From b9c5d508e441b1b899060c5fb147f7ce9ae70dbd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 18 Oct 2014 23:57:57 +0100 Subject: More attempts to fix previous. --- cscript | 1 - 1 file changed, 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 9f0e3edf7..495d7723a 100644 --- a/cscript +++ b/cscript @@ -8,7 +8,6 @@ deb_build_depends = {'debhelper': '8.0.0', 'pkg-config': '0.26', 'libssh-dev': '0.5.2', 'libsndfile1-dev': '1.0.25', - 'libmagick++-dev': '8:6.6.9.7', 'libgtk2.0-dev': '2.24.10'} deb_depends = dict() -- cgit v1.2.3