Allow building with libxml++-4.0 and C++17.

diff --git a/libdcp-1.0.pc.in b/libdcp-1.0.pc.in
index 04b326ca0f33eb6e37da3465ad95f2ec301cbafa..84fd39ce22587ea4af93b55f18f240ccb446c73c 100644 (file)
--- a/libdcp-1.0.pc.in
+++ b/libdcp-1.0.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@
 Name: libdcp
 Description: DCP reading and writing library
 Version: @version@
-Requires: openssl libxml++-2.6 xmlsec1 libasdcp-carl xerces-c
+Requires: openssl libxml++-@xmlpp_api@ xmlsec1 libasdcp-carl xerces-c
 Libs: @libs@
 Cflags: -I${includedir}

diff --git a/src/encrypted_kdm.cc b/src/encrypted_kdm.cc
index 5b33e3f6b91fe66883392a05525a2b5d637eb2e7..d1089c0be8d2eab62aba039e7b69c836d89ab597 100644 (file)
--- a/src/encrypted_kdm.cc
+++ b/src/encrypted_kdm.cc
@@ -44,6 +44,7 @@
 #include "file.h"
 #include "util.h"
 #include <libcxml/cxml.h>
+#include <libxml++/attributenode.h>
 #include <libxml++/document.h>
 #include <libxml++/nodes/element.h>
 #include <libxml/parser.h>
@@ -229,9 +230,9 @@ public:
                }
        }
 
-       void as_xml (xmlpp::Element* node, map<string, xmlpp::Attribute *>& references) const
+       void as_xml (xmlpp::Element* node, map<string, xmlpp::AttributeNode*>& references) const
        {
-               references["ID_AuthenticatedPrivate"] = node->set_attribute ("Id", "ID_AuthenticatedPrivate");
+               references["ID_AuthenticatedPrivate"] = dynamic_cast<xmlpp::AttributeNode*>(node->set_attribute("Id", "ID_AuthenticatedPrivate"));
 
                for (auto i: encrypted_key) {
                        auto encrypted_key = cxml::add_child(node, "EncryptedKey", string("enc"));
@@ -517,9 +518,9 @@ public:
 
        }
 
-       void as_xml (xmlpp::Element* node, map<string, xmlpp::Attribute *>& references) const
+       void as_xml (xmlpp::Element* node, map<string, xmlpp::AttributeNode*>& references) const
        {
-               references["ID_AuthenticatedPublic"] = node->set_attribute ("Id", "ID_AuthenticatedPublic");
+               references["ID_AuthenticatedPublic"] = dynamic_cast<xmlpp::AttributeNode*>(node->set_attribute("Id", "ID_AuthenticatedPublic"));
 
                cxml::add_text_child(node, "MessageId", "urn:uuid:" + message_id);
                cxml::add_text_child(node, "MessageType", "http://www.smpte-ra.org/430-1/2006/KDM#kdm-key-type");
@@ -567,7 +568,7 @@ public:
                auto root = document->create_root_node("DCinemaSecurityMessage", "http://www.smpte-ra.org/schemas/430-3/2006/ETM");
                root->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "ds");
                root->set_namespace_declaration ("http://www.w3.org/2001/04/xmlenc#", "enc");
-               map<string, xmlpp::Attribute *> references;
+               map<string, xmlpp::AttributeNode*> references;
                authenticated_public.as_xml(cxml::add_child(root, "AuthenticatedPublic"), references);
                authenticated_private.as_xml(cxml::add_child(root, "AuthenticatedPrivate"), references);
                signature.as_xml(cxml::add_child(root, "Signature", string("ds")));

diff --git a/test/test.cc b/test/test.cc
index d384bdfa4fe8593616def05c305a15a0752119f6..6a359aebe48ba639c4098295148edfcdc01529a8 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -122,7 +122,7 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, vector<string> ignore_tags
        BOOST_CHECK_EQUAL (ref->get_name (), test->get_name ());
        BOOST_CHECK_EQUAL (ref->get_namespace_prefix (), test->get_namespace_prefix ());
 
-       if (find(ignore_tags.begin(), ignore_tags.end(), ref->get_name()) != ignore_tags.end()) {
+       if (find(ignore_tags.begin(), ignore_tags.end(), std::string(ref->get_name())) != ignore_tags.end()) {
                return;
        }
 

diff --git a/wscript b/wscript
index bd17e61998e27f29b1ee832bba12661231deb82a..8960553d595ef3c7d8b384b003110cad7ff64454 100644 (file)
--- a/wscript
+++ b/wscript
@@ -67,11 +67,20 @@ def options(opt):
     opt.add_option('--disable-dumpimage', action='store_true', default=False, help='disable building of dcpdumpimage')
     opt.add_option('--enable-openmp', action='store_true', default=False, help='enable use of OpenMP')
     opt.add_option('--openmp', default='gomp', help='specify OpenMP Library to use: omp, gomp (default), iomp')
+    opt.add_option('--c++17', action='store_true', default=False, help='build with C++17 and libxml++-4.0')
 
 def configure(conf):
     conf.load('compiler_cxx')
     conf.load('clang_compilation_database', tooldir=['waf-tools'])
-    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS', '-std=c++11'])
+
+    if vars(conf.options)['c++17']:
+        cpp_std = '17'
+        conf.env.XMLPP_API = '4.0'
+    else:
+        cpp_std = '11'
+        conf.env.XMLPP_API = '2.6'
+
+    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS', '-std=c++' + cpp_std])
     gcc = conf.env['CC_VERSION']
     if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
         conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])
@@ -118,7 +127,7 @@ def configure(conf):
         conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl')
 
     conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
-    conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='LIBXML++', mandatory=True)
+    conf.check_cfg(package='libxml++-' + conf.env.XMLPP_API, args='--cflags --libs', uselib_store='LIBXML++', mandatory=True)
     conf.check_cfg(package='xmlsec1', args='--cflags --libs', uselib_store='XMLSEC1', mandatory=True)
     # Remove erroneous escaping of quotes from xmlsec1 defines
     conf.env.DEFINES_XMLSEC1 = [f.replace('\\', '') for f in conf.env.DEFINES_XMLSEC1]
@@ -161,7 +170,7 @@ def configure(conf):
         conf.env.HAVE_ASDCPLIB_CTH = 1
         conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-carl', 'kumu-carl']
         conf.env.HAVE_CXML = 1
-        conf.env.LIB_CXML = ['xml++-2.6', 'glibmm-2.4']
+        conf.env.LIB_CXML = ['xml++-' + conf.env.XMLPP_API, 'glibmm-2.4']
         conf.env.STLIB_CXML = ['cxml']
         conf.check_cfg(package='xerces-c', args='--cflags', uselib_store='XERCES', mandatory=True)
         conf.env.LIB_XERCES = ['xerces-c', 'icuuc', 'curl']
@@ -263,7 +272,8 @@ def build(bld):
         version=VERSION,
         includedir='%s/include/libdcp%s' % (bld.env.PREFIX, bld.env.API_VERSION),
         libs=libs,
-        install_path='${LIBDIR}/pkgconfig')
+        install_path='${LIBDIR}/pkgconfig',
+        xmlpp_api=bld.env.XMLPP_ABI)
 
     bld.recurse('src')
     bld.recurse('tools')