Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg

to decode images.  Hence remove {Image,Graphics}Magick.

1 files changed, 0 insertions, 73 deletions

diff --git a/wscript b/wscript
index 92a79bb9b..f7bfea42f 100644
--- a/wscript
+++ b/wscript
@@ -216,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="""