APPNAME = 'libdcp'
-this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE, encoding='UTF-8').communicate()[0]
-last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE, encoding='UTF-8').communicate()[0]
+this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0].decode('UTF-8')
+last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0].decode('UTF-8')
if this_version == '':
VERSION = '%sdevel' % last_version[1:].strip()
else:
VERSION = this_version[1:].strip()
+if sys.version_info.major == 2:
+ # Handle Python 2 (for Ubuntu 16.04)
+ VERSION = VERSION.encode('UTF-8')
+
API_VERSION = '-1.0'
def options(opt):
opt.add_option('--target-windows-64', action='store_true', default=False, help='set up to do a cross-compile to Windows 64-bit')
opt.add_option('--target-windows-32', action='store_true', default=False, help='set up to do a cross-compile to Windows 32-bit')
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 statically, and link statically to openjpeg, cxml, asdcplib-carl')
+ opt.add_option('--static', action='store_true', default=False, help='build libdcp statically, and link statically to openjpeg, cxml, asdcplib-dcpomatic')
opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests')
opt.add_option('--disable-benchmarks', action='store_true', default=False, help='disable building of benchmarks')
opt.add_option('--enable-gcov', action='store_true', default=False, help='use gcov in tests')
opt.add_option('--disable-examples', action='store_true', default=False, help='disable building of examples')
+ opt.add_option('--disable-dumpimage', action='store_true', default=False, help='disable building of dcpdumpimage')
opt.add_option('--enable-openmp', action='store_true', default=False, help='enable use of OpenMP')
opt.add_option('--openmp', default='gomp', help='specify OpenMP Library to use: omp, gomp (default), iomp')
+ opt.add_option('--c++17', action='store_true', default=False, help='build with C++17 and libxml++-4.0')
def configure(conf):
conf.load('compiler_cxx')
conf.load('clang_compilation_database', tooldir=['waf-tools'])
- conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS', '-std=c++11'])
+
+ if vars(conf.options)['c++17']:
+ cpp_std = '17'
+ conf.env.XMLPP_API = '4.0'
+ else:
+ cpp_std = '11'
+ conf.env.XMLPP_API = '2.6'
+
+ conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS', '-std=c++' + cpp_std])
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.DISABLE_TESTS = conf.options.disable_tests
conf.env.DISABLE_BENCHMARKS = conf.options.disable_benchmarks
conf.env.DISABLE_EXAMPLES = conf.options.disable_examples
+ conf.env.DISABLE_DUMPIMAGE = conf.options.disable_dumpimage
conf.env.STATIC = conf.options.static
conf.env.API_VERSION = API_VERSION
conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl')
conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
- conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='LIBXML++', mandatory=True)
+ conf.check_cfg(package='libxml++-' + conf.env.XMLPP_API, args='--cflags --libs', uselib_store='LIBXML++', mandatory=True)
conf.check_cfg(package='xmlsec1', args='--cflags --libs', uselib_store='XMLSEC1', mandatory=True)
# Remove erroneous escaping of quotes from xmlsec1 defines
conf.env.DEFINES_XMLSEC1 = [f.replace('\\', '') for f in conf.env.DEFINES_XMLSEC1]
# ImageMagick / GraphicsMagick
- if not conf.options.disable_examples:
+ if (not conf.options.disable_examples) and (not conf.options.disable_dumpimage):
if distutils.spawn.find_executable('Magick++-config'):
conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True, msg='Checking for ImageMagick/GraphicsMagick')
else:
image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
if image is None and graphics is None:
- Logs.error('Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required')
+ Logs.error('Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required unless you ./waf configure --disable-examples --disable-dumpimage')
+ sys.exit(1)
conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=False)
if not patched_openjpeg:
# We don't have our patched version so we need 2.5.0 to get the GUARD_BITS option
- conf.check_cfg(package='libopenjp2', args='libopenjp2 >= 2.5.0', uselib_store='OPENJPEG', mandatory=True, msg='Checking for libopenjp2 >= 2.5.0')
+ conf.check_cfg(package='libopenjp2', args='libopenjp2 >= 2.5.0 --cflags --libs', uselib_store='OPENJPEG', mandatory=True, msg='Checking for libopenjp2 >= 2.5.0')
if conf.options.static:
conf.env.STLIB_OPENJPEG = ['openjp2']
- conf.check_cfg(package='libasdcp-carl', args='libasdcp-carl >= 0.1.3 --cflags', uselib_store='ASDCPLIB_CTH', mandatory=True)
- conf.env.HAVE_ASDCPLIB_CTH = 1
- conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-carl', 'kumu-carl']
+ conf.check_cfg(package='libasdcp-dcpomatic', args='libasdcp-dcpomatic >= 0.1.3 --cflags', uselib_store='ASDCPLIB_DCPOMATIC', mandatory=True)
+ conf.env.HAVE_ASDCPLIB_DCPOMATIC = 1
+ conf.env.STLIB_ASDCPLIB_DCPOMATIC = ['asdcp-dcpomatic', 'kumu-dcpomatic']
conf.env.HAVE_CXML = 1
- conf.env.LIB_CXML = ['xml++-2.6', 'glibmm-2.4']
+ conf.env.LIB_CXML = ['xml++-' + conf.env.XMLPP_API, 'glibmm-2.4']
conf.env.STLIB_CXML = ['cxml']
conf.check_cfg(package='xerces-c', args='--cflags', uselib_store='XERCES', mandatory=True)
conf.env.LIB_XERCES = ['xerces-c', 'icuuc', 'curl']
else:
- conf.check_cfg(package='libasdcp-carl', args='libasdcp-carl >= 0.1.3 --cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
+ conf.check_cfg(package='libasdcp-dcpomatic', args='libasdcp-dcpomatic >= 0.1.3 --cflags --libs', uselib_store='ASDCPLIB_DCPOMATIC', mandatory=True)
conf.check_cfg(package='libcxml', args='libcxml >= 0.17.0 --cflags --libs', uselib_store='CXML', mandatory=True)
conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=True)
lib=['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
uselib_store='BOOST_FILESYSTEM')
+ conf.check_cxx(fragment="""
+ #include <boost/filesystem.hpp>\n
+ int main() { boost::filesystem::weakly_canonical("a/b/c"); }\n
+ """,
+ mandatory=False,
+ msg='Checking for boost::filesystem::weakly_canonical',
+ uselib='BOOST_FILESYSTEM',
+ define_name='LIBDCP_HAVE_WEAKLY_CANONICAL')
+
conf.check_cxx(fragment="""
#include <boost/signals2.hpp>\n
int main() { boost::signals2::signal<void (int)> x; }\n
version=VERSION,
includedir='%s/include/libdcp%s' % (bld.env.PREFIX, bld.env.API_VERSION),
libs=libs,
- install_path='${LIBDIR}/pkgconfig')
+ install_path='${LIBDIR}/pkgconfig',
+ xmlpp_api=bld.env.XMLPP_ABI)
bld.recurse('src')
bld.recurse('tools')
projects / libdcp.git / blobdiff