X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=f152f0565ba803dd4ac719b0244538ab642a0450;hb=3bf4419f3170b1ef69dddae090a7dfc071773c6f;hp=de9f099226614cc2eb623e33069e425c9479861d;hpb=4d42109de06a0c6577f7fd76cc5e243dfe178d37;p=dcpomatic.git diff --git a/wscript b/wscript index de9f09922..f152f0565 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.6.33devel' +VERSION = '2.7.8' def options(opt): opt.load('compiler_cxx') @@ -307,8 +307,9 @@ def configure(conf): int main () { av_ebur128_get_true_peaks (0); }\n """, msg='Checking for patched FFmpeg', - libpath='/usr/local/lib', - lib=['avfilter'], + libpath=conf.env['LIBPATH_AVFORMAT'], + lib=['avfilter', 'avutil', 'swresample'], + includes=conf.env['INCLUDES_AVFORMAT'], uselib_store='PATCHED_FFMPEG', define_name='DCPOMATIC_HAVE_PATCHED_FFMPEG', mandatory=False)