X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=fd9d47e7931169c754c32a2d27ef105279b95c87;hb=fc39cebbc4d20238a4b751724ea32105bdd61286;hp=819537b81a94192cca06c43290a608775bec636d;hpb=eb2af3b01afb28e8ead93c403978fe2257ed1a38;p=dcpomatic.git diff --git a/wscript b/wscript index 819537b81..fd9d47e79 100644 --- a/wscript +++ b/wscript @@ -1,19 +1,20 @@ # -# Copyright (C) 2012-2015 Carl Hetherington +# Copyright (C) 2012-2016 Carl Hetherington # -# This program is free software; you can redistribute it and/or modify +# This file is part of DCP-o-matic. +# +# DCP-o-matic 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. # -# This program is distributed in the hope that it will be useful, +# DCP-o-matic 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 this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# along with DCP-o-matic. If not, see . # import subprocess @@ -26,7 +27,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.5.14' +VERSION = '2.8.14devel' def options(opt): opt.load('compiler_cxx') @@ -39,7 +40,6 @@ def options(opt): 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++') @@ -79,9 +79,14 @@ def configure(conf): '-Wall', '-Wno-attributes', '-Wextra', - '-Wno-unused-result', + # Remove auto_ptr warnings from libxml++-2.6 + '-Wno-deprecated-declarations', '-D_FILE_OFFSET_BITS=64']) + gcc = conf.env['CC_VERSION'] + if int(gcc[0]) >= 4 and int(gcc[1]) > 1: + conf.env.append_value('CXXFLAGS', ['-Wno-unused-result']) + if conf.options.enable_debug: conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer']) else: @@ -99,7 +104,6 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DUNICODE') conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN') conf.env.append_value('CXXFLAGS', '-mfpmath=sse') - conf.env.append_value('CXXFLAGS', '-Wno-deprecated-declarations') wxrc = os.popen('wx-config --rescomp').read().split()[1:] conf.env.append_value('WINRCFLAGS', wxrc) if conf.options.enable_debug: @@ -112,7 +116,7 @@ def configure(conf): conf.check(lib='shlwapi', uselib_store='SHLWAPI', msg="Checking for library shlwapi") conf.check(lib='mswsock', uselib_store='MSWSOCK', msg="Checking for library mswsock") boost_lib_suffix = '-mt' - boost_thread = 'boost_thread_win32-mt' + boost_thread = 'boost_thread-mt' conf.check_cxx(fragment=""" #include \n int main() { std::locale::global (boost::locale::generator().generate ("")); }\n @@ -140,7 +144,7 @@ def configure(conf): # 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') # @@ -157,7 +161,7 @@ def configure(conf): conf.env.STLIB_CURL = ['curl'] conf.env.LIB_CURL = ['ssh2', 'idn'] else: - conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True) + conf.check_cfg(package='libcurl', args='--cflags --libs', atleast_version='7.19.1', uselib_store='CURL', mandatory=True) # libicu if conf.check_cfg(package='icu-i18n', args='--cflags --libs', uselib_store='ICU', mandatory=False) is None: @@ -176,9 +180,6 @@ def configure(conf): lib=['icuio', 'icui18n', 'icudata', 'icuuc'], uselib_store='ICU') - # libsndfile - conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True) - # libsamplerate conf.check_cfg(package='samplerate', args='--cflags --libs', uselib_store='SAMPLERATE', mandatory=True) @@ -191,7 +192,9 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK') 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) + 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: @@ -199,6 +202,29 @@ def configure(conf): 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') + # libzip conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) @@ -211,12 +237,25 @@ def configure(conf): # cairomm conf.check_cfg(package='cairomm-1.0', args='--cflags --libs', uselib_store='CAIROMM', mandatory=True) + # See if we have Cairo::ImageSurface::format_stride_for_width + conf.check_cxx(fragment=""" + #include + int main(void) { + Cairo::ImageSurface::format_stride_for_width (Cairo::FORMAT_ARGB, 1024);\n + return 0; }\n + """, + mandatory=False, + msg='Checking for format_stride_for_width', + okmsg='yes', + includes=conf.env['INCLUDES_CAIROMM'], + define_name='DCPOMATIC_HAVE_FORMAT_STRIDE_FOR_WIDTH') + # libcxml if conf.options.static_cxml: - conf.check_cfg(package='libcxml', atleast_version='0.12.0', args='--cflags', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags', uselib_store='CXML', mandatory=True) conf.env.STLIB_CXML = ['cxml'] else: - conf.check_cfg(package='libcxml', atleast_version='0.12.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) # libssh if conf.options.static_ssh: @@ -238,21 +277,21 @@ def configure(conf): # libdcp if conf.options.static_dcp: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.3', 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-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.2.8', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.3', 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.8', args='--cflags', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.1.12', 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.8', args='--cflags --libs', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.1.12', args='--cflags --libs', uselib_store='SUB', mandatory=True) conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB] # libxml++ @@ -264,24 +303,21 @@ def configure(conf): # libxmlsec if conf.options.static_xmlsec: - conf.env.STLIB_XMLSEC = ['xmlsec1-openssl', 'xmlsec1'] + if conf.check_cxx(lib='xmlsec1-openssl', mandatory=False): + conf.env.STLIB_XMLSEC = ['xmlsec1-openssl', 'xmlsec1'] + else: + conf.env.STLIB_XMLSEC = ['xmlsec1'] 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) + # nettle + conf.check_cfg(package="nettle", args='--cflags --libs', uselib_store='NETTLE', mandatory=True) # FFmpeg if conf.options.static_ffmpeg: names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc'] for name in names: - static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0] + static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0].decode('utf-8') libs = [] stlibs = [] include = [] @@ -309,6 +345,57 @@ def configure(conf): 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 \n + }\n + 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'], + define_name='DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG', + mandatory=False) + + # Check to see if we have our AVSubtitleRect has a pict member + # Older versions (e.g. that shipped with Ubuntu 16.04) do + conf.check_cxx(fragment=""" + extern "C" {\n + #include \n + }\n + int main () { AVSubtitleRect r; r.pict; }\n + """, + 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'], + define_name='DCPOMATIC_HAVE_AVSUBTITLERECT_PICT', + mandatory=False) + + # Check to see if we have our AVComponentDescriptor has a depth_minus1 member + # Older versions (e.g. that shipped with Ubuntu 16.04) do + conf.check_cxx(fragment=""" + extern "C" {\n + #include \n + }\n + int main () { AVComponentDescriptor d; d.depth_minus1; }\n + """, + 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'], + 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. + conf.env['CXXFLAGS_AVCODEC'] = [] + conf.env['CXXFLAGS_AVUTIL'] = [] + # Boost if conf.options.static_boost: conf.env.STLIB_BOOST_THREAD = ['boost_thread'] @@ -414,7 +501,6 @@ def configure(conf): 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)