X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=b4763c4fa0d742b23b528e10a84a10c50c0aa49c;hb=1c45aa5806a0891025eb4729b9e0c8cfb9c68e44;hp=4e543668b19e34937820f1621e7a54cc1ae3c922;hpb=57f9f6d535661860990e74bcc3b00e80c8a705ed;p=dcpomatic.git diff --git a/wscript b/wscript index 4e543668b..b4763c4fa 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.4.12' +VERSION = '2.6.16devel' 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++') @@ -83,7 +82,7 @@ def configure(conf): '-D_FILE_OFFSET_BITS=64']) if conf.options.enable_debug: - conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG']) + conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer']) else: conf.env.append_value('CXXFLAGS', '-O2') @@ -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') # @@ -238,21 +237,21 @@ def configure(conf): # libdcp if conf.options.static_dcp: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.4', args='--cflags', uselib_store='DCP', mandatory=True) + 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.4', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags --libs', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] # libsub if conf.options.static_sub: - conf.check_cfg(package='libsub-1.0', atleast_version='1.1.5', args='--cflags', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.1.8', args='--cflags', uselib_store='SUB', mandatory=True) conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB] conf.env.STLIB_SUB = ['sub-1.0'] else: - conf.check_cfg(package='libsub-1.0', atleast_version='1.1.5', args='--cflags --libs', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.1.8', args='--cflags --libs', uselib_store='SUB', mandatory=True) conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB] # libxml++ @@ -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'] @@ -309,6 +299,20 @@ def configure(conf): conf.check_cfg(package='libswscale', args='--cflags --libs', uselib_store='SWSCALE', mandatory=True) conf.check_cfg(package='libpostproc', args='--cflags --libs', uselib_store='POSTPROC', mandatory=True) + # Check to see if we have our version of FFmpeg that allows us to get at EBUR128 results + conf.check_cxx(fragment=""" + extern "C" {\n + #include \n + }\n + int main () { av_ebur128_get_true_peaks (0); }\n + """, + msg='Checking for patched FFmpeg', + libpath='/usr/local/lib', + lib=['avfilter'], + uselib_store='PATCHED_FFMPEG', + defines_name='DCPOMATIC_HAVE_PATCHED_FFMPEG', + mandatory=False) + # Boost if conf.options.static_boost: conf.env.STLIB_BOOST_THREAD = ['boost_thread'] @@ -414,7 +418,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) @@ -442,7 +445,9 @@ def build(bld): bld.recurse('platform/osx') if not bld.env.TARGET_WINDOWS: - bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf') + bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Regular.ttf') + bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Italic.ttf') + bld.install_files('${PREFIX}/share/dcpomatic2', 'fonts/LiberationSans-Bold.ttf') bld.add_post_fun(post)