APPNAME = 'libdcp'
-this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
-last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).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('--static', action='store_true', default=False, help='build libdcp statically, and link statically to openjpeg, cxml, asdcplib-carl')
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('--disable-gcov', action='store_true', default=False, help='don''t use gcov in tests')
+ 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('--jpeg', default='oj2', help='specify JPEG library to build with: oj1 or oj2 for OpenJPEG 1.5.x or OpenJPEG 2.1.x respectively')
def configure(conf):
conf.load('compiler_cxx')
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
if conf.env.TARGET_LINUX:
conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl')
- if conf.options.jpeg == 'oj1':
- conf.env.append_value('CXXFLAGS', ['-DLIBDCP_OPENJPEG1'])
- elif conf.options.jpeg == 'oj2':
- conf.env.append_value('CXXFLAGS', ['-DLIBDCP_OPENJPEG2'])
- else:
- Logs.error('Invalid --jpeg value %s' % conf.options.jpeg)
-
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='xmlsec1', args='--cflags --libs', uselib_store='XMLSEC1', mandatory=True)
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-dcpdumpimage')
conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=False)
+ # Find openjpeg so that we can test to see if it's the right version
+ if conf.options.static:
+ conf.check_cfg(package='libopenjp2', args='--cflags', uselib_store='OPENJPEG', mandatory=True, msg='Checking for any version of libopenjp2')
+ else:
+ conf.check_cfg(package='libopenjp2', args='--cflags --libs', uselib_store='OPENJPEG', mandatory=True, msg='Checking for any version of libopenjp2')
+
+ patched_openjpeg = conf.check_cxx(fragment="""
+ #include <openjpeg.h>
+ int main() { opj_cparameters_t p; p.numgbits = 2; }\n
+ """,
+ msg='Checking for numgbits in opj_cparameters_t',
+ use='OPENJPEG',
+ mandatory=False,
+ define_name='LIBDCP_HAVE_NUMGBITS')
+
+ 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')
+
if conf.options.static:
- if conf.options.jpeg == 'oj2':
- conf.check_cfg(package='libopenjp2', args='--cflags', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True)
- conf.env.STLIB_OPENJPEG = ['openjp2']
- elif conf.options.jpeg == 'oj1':
- conf.check_cfg(package='libopenjpeg1', args='--cflags', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
- conf.env.STLIB_OPENJPEG = ['openjpeg']
- conf.check_cfg(package='libasdcp-carl', atleast_version='0.1.3', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True)
+ 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.env.HAVE_CXML = 1
conf.check_cfg(package='xerces-c', args='--cflags', uselib_store='XERCES', mandatory=True)
conf.env.LIB_XERCES = ['xerces-c', 'icuuc', 'curl']
else:
- if conf.options.jpeg == 'oj2':
- conf.check_cfg(package='libopenjp2', args='--cflags --libs', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True)
- elif conf.options.jpeg == 'oj1':
- conf.check_cfg(package='libopenjpeg1', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
- conf.check_cfg(package='libasdcp-carl', atleast_version='0.1.3', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
- conf.check_cfg(package='libcxml', atleast_version='0.17.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+ conf.check_cfg(package='libasdcp-carl', args='libasdcp-carl >= 0.1.3 --cflags --libs', uselib_store='ASDCPLIB_CTH', 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)
if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32:
if not conf.env.DISABLE_TESTS:
conf.recurse('test')
- if not conf.options.disable_gcov:
+ if conf.options.enable_gcov:
conf.check(lib='gcov', define_name='HAVE_GCOV', mandatory=False)
conf.env.append_value('LINKFLAGS', '-fprofile-arcs')