#
# Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
#
-# 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 <http://www.gnu.org/licenses/>.
#
import subprocess
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-VERSION = '2.8.4devel'
+VERSION = '2.9.1devel'
def options(opt):
opt.load('compiler_cxx')
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:
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 <Magick++/Include.h>\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 <Magick++/Include.h>\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)
# 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 <cairomm/cairomm.h>
+ 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.15.1', args='--cflags', uselib_store='CXML', mandatory=True)
# 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.3.4', 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.3.4', 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.1.13', 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.1.13', args='--cflags --libs', uselib_store='SUB', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++
# 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']
projects / dcpomatic.git / blobdiff