X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=f2f12d13491fc8ff8cd7d0a2c5737bfb80b5b763;hb=32be167a1c74ac1e3e876ba7bac18c4890f7b4ee;hp=1f5fa5b5257a1351f38f9beba483ebfda325d636;hpb=f5ba686a28a44f57ebac6c812fa1a242812a4996;p=dcpomatic.git diff --git a/wscript b/wscript index 1f5fa5b52..f2f12d134 100644 --- a/wscript +++ b/wscript @@ -23,10 +23,10 @@ import sys import glob import distutils import distutils.spawn -from waflib import Logs +from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.3.8' +VERSION = '2.5.0devel' def options(opt): opt.load('compiler_cxx') @@ -83,7 +83,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') @@ -238,21 +238,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.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++ @@ -279,7 +279,7 @@ def configure(conf): # FFmpeg if conf.options.static_ffmpeg: - names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'swresample', 'postproc'] + names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc'] for name in names: static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0] libs = [] @@ -307,7 +307,6 @@ def configure(conf): conf.check_cfg(package='libavcodec', args='--cflags --libs', uselib_store='AVCODEC', mandatory=True) conf.check_cfg(package='libavutil', args='--cflags --libs', uselib_store='AVUTIL', mandatory=True) conf.check_cfg(package='libswscale', args='--cflags --libs', uselib_store='SWSCALE', mandatory=True) - conf.check_cfg(package='libswresample', args='--cflags --libs', uselib_store='SWRESAMPLE', mandatory=True) conf.check_cfg(package='libpostproc', args='--cflags --libs', uselib_store='POSTPROC', mandatory=True) # Boost @@ -373,6 +372,15 @@ def configure(conf): lib=['boost_regex%s' % boost_lib_suffix], uselib_store='BOOST_REGEX') + # libxml++ requires glibmm and versions of glibmm 2.45.31 and later + # must be built with -std=c++11 as they use c++11 + # features and c++11 is not (yet) the default in gcc. + glibmm_version = conf.cmd_and_log(['pkg-config', '--modversion', 'glibmm-2.4'], output=Context.STDOUT, quiet=Context.BOTH) + s = glibmm_version.split('.') + v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2]) + if v >= 0x022D1F: + conf.env.append_value('CXXFLAGS', '-std=c++11') + # Other stuff conf.find_program('msgfmt', var='MSGFMT') @@ -422,6 +430,8 @@ def build(bld): create_version_cc(VERSION, bld.env.CXXFLAGS) bld.recurse('src') + bld.recurse('graphics') + if not bld.env.DISABLE_TESTS: bld.recurse('test') if bld.env.TARGET_WINDOWS: @@ -431,13 +441,10 @@ def build(bld): if bld.env.TARGET_OSX: bld.recurse('platform/osx') - for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: - bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'graphics/%s/dcpomatic2.png' % r) - if not bld.env.TARGET_WINDOWS: - bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/taskbar_icon.png') - bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/splash.png') - 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) @@ -502,15 +509,7 @@ def pot_merge(bld): bld.recurse('src') def tags(bld): - os.system('etags src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc src/tools/*.h') - -def zanata_pull(bld): - os.system('zanata-cli -B -q pull -t .') - for f in glob.glob('src/lib/po/*.po'): - l = os.path.basename(f) - os.rename('dcpomatic_%s' % l, 'src/tools/po/%s' % l) - os.rename('libdcpomatic_%s' % l, 'src/lib/po/%s' % l) - os.rename('libdcpomatic-wx_%s' % l, 'src/wx/po/%s' % l) + os.system('etags src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc') def cppcheck(bld): os.system('cppcheck --enable=all --quiet .')