From 3768b728b46dcfd4bb6c34a70f566a31b09c6409 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 14 Sep 2024 02:00:40 +0200 Subject: Bump libcxml for static boost build fixes. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscript b/cscript index 618b2fb9..b08c366e 100644 --- a/cscript +++ b/cscript @@ -35,7 +35,7 @@ import os import shutil def dependencies(target, options): - return (('libcxml', 'v0.17.6'), ('openjpeg', '925ca5192bb16d4f58a6fddc8b1623eced7f0203'), ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f')) + return (('libcxml', 'v0.17.11'), ('openjpeg', '925ca5192bb16d4f58a6fddc8b1623eced7f0203'), ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f')) def build(target, options): cmd = './waf configure --disable-examples --disable-dumpimage --disable-benchmarks --prefix=%s' % target.directory -- cgit v1.2.3 From 9181f07af574cb45099c887349285f9c62157481 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 14 Sep 2024 02:28:16 +0200 Subject: Fix build on Ubuntu 16.04 now that we have a static boost library. --- cscript | 2 ++ test/test.cc | 2 +- wscript | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cscript b/cscript index b08c366e..61d94539 100644 --- a/cscript +++ b/cscript @@ -44,6 +44,8 @@ def build(target, options): if target.distro != 'ubuntu' or not target.version in ('16.04', '22.04'): # We only build tests on Ubuntu 16.04 and 22.04 cmd += ' --disable-tests' + if target.distro == 'ubuntu' and target.version == '16.04': + cmd += ' --static-boost' elif target.platform == 'windows': cmd += f' --target-windows-{target.bits}' diff --git a/test/test.cc b/test/test.cc index d384bdfa..fcd2d226 100644 --- a/test/test.cc +++ b/test/test.cc @@ -31,7 +31,7 @@ files in the program, then also delete it here. */ -#define BOOST_TEST_DYN_LINK + #define BOOST_TEST_MODULE libdcp_test #include "compose.hpp" #include "cpl.h" diff --git a/wscript b/wscript index ba74aa0f..062e54da 100644 --- a/wscript +++ b/wscript @@ -60,6 +60,7 @@ def options(opt): opt.add_option('--target-windows-32', action='store_true', default=False, help='set up to do a cross-compile to Windows 32-bit') opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') opt.add_option('--static', action='store_true', default=False, help='build libdcp statically, and link statically to openjpeg, cxml, asdcplib-carl') + opt.add_option('--static-boost', action='store_true', default=False, help='link statically to boost') opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') opt.add_option('--disable-benchmarks', action='store_true', default=False, help='disable building of benchmarks') opt.add_option('--enable-gcov', action='store_true', default=False, help='use gcov in tests') @@ -102,6 +103,9 @@ def configure(conf): elif int(gcc[0]) > 4: conf.env.append_value('CXXFLAGS', ['-Wsuggest-override']) + if not conf.options.static_boost: + conf.env.append_value('CXXFLAGS', '-DBOOST_TEST_DYN_LINK') + # Disable libxml++ deprecation warnings for now conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-declarations']) -- cgit v1.2.3 From f7ea43ef73b03fd875866bdc8a068a64997ae7d2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 14 Sep 2024 11:06:05 +0200 Subject: Fix boost test library detection. --- test/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/wscript b/test/wscript index d2cac0b3..f2e41341 100644 --- a/test/wscript +++ b/test/wscript @@ -42,7 +42,7 @@ def configure(conf): conf.check_cxx(fragment=""" #define BOOST_TEST_MODULE Config test\n #include \n - int main() {} + BOOST_AUTO_TEST_CASE(foo) {} """, msg='Checking for boost unit testing library', lib='boost_unit_test_framework%s' % boost_lib_suffix, -- cgit v1.2.3 From 791e68abfcde03982105896505c91863b7795c5e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 16 Sep 2024 16:13:45 +0200 Subject: Increase allowable size of Interop XML files. --- src/interop_subtitle_asset.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc index 32c3f66a..253a0498 100644 --- a/src/interop_subtitle_asset.cc +++ b/src/interop_subtitle_asset.cc @@ -73,7 +73,7 @@ using namespace dcp; InteropSubtitleAsset::InteropSubtitleAsset (boost::filesystem::path file) : SubtitleAsset (file) { - _raw_xml = dcp::file_to_string (file); + _raw_xml = dcp::file_to_string(file, 10 * 1024 * 1024); auto xml = make_shared("DCSubtitle"); xml->read_file(dcp::filesystem::fix_long_path(file)); -- cgit v1.2.3