X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=49724452a421ad6c216bbbca5f397098ad7bcd15;hb=014612cd5a3b01e16d15d49b45f582fed9b19d9b;hp=27f06f8a1ef33ffeb8b3992c0c42132824e4c0ce;hpb=a09fa32118828d2af282566e94aacd7f153b8643;p=dcpomatic.git

diff --git a/wscript b/wscript
index 27f06f8a1..49724452a 100644
--- a/wscript
+++ b/wscript
@@ -42,8 +42,6 @@ if this_version == '':
 else:
     VERSION = this_version[1:].strip()
 
-print('Version: %s' % VERSION)
-
 def options(opt):
     opt.load('compiler_cxx')
     opt.load('winres')
@@ -66,6 +64,7 @@ def options(opt):
     opt.add_option('--static-curl',       action='store_true', default=False, help='link statically to libcurl')
     opt.add_option('--workaround-gssapi', action='store_true', default=False, help='link to gssapi_krb5')
     opt.add_option('--force-cpp11',       action='store_true', default=False, help='force use of C++11')
+    opt.add_option('--variant',           help='build variant', choices=['swaroop'])
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -115,6 +114,10 @@ def configure(conf):
     else:
         conf.env.append_value('CXXFLAGS', '-O2')
 
+    if conf.options.variant is not None:
+        conf.env.VARIANT = conf.options.variant
+        conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_VARIANT_%s' % conf.options.variant.upper())
+
     #
     # Windows/Linux/OS X specific
     #
@@ -213,79 +216,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 <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')
-
-    # See where MagickCore.h is
-    conf.check_cxx(fragment="""
-                            #include <magick/MagickCore.h>\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 <MagickCore/MagickCore.h>\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 <Magick++.h>\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="""
@@ -407,6 +337,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']
@@ -449,7 +382,7 @@ def configure(conf):
                             """,
                    msg='Checking for EBUR128-patched FFmpeg',
                    libpath=conf.env['LIBPATH_AVFORMAT'],
-                   lib='avfilter avutil swresample',
+                   lib='avfilter avutil swresample avcodec avformat swscale postproc',
                    includes=conf.env['INCLUDES_AVFORMAT'],
                    define_name='DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG',
                    mandatory=False)
@@ -487,7 +420,7 @@ def configure(conf):
                    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'] = []
 
@@ -566,6 +499,7 @@ def configure(conf):
     # Other stuff
 
     conf.find_program('msgfmt', var='MSGFMT')
+    conf.check(header_name='valgrind/memcheck.h', mandatory=False)
 
     datadir = conf.env.DATADIR
     if not datadir: