Switch PlayerVideo::always_rgb to a new ::force and use it in FFmpegFileEncoder.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index f7bfea42faf80612bc064f14ba66118e3051581a..de9c82d2c6f606167e5513af83f9a281f2b5c63a 100644 (file)
--- a/wscript
+++ b/wscript
@@ -337,6 +337,9 @@ def configure(conf):
     # nettle
     conf.check_cfg(package="nettle", args='--cflags --libs', uselib_store='NETTLE', mandatory=True)
 
+    # libpng
+    conf.check_cfg(package='libpng', args='--cflags --libs', uselib_store='PNG', mandatory=True)
+
     # FFmpeg
     if conf.options.static_ffmpeg:
         names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc', 'swresample']
@@ -378,9 +381,7 @@ def configure(conf):
                             int main () { av_ebur128_get_true_peaks (0); }\n
                             """,
                    msg='Checking for EBUR128-patched FFmpeg',
-                   libpath=conf.env['LIBPATH_AVFORMAT'],
-                   lib='avfilter avutil swresample',
-                   includes=conf.env['INCLUDES_AVFORMAT'],
+                   uselib='AVCODEC AVFILTER',
                    define_name='DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG',
                    mandatory=False)
 
@@ -394,9 +395,7 @@ def configure(conf):
                             """,
                    msg='Checking for AVSubtitleRect::pict',
                    cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror',
-                   libpath=conf.env['LIBPATH_AVCODEC'],
-                   lib='avcodec',
-                   includes=conf.env['INCLUDES_AVCODEC'],
+                   uselib='AVCODEC',
                    define_name='DCPOMATIC_HAVE_AVSUBTITLERECT_PICT',
                    mandatory=False)
 
@@ -410,14 +409,12 @@ def configure(conf):
                             """,
                    msg='Checking for AVComponentDescriptor::depth_minus1',
                    cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror',
-                   libpath=conf.env['LIBPATH_AVUTIL'],
-                   lib='avutil',
-                   includes=conf.env['INCLUDES_AVUTIL'],
+                   uselib='AVUTIL',
                    define_name='DCPOMATIC_HAVE_AVCOMPONENTDESCRIPTOR_DEPTH_MINUS1',
                    mandatory=False)
 
     # Hack: the previous two check_cxx calls end up copying their (necessary) cxxflags
-    # to these variables.  We don't want to use these for the actual build, so clearn them out.
+    # to these variables.  We don't want to use these for the actual build, so clean them out.
     conf.env['CXXFLAGS_AVCODEC'] = []
     conf.env['CXXFLAGS_AVUTIL'] = []