X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=9249f5e2d8163a38d856bb17e2607b933c67482b;hb=8f3539e599e046392fff8711547d1847c082006e;hp=c55395c269cdc04629c3fec78f4046a1379a7133;hpb=684ec3d7ba201649f33e9497ffd6cf57ef5b4cbf;p=dcpomatic.git

diff --git a/wscript b/wscript
index c55395c26..9249f5e2d 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.9.38devel'
+VERSION = '2.10.4'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -86,6 +86,7 @@ def configure(conf):
     gcc = conf.env['CC_VERSION']
     if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
         conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
+    have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
 
     if conf.options.enable_debug:
         conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer'])
@@ -237,6 +238,10 @@ def configure(conf):
     # cairomm
     conf.check_cfg(package='cairomm-1.0', args='--cflags --libs', uselib_store='CAIROMM', mandatory=True)
 
+    test_cxxflags = ''
+    if have_c11:
+        test_cxxflags = '-std=c++11'
+
     # See if we have Cairo::ImageSurface::format_stride_for_width; Centos 5 does not
     conf.check_cxx(fragment="""
                             #include <cairomm/cairomm.h>
@@ -245,7 +250,7 @@ def configure(conf):
                                 return 0; }\n
                             """,
                        mandatory=False,
-                       cxxflags='-std=c++11',
+                       cxxflags=test_cxxflags,
                        msg='Checking for format_stride_for_width',
                        okmsg='yes',
                        includes=conf.env['INCLUDES_CAIROMM'],
@@ -263,7 +268,7 @@ def configure(conf):
                             """,
                        mandatory=False,
                        msg='Checking for show_in_cairo_context',
-                       cxxflags='-std=c++11',
+                       cxxflags=test_cxxflags,
                        okmsg='yes',
                        includes=conf.env['INCLUDES_PANGOMM'],
                        uselib='PANGOMM',
@@ -560,6 +565,8 @@ def git_revision():
 
     cmd = "LANG= git log --abbrev HEAD^..HEAD ."
     output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
+    if len(output) == 0:
+        return None
     o = output[0].decode('utf-8')
     return o.replace("commit ", "")[0:10]