X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=wscript;h=2cd694e5996a1cbd4728bdd1bff7e0b62fc3f856;hp=92a79bb9b031413d250c554eda913e767fa19880;hb=3b1dc2609e696a1f092be09a3c858ccacfae1a3f;hpb=e571e208d540a5bb6dafa49a8e91cb0428931abb diff --git a/wscript b/wscript index 92a79bb9b..2cd694e59 100644 --- a/wscript +++ b/wscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2017 Carl Hetherington +# Copyright (C) 2012-2019 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -99,6 +99,7 @@ def configure(conf): # Remove auto_ptr warnings from libxml++-2.6 '-Wno-deprecated-declarations', '-Wno-ignored-qualifiers', + '-Wno-parentheses', '-D_FILE_OFFSET_BITS=64']) if conf.options.force_cpp11: @@ -176,6 +177,9 @@ def configure(conf): if conf.env.TARGET_OSX: conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-Wno-unused-function', '-Wno-unused-parameter', '-Wno-unused-local-typedef', '-Wno-potentially-evaluated-expression']) conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names') + else: + # Avoid the endless warnings about _t uninitialized in optional<> + conf.env.append_value('CXXFLAGS', '-Wno-maybe-uninitialized') # # Dependencies. @@ -216,79 +220,6 @@ def configure(conf): # glib conf.check_cfg(package='glib-2.0', args='--cflags --libs', uselib_store='GLIB', mandatory=True) - # ImageMagick / GraphicsMagick - if distutils.spawn.find_executable('Magick++-config'): - conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) - conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK') - else: - image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) - graphics = None - if image is None: - graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) - if image is None and graphics is None: - Logs.pprint('RED', 'Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required') - if image is not None: - conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK') - if graphics is not None: - conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK') - - # See if we are using the MagickCore or MagickLib namespaces - conf.check_cxx(fragment=""" - #include \n - using namespace MagickCore;\n - int main () { return 0; }\n - """, - mandatory=False, - msg='Checking for MagickCore namespace', - okmsg='yes', - includes=conf.env['INCLUDES_MAGICK'], - define_name='DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE') - - conf.check_cxx(fragment=""" - #include \n - using namespace MagickLib;\n - int main () { return 0; }\n - """, - mandatory=False, - msg='Checking for MagickLib namespace', - okmsg='yes', - includes=conf.env['INCLUDES_MAGICK'], - define_name='DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE') - - # See where MagickCore.h is - conf.check_cxx(fragment=""" - #include \n - int main() { return 0; }\n - """, - mandatory=False, - msg='Checking for MagickCore.h location', - okmsg='magick', - errmsg='not magick', - includes=conf.env['INCLUDES_MAGICK'], - define_name='DCPOMATIC_MAGICKCORE_MAGICK') - - conf.check_cxx(fragment=""" - #include \n - int main() { return 0; }\n - """, - mandatory=False, - msg='Checking for MagickCore.h location', - okmsg='MagickCore', - errmsg='not MagickCore', - includes=conf.env['INCLUDES_MAGICK'], - define_name='DCPOMATIC_MAGICKCORE_MAGICKCORE') - - # See if we have advanced compare() methods in Magick - conf.check_cxx(fragment=""" - #include \n - int main() { Magick::Image a; Magick::Image b; a.compare(b, Magick::RootMeanSquaredErrorMetric); } - """, - mandatory=False, - msg='Checking for advanced compare() method in {Image/Graphics}Magick', - uselib='MAGICK', - define_name='DCPOMATIC_ADVANCED_MAGICK_COMPARE' - ) - # libzip conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) conf.check_cxx(fragment=""" @@ -349,10 +280,10 @@ def configure(conf): # libcxml if conf.options.static_cxml: - conf.check_cfg(package='libcxml', atleast_version='0.15.5', args='--cflags', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags', uselib_store='CXML', mandatory=True) conf.env.STLIB_CXML = ['cxml'] else: - conf.check_cfg(package='libcxml', atleast_version='0.15.5', args='--cflags --libs', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) # libssh if conf.options.static_ssh: @@ -374,21 +305,21 @@ def configure(conf): # libdcp if conf.options.static_dcp: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.1', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.6', 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-cth', 'kumu-cth', 'openjp2'] conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt'] else: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.1', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.6', 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.3.0', args='--cflags', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.4.1', 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.3.0', args='--cflags --libs', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.4.1', args='--cflags --libs', uselib_store='SUB', mandatory=True) conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB] # libxml++ @@ -410,6 +341,9 @@ def configure(conf): # nettle conf.check_cfg(package="nettle", args='--cflags --libs', uselib_store='NETTLE', mandatory=True) + # libpng + conf.check_cfg(package='libpng', args='--cflags --libs', uselib_store='PNG', mandatory=True) + # FFmpeg if conf.options.static_ffmpeg: names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc', 'swresample'] @@ -451,9 +385,7 @@ def configure(conf): int main () { av_ebur128_get_true_peaks (0); }\n """, msg='Checking for EBUR128-patched FFmpeg', - libpath=conf.env['LIBPATH_AVFORMAT'], - lib='avfilter avutil swresample', - includes=conf.env['INCLUDES_AVFORMAT'], + uselib='AVCODEC AVFILTER', define_name='DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG', mandatory=False) @@ -467,9 +399,7 @@ def configure(conf): """, msg='Checking for AVSubtitleRect::pict', cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror', - libpath=conf.env['LIBPATH_AVCODEC'], - lib='avcodec', - includes=conf.env['INCLUDES_AVCODEC'], + uselib='AVCODEC', define_name='DCPOMATIC_HAVE_AVSUBTITLERECT_PICT', mandatory=False) @@ -483,14 +413,12 @@ def configure(conf): """, msg='Checking for AVComponentDescriptor::depth_minus1', cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror', - libpath=conf.env['LIBPATH_AVUTIL'], - lib='avutil', - includes=conf.env['INCLUDES_AVUTIL'], + uselib='AVUTIL', define_name='DCPOMATIC_HAVE_AVCOMPONENTDESCRIPTOR_DEPTH_MINUS1', mandatory=False) # Hack: the previous two check_cxx calls end up copying their (necessary) cxxflags - # to these variables. We don't want to use these for the actual build, so clearn them out. + # to these variables. We don't want to use these for the actual build, so clean them out. conf.env['CXXFLAGS_AVCODEC'] = [] conf.env['CXXFLAGS_AVUTIL'] = [] @@ -695,8 +623,16 @@ def create_version_cc(version, cxx_flags): sys.exit(-1) def post(ctx): - if ctx.cmd == 'install': + if ctx.cmd == 'install' and ctx.env.TARGET_LINUX: ctx.exec_command('/sbin/ldconfig') + # I can't find anything which tells me where things have been installed to, + # so here's some nasty hacks to guess. + debian = os.path.join(ctx.out_dir, '../debian/dcpomatic/usr/bin/dcpomatic2_uuid') + prefix = os.path.join(ctx.env['INSTALL_PREFIX'], 'bin/dcpomatic2_uuid') + if os.path.exists(debian): + os.chmod(debian, 0o4755) + if os.path.exists(prefix): + os.chmod(prefix, 0o4755) def pot(bld): bld.recurse('src')