Various hacks.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index de9f099226614cc2eb623e33069e425c9479861d..4fd019bf32dc2798a044f39988992eb0876e2880 100644 (file)
--- 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.7devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -267,6 +267,9 @@ def configure(conf):
     else:
         conf.env.LIB_XMLSEC = ['xmlsec1-openssl', 'xmlsec1']
 
+    # XXX
+    conf.env.LIB_CUDA = ['cudart']
+
     # FFmpeg
     if conf.options.static_ffmpeg:
         names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc']
@@ -307,8 +310,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)
@@ -389,6 +393,9 @@ def configure(conf):
 
     conf.find_program('msgfmt', var='MSGFMT')
 
+    # Check for headers of poznan JPEG2000 encoding library
+    conf.check(header_name="poznan/config/parameters.h")
+
     datadir = conf.env.DATADIR
     if not datadir:
         datadir = os.path.join(conf.env.PREFIX, 'share')