pot/merge.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 15e82ac19badcbe86dfd3f05a12d5a06ad579583..177d459bece196f32f1db130a87838b808ffb76d 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.6.4'
+VERSION = '2.6.8devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -139,7 +139,7 @@ def configure(conf):
 
     # OSX
     if conf.env.TARGET_OSX:
-        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-Wno-unused-function', '-Wno-unused-parameter'])
+        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-Wno-unused-function', '-Wno-unused-parameter', '-Wno-unused-local-typedef'])
         conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names')
 
     #
@@ -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']