X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=59d9b0aa28d836fe13aee0f5bf90dfeea93aceaa;hb=refs%2Ftags%2Fv2.6.7;hp=5c427ca0463aa3c612b5e7ea3a57f922e4232cd3;hpb=125128c837e24be66263377bbc83de7c8b6dd7d3;p=dcpomatic.git

diff --git a/wscript b/wscript
index 5c427ca04..59d9b0aa2 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.5.2'
+VERSION = '2.6.7'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -39,7 +39,6 @@ def options(opt):
     opt.add_option('--target-windows',    action='store_true', default=False, help='set up to do a cross-compile to make a Windows package')
     opt.add_option('--static-dcpomatic',  action='store_true', default=False, help='link to components of DCP-o-matic statically')
     opt.add_option('--static-boost',      action='store_true', default=False, help='link statically to Boost')
-    opt.add_option('--static-openjpeg',   action='store_true', default=False, help='link statically to OpenJPEG')
     opt.add_option('--static-wxwidgets',  action='store_true', default=False, help='link statically to wxWidgets')
     opt.add_option('--static-ffmpeg',     action='store_true', default=False, help='link statically to FFmpeg')
     opt.add_option('--static-xmlpp',      action='store_true', default=False, help='link statically to libxml++')
@@ -140,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')
 
     #
@@ -240,7 +239,7 @@ def configure(conf):
     if conf.options.static_dcp:
         conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags', uselib_store='DCP', mandatory=True)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
-        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0']
+        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0', 'openjp2']
         conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
     else:
         conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags --libs', uselib_store='DCP', mandatory=True)
@@ -268,15 +267,6 @@ def configure(conf):
     else:
         conf.env.LIB_XMLSEC = ['xmlsec1-openssl', 'xmlsec1']
 
-    # OpenJPEG
-    if conf.options.static_openjpeg:
-        conf.check_cfg(package='libopenjpeg', args='--cflags', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
-        conf.check_cfg(package='libopenjpeg', args='--cflags', max_version='1.5.2', mandatory=True)
-        conf.env.STLIB_OPENJPEG = ['openjpeg']
-    else:
-        conf.check_cfg(package='libopenjpeg', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
-        conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.2', mandatory=True)
-
     # FFmpeg
     if conf.options.static_ffmpeg:
         names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc']
@@ -414,7 +404,6 @@ def configure(conf):
 
     report('DCP-o-matic libraries', conf.options.static_dcpomatic)
     report('Boost', conf.options.static_boost)
-    report('OpenJPEG', conf.options.static_openjpeg)
     report('wxWidgets', conf.options.static_wxwidgets)
     report('FFmpeg', conf.options.static_ffmpeg)
     report('libxml++', conf.options.static_xmlpp)