X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=wscript;h=51f10b852a6eb294b0d2ed40561f73a6b023f0a7;hb=27d63cb95a5cbe2c58f45717e9482f3395a896fb;hp=95ead6e5097aeeb20e33d3c6caf3a19cf4d390e7;hpb=d60b9d006fee94fab80ee86fe1149de7f2e76750;p=dcpomatic.git diff --git a/wscript b/wscript index 95ead6e50..51f10b852 100644 --- a/wscript +++ b/wscript @@ -1,19 +1,20 @@ # # 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.8.3devel' +VERSION = '2.11.4devel' def options(opt): opt.load('compiler_cxx') @@ -78,11 +79,15 @@ 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']) + have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1 + if conf.options.enable_debug: conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG', '-fno-omit-frame-pointer']) else: @@ -111,6 +116,10 @@ def configure(conf): conf.check(lib='iberty', uselib_store='IBERTY', msg="Checking for library iberty") conf.check(lib='shlwapi', uselib_store='SHLWAPI', msg="Checking for library shlwapi") conf.check(lib='mswsock', uselib_store='MSWSOCK', msg="Checking for library mswsock") + conf.check(lib='ole32', uselib_store='OLE32', msg="Checking for library ole32") + conf.check(lib='dsound', uselib_store='DSOUND', msg="Checking for library dsound") + conf.check(lib='winmm', uselib_store='WINMM', msg="Checking for library winmm") + conf.check(lib='ksuser', uselib_store='KSUSER', msg="Checking for library ksuser") boost_lib_suffix = '-mt' boost_thread = 'boost_thread-mt' conf.check_cxx(fragment=""" @@ -157,7 +166,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: @@ -188,7 +197,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: @@ -196,6 +207,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) @@ -208,6 +242,43 @@ def configure(conf): # cairomm conf.check_cfg(package='cairomm-1.0', args='--cflags --libs', uselib_store='CAIROMM', mandatory=True) + test_cxxflags = '' + if have_c11: + test_cxxflags = '-std=c++11' + + # See if we have Cairo::ImageSurface::format_stride_for_width; Centos 5 does not + conf.check_cxx(fragment=""" + #include + int main(void) { + Cairo::ImageSurface::format_stride_for_width (Cairo::FORMAT_ARGB32, 1024);\n + return 0; }\n + """, + mandatory=False, + cxxflags=test_cxxflags, + msg='Checking for format_stride_for_width', + okmsg='yes', + includes=conf.env['INCLUDES_CAIROMM'], + uselib='CAIROMM', + define_name='DCPOMATIC_HAVE_FORMAT_STRIDE_FOR_WIDTH') + + # See if we have Pango::Layout::show_in_cairo_context; Centos 5 does not + conf.check_cxx(fragment=""" + #include + int main(void) { + Cairo::RefPtr context; + Glib::RefPtr layout; + layout->show_in_cairo_context (context); + return 0; }\n + """, + mandatory=False, + msg='Checking for show_in_cairo_context', + cxxflags=test_cxxflags, + okmsg='yes', + includes=conf.env['INCLUDES_PANGOMM'], + uselib='PANGOMM', + define_name='DCPOMATIC_HAVE_SHOW_IN_CAIRO_CONTEXT') + + # libcxml if conf.options.static_cxml: conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags', uselib_store='CXML', mandatory=True) @@ -235,21 +306,21 @@ def configure(conf): # libdcp if conf.options.static_dcp: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.3', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.1', 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.3.3', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.1', 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.12', args='--cflags', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.2.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.1.12', args='--cflags --libs', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.2.1', args='--cflags --libs', uselib_store='SUB', mandatory=True) conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB] # libxml++ @@ -261,13 +332,19 @@ 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'] + # 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'] + names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc', 'swresample'] for name in names: static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0].decode('utf-8') libs = [] @@ -296,6 +373,7 @@ def configure(conf): conf.check_cfg(package='libavutil', args='--cflags --libs', uselib_store='AVUTIL', mandatory=True) 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) + conf.check_cfg(package='libswresample', args='--cflags --libs', uselib_store='SWRESAMPLE', mandatory=True) # Check to see if we have our version of FFmpeg that allows us to get at EBUR128 results conf.check_cxx(fragment=""" @@ -492,6 +570,8 @@ def git_revision(): cmd = "LANG= git log --abbrev HEAD^..HEAD ." output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() + if len(output) == 0: + return None o = output[0].decode('utf-8') return o.replace("commit ", "")[0:10]