Various build / dependency fixes.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 725257b66b06e7c44b7088f8a9512bad71839da0..26dd3c9b0da836940dfd4c5dbe70b94e541284ef 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.6.5devel'
+VERSION = '2.6.18devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -239,7 +239,7 @@ def configure(conf):
     if conf.options.static_dcp:
         conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags', uselib_store='DCP', mandatory=True)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
-        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0', 'openjp2']
+        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2']
         conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
     else:
         conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags --libs', uselib_store='DCP', mandatory=True)
@@ -299,6 +299,20 @@ def configure(conf):
         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)
 
+    # Check to see if we have our version of FFmpeg that allows us to get at EBUR128 results
+    conf.check_cxx(fragment="""
+                            extern "C" {\n
+                            #include <libavfilter/f_ebur128.h>\n
+                            }\n
+                            int main () { av_ebur128_get_true_peaks (0); }\n
+                            """,
+                   msg='Checking for patched FFmpeg',
+                   libpath='/usr/local/lib',
+                   lib=['avfilter'],
+                   uselib_store='PATCHED_FFMPEG',
+                   defines_name='DCPOMATIC_HAVE_PATCHED_FFMPEG',
+                   mandatory=False)
+
     # Boost
     if conf.options.static_boost:
         conf.env.STLIB_BOOST_THREAD = ['boost_thread']