New libcxml API.

diff --git a/cscript b/cscript
index 2ff9a8b6f81af4d4bf7031346812e9a4c7515837..854c75287fc803e93d57ef30b97320bcd95e1806 100644 (file)
--- 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 025d33c6aae04d07c8f6159da2996dc28e206fe0..1bde437638da801bfcc2472f287b644c84c08687 100644 (file)
--- 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<cxml::NodePtr> nodes)
+check_font_tags (vector<cxml::NodePtr> nodes)
 {
        for (auto i: nodes) {
                if (i->name() == "Font") {

diff --git a/wscript b/wscript
index 171bfc935c9b0532c03f480d209d2e6aab1112b1..9e38e6005769617f8dd3b55828ed6fa04958fb2e 100644 (file)
--- 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)