Fix non-use of LUFS stuff due to error in waf configuration stage.

diff --git a/src/lib/wscript b/src/lib/wscript
index c538851d5facf4ab588b408c8795d0f3299c0b65..88cb9d4dc099fb2db4f1b436aeb546f38828ddf6 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -153,7 +153,7 @@ def build(bld):
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
                  SNDFILE SAMPLERATE POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
-                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU
+                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU PATCHED_FFMPEG
                  """
 
     if bld.env.TARGET_OSX:

diff --git a/wscript b/wscript
index eb9fb26b7afe8a2639ee06ecad4af7ee2e1e0d75..0536dee267b0d785239d5b4c5a7574a1475ff61b 100644 (file)
--- a/wscript
+++ b/wscript
@@ -310,7 +310,7 @@ def configure(conf):
                    libpath='/usr/local/lib',
                    lib=['avfilter'],
                    uselib_store='PATCHED_FFMPEG',
-                   defines_name='DCPOMATIC_HAVE_PATCHED_FFMPEG',
+                   define_name='DCPOMATIC_HAVE_PATCHED_FFMPEG',
                    mandatory=False)
 
     # Boost