From 1776f46fd988b4a61ed9dfa64e5b4dd2196cdd66 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 8 Jan 2021 21:55:47 +0100 Subject: [PATCH] New libcxml API. --- cscript | 4 ++-- test/dcp_subtitle_test.cc | 3 ++- wscript | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cscript b/cscript index 2ff9a8b6f..854c75287 100644 --- a/cscript +++ b/cscript @@ -370,8 +370,8 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'd39880e')) - deps.append(('libsub', 'ee5d2c8')) + deps.append(('libdcp', 'b221efe')) + deps.append(('libsub', '4cd1518')) deps.append(('leqm-nrt', '131f971')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index 025d33c6a..1bde43763 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -41,6 +41,7 @@ using std::cout; using std::list; using std::shared_ptr; +using std::vector; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; @@ -188,7 +189,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4) static void -check_font_tags (list nodes) +check_font_tags (vector nodes) { for (auto i: nodes) { if (i->name() == "Font") { diff --git a/wscript b/wscript index 171bfc935..9e38e6005 100644 --- a/wscript +++ b/wscript @@ -320,7 +320,7 @@ def configure(conf): # libcxml if conf.options.static_cxml: - conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.17.0', args='--cflags', uselib_store='CXML', mandatory=True) conf.env.STLIB_CXML = ['cxml'] else: conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) -- 2.30.2