X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=cbecb0d219a405f31bc97641ac24448cce49d5e2;hb=32def2da6e6413b898b493dd03308e17b9737e9d;hp=c55395c269cdc04629c3fec78f4046a1379a7133;hpb=1427603608bd89846e363d478547a535eef75943;p=dcpomatic.git

diff --git a/wscript b/wscript
index c55395c26..cbecb0d21 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.11.0devel'
 
 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'])
@@ -115,6 +116,10 @@ def configure(conf):
         conf.check(lib='iberty', uselib_store='IBERTY', msg="Checking for library iberty")
         conf.check(lib='shlwapi', uselib_store='SHLWAPI', msg="Checking for library shlwapi")
         conf.check(lib='mswsock', uselib_store='MSWSOCK', msg="Checking for library mswsock")
+        conf.check(lib='ole32', uselib_store='OLE32', msg="Checking for library ole32")
+        conf.check(lib='dsound', uselib_store='DSOUND', msg="Checking for library dsound")
+        conf.check(lib='winmm', uselib_store='WINMM', msg="Checking for library winmm")
+        conf.check(lib='ksuser', uselib_store='KSUSER', msg="Checking for library ksuser")
         boost_lib_suffix = '-mt'
         boost_thread = 'boost_thread-mt'
         conf.check_cxx(fragment="""
@@ -237,6 +242,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 +254,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 +272,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',
@@ -335,7 +344,7 @@ def configure(conf):
 
     # FFmpeg
     if conf.options.static_ffmpeg:
-        names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc']
+        names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc', 'swresample']
         for name in names:
             static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0].decode('utf-8')
             libs = []
@@ -364,6 +373,7 @@ def configure(conf):
         conf.check_cfg(package='libavutil', args='--cflags --libs', uselib_store='AVUTIL', mandatory=True)
         conf.check_cfg(package='libswscale', args='--cflags --libs', uselib_store='SWSCALE', mandatory=True)
         conf.check_cfg(package='libpostproc', args='--cflags --libs', uselib_store='POSTPROC', mandatory=True)
+        conf.check_cfg(package='libswresample', args='--cflags --libs', uselib_store='SWRESAMPLE', mandatory=True)
 
     # Check to see if we have our version of FFmpeg that allows us to get at EBUR128 results
     conf.check_cxx(fragment="""
@@ -560,6 +570,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]