import glob
import distutils
import distutils.spawn
-from waflib import Logs
+from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.4.5devel'
+VERSION = '2.6.8devel'
def options(opt):
opt.load('compiler_cxx')
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++')
'-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')
# 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')
#
# 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++
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']
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 <libavfilter/f_ebur128.h>\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']
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')
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)
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:
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)
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 .')
projects / dcpomatic.git / blobdiff