X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=ae2e39bcfdb7794190dabaa3b84a8eacb7c87269;hb=68fa6e44a938d963129db758c25af8e843771a85;hp=2cf0fb69420110a57feb3a755c0a41b83284f816;hpb=c4db5b5396c6401c63d80777a812e8adc642ce02;p=libdcp.git diff --git a/wscript b/wscript index 2cf0fb69..ae2e39bc 100644 --- a/wscript +++ b/wscript @@ -1,18 +1,37 @@ +# +# Copyright (C) 2012-2016 Carl Hetherington +# +# This file is part of libdcp. +# +# libdcp is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# libdcp is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with libdcp. If not, see . +# + import subprocess import os import sys import distutils.spawn -from waflib import Logs +from waflib import Logs, Context APPNAME = 'libdcp' -VERSION = '1.2.10devel' +VERSION = '1.3.3devel' API_VERSION = '-1.0' 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 Windows') opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') - opt.add_option('--static', action='store_true', default=False, help='build libdcp and in-tree dependencies statically, and link statically to openjpeg and cxml') + opt.add_option('--static', action='store_true', default=False, help='build libdcp statically, and link statically to openjpeg, cxml, asdcplib-cth') opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') opt.add_option('--disable-gcov', action='store_true', default=False, help='don''t use gcov in tests') opt.add_option('--disable-examples', action='store_true', default=False, help='disable building of examples') @@ -21,6 +40,9 @@ def options(opt): def configure(conf): conf.load('compiler_cxx') conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS']) + gcc = conf.env['CC_VERSION'] + if int(gcc[0]) >= 4 and int(gcc[1]) > 1: + conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized']) conf.env.append_value('CXXFLAGS', ['-DLIBDCP_VERSION="%s"' % VERSION]) conf.env.TARGET_WINDOWS = conf.options.target_windows @@ -39,8 +61,11 @@ def configure(conf): if conf.env.TARGET_OSX: conf.env.append_value('CXXFLAGS', ['-Wno-unused-result', '-Wno-unused-parameter', '-Wno-unused-local-typedef']) + # Disable libxml++ deprecation warnings for now + conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-declarations']) + if conf.options.enable_openmp: - conf.env.append_value('CXXFLAGS', '-fopenmp') + conf.env.append_value('CXXFLAGS', ['-fopenmp', '-DLIBDCP_OPENMP']) conf.env.LIB_OPENMP = ['gomp'] conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True) @@ -64,10 +89,15 @@ def configure(conf): conf.check_cfg(package='libopenjp2', args='--cflags', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True) conf.env.STLIB_OPENJPEG = ['openjp2'] conf.env.HAVE_CXML = 1 + conf.env.LIB_CXML = ['xml++-2.6', 'glibmm-2.4'] conf.env.STLIB_CXML = ['cxml'] + conf.check_cfg(package='libasdcp-cth', atleast_version='0.0.1', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True) + conf.env.HAVE_ASDCPLIB_CTH = 1 + conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-cth', 'kumu-cth'] else: conf.check_cfg(package='libopenjp2', args='--cflags --libs', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True) - conf.check_cfg(package='libcxml', atleast_version='0.14.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags --libs', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libasdcp-cth', atleast_version='0.1.0', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) if conf.options.target_windows: boost_lib_suffix = '-mt' @@ -122,7 +152,13 @@ def configure(conf): conf.recurse('test') if not conf.options.disable_gcov: conf.check(lib='gcov', define_name='HAVE_GCOV', mandatory=False) - conf.recurse('asdcplib') + + # libxml++ 2.39.1 and later must be built with -std=c++11 + libxmlpp_version = conf.cmd_and_log(['pkg-config', '--modversion', 'libxml++-2.6'], output=Context.STDOUT, quiet=Context.BOTH) + s = libxmlpp_version.split('.') + v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2]) + if v >= 0x022701: + conf.env.append_value('CXXFLAGS', '-std=c++11') def build(bld): create_version_cc(bld, VERSION) @@ -135,14 +171,13 @@ def build(bld): bld(source='libdcp%s.pc.in' % bld.env.API_VERSION, version=VERSION, includedir='%s/include/libdcp%s' % (bld.env.PREFIX, bld.env.API_VERSION), - libs="-L${libdir} -ldcp%s -lasdcp-libdcp%s -lkumu-libdcp%s -lcxml -lboost_system%s" % (API_VERSION, bld.env.API_VERSION, bld.env.API_VERSION, boost_lib_suffix), + libs="-L${libdir} -ldcp%s -lcxml -lboost_system%s" % (bld.env.API_VERSION, boost_lib_suffix), install_path='${LIBDIR}/pkgconfig') bld.recurse('src') bld.recurse('tools') if not bld.env.DISABLE_TESTS: bld.recurse('test') - bld.recurse('asdcplib') if not bld.env.DISABLE_EXAMPLES: bld.recurse('examples')