Bump libdcp for atmos stuff.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 78454565f38535d58d29a7259c9b7cc22422c29e..d735e8c8d8f664e2134c6a1144117b4d59fa7000 100644 (file)
--- a/wscript
+++ b/wscript
@@ -78,11 +78,14 @@ def configure(conf):
                                        '-Wall',
                                        '-Wno-attributes',
                                        '-Wextra',
-                                       '-Wno-unused-result',
                                        # Remove auto_ptr warnings from libxml++-2.6
                                        '-Wno-deprecated-declarations',
                                        '-D_FILE_OFFSET_BITS=64'])
 
+    gcc = conf.env['CC_VERSION']
+    if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
+        conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
+
     if conf.options.enable_debug:
         conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer'])
     else:
@@ -157,7 +160,7 @@ def configure(conf):
         conf.env.STLIB_CURL = ['curl']
         conf.env.LIB_CURL = ['ssh2', 'idn']
     else:
-        conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True)
+        conf.check_cfg(package='libcurl', args='--cflags --libs', atleast_version='7.19.1', uselib_store='CURL', mandatory=True)
 
     # libicu
     if conf.check_cfg(package='icu-i18n', args='--cflags --libs', uselib_store='ICU', mandatory=False) is None:
@@ -196,6 +199,29 @@ def configure(conf):
         if graphics is not None:
             conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK')
 
+    # See if we are using the MagickCore or MagickLib namespaces
+    conf.check_cxx(fragment="""
+                            #include <Magick++/Include.h>\n
+                            using namespace MagickCore;\n
+                            int main () { return 0; }\n
+                            """,
+                   mandatory=False,
+                   msg='Checking for MagickCore namespace',
+                   okmsg='yes',
+                   includes=conf.env['INCLUDES_MAGICK'],
+                   define_name='DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE')
+
+    conf.check_cxx(fragment="""
+                            #include <Magick++/Include.h>\n
+                            using namespace MagickLib;\n
+                            int main () { return 0; }\n
+                            """,
+                   mandatory=False,
+                   msg='Checking for MagickLib namespace',
+                   okmsg='yes',
+                   includes=conf.env['INCLUDES_MAGICK'],
+                   define_name='DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE')
+
     # libzip
     conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
 
@@ -208,6 +234,19 @@ def configure(conf):
     # cairomm
     conf.check_cfg(package='cairomm-1.0', args='--cflags --libs', uselib_store='CAIROMM', mandatory=True)
 
+    # See if we have Cairo::ImageSurface::format_stride_for_width
+    conf.check_cxx(fragment="""
+                            #include <cairomm/cairomm.h>
+                            int main(void) {
+                                Cairo::ImageSurface::format_stride_for_width (Cairo::FORMAT_ARGB, 1024);\n
+                                return 0; }\n
+                            """,
+                       mandatory=False,
+                       msg='Checking for format_stride_for_width',
+                       okmsg='yes',
+                       includes=conf.env['INCLUDES_CAIROMM'],
+                       define_name='DCPOMATIC_HAVE_FORMAT_STRIDE_FOR_WIDTH')
+
     # libcxml
     if conf.options.static_cxml:
         conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags', uselib_store='CXML', mandatory=True)
@@ -261,7 +300,10 @@ def configure(conf):
 
     # libxmlsec
     if conf.options.static_xmlsec:
-        conf.env.STLIB_XMLSEC = ['xmlsec1-openssl', 'xmlsec1']
+        if conf.check_cxx(lib='xmlsec1-openssl', mandatory=False):
+            conf.env.STLIB_XMLSEC = ['xmlsec1-openssl', 'xmlsec1']
+        else:
+            conf.env.STLIB_XMLSEC = ['xmlsec1']
     else:
         conf.env.LIB_XMLSEC = ['xmlsec1-openssl', 'xmlsec1']