diff --git a/Makefile.in b/Makefile.in
index 335524b..997457f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2552,7 +2552,6 @@
CCDEPMODE = @CCDEPMODE@
CCMALLOCDelegate = @CCMALLOCDelegate@
CFLAGS = @CFLAGS@
-CGMDecodeDelegate = @CGMDecodeDelegate@
CL_CFLAGS = @CL_CFLAGS@
CL_LIBS = @CL_LIBS@
CODER_DIRNAME = @CODER_DIRNAME@
@@ -2595,7 +2594,6 @@
EditorDelegate = @EditorDelegate@
FFTW_LIBS = @FFTW_LIBS@
FGREP = @FGREP@
-FIGDecodeDelegate = @FIGDecodeDelegate@
FILTER_DIRNAME = @FILTER_DIRNAME@
FILTER_PATH = @FILTER_PATH@
FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
diff --git a/configure b/configure
index ac8c675..83862bd 100755
--- a/configure
+++ b/configure
@@ -723,14 +723,12 @@
MogrifyDelegate
DisplayDelegate
ConvertDelegate
-FIGDecodeDelegate
EditorDelegate
EchoDelegate
DVIDecodeDelegate
GVCDecodeDelegate
DNGDecodeDelegate
CatDelegate
-CGMDecodeDelegate
BrowseDelegate
BZIPDelegate
BlenderDecodeDelegate
@@ -3693,7 +3691,7 @@
MAGICK_VERSION=7.0.0-0
-MAGICK_SVN_REVISION=13208:13229
+MAGICK_SVN_REVISION=13384:13388M
# Substitute library versioning
@@ -32590,14 +32588,12 @@
BlenderDecodeDelegateDefault='blender'
BZIPDelegateDefault='bzip2'
BrowseDelegateDefault='xdg-open'
-CGMDecodeDelegateDefault='ralcgm'
CatDelegateDefault='cat'
DNGDecodeDelegateDefault='ufraw-batch'
GVCDecodeDelegateDefault='dot'
DVIDecodeDelegateDefault='dvips'
EchoDelegateDefault='echo'
EditorDelegateDefault='xterm'
-FIGDecodeDelegateDefault='fig2dev'
ConvertDelegateDefault=`echo convert | sed ${configure_transform_name}`
DisplayDelegateDefault=`echo display | sed ${configure_transform_name}`
MogrifyDelegateDefault=`echo mogrify | sed ${configure_transform_name}`
@@ -32612,8 +32608,8 @@
LPRDelegateDefault='lpr'
LaunchDelegateDefault='gimp'
MANDelegateDefault='groff'
-MPEGDecodeDelegateDefault='ffmpeg'
-MPEGEncodeDelegateDefault='ffmpeg'
+MPEGDecodeDelegateDefault='avconv'
+MPEGEncodeDelegateDefault='avconv'
MrSIDDecodeDelegateDefault='mrsidgeodecode'
MVDelegateDefault='mv'
PCLDelegateDefault='pcl6'
@@ -32810,47 +32806,6 @@
done
test -n "$BrowseDelegate" || BrowseDelegate=""$BrowseDelegateDefault""
-# Extract the first word of ""$CGMDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$CGMDecodeDelegateDefault"; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CGMDecodeDelegate+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $CGMDecodeDelegate in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_CGMDecodeDelegate="$CGMDecodeDelegate" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_CGMDecodeDelegate="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_CGMDecodeDelegate" && ac_cv_path_CGMDecodeDelegate=""$CGMDecodeDelegateDefault""
- ;;
-esac
-fi
-CGMDecodeDelegate=$ac_cv_path_CGMDecodeDelegate
-if test -n "$CGMDecodeDelegate"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CGMDecodeDelegate" >&5
-$as_echo "$CGMDecodeDelegate" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
# Extract the first word of ""$CatDelegateDefault"", so it can be a program name with args.
set dummy "$CatDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -33097,47 +33052,6 @@
fi
-# Extract the first word of ""$FIGDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$FIGDecodeDelegateDefault"; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_FIGDecodeDelegate+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $FIGDecodeDelegate in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_FIGDecodeDelegate="$FIGDecodeDelegate" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_FIGDecodeDelegate="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_FIGDecodeDelegate" && ac_cv_path_FIGDecodeDelegate=""$FIGDecodeDelegateDefault""
- ;;
-esac
-fi
-FIGDecodeDelegate=$ac_cv_path_FIGDecodeDelegate
-if test -n "$FIGDecodeDelegate"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIGDecodeDelegate" >&5
-$as_echo "$FIGDecodeDelegate" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
# Extract the first word of ""$ConvertDelegateDefault"", so it can be a program name with args.
set dummy "$ConvertDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -33753,6 +33667,50 @@
fi
+if test "$MPEGDecodeDelegate" == "$MPEGDecodeDelegateDefault" ; then
+ MPEGDecodeDelegateDefault='ffmpeg'
+ # Extract the first word of ""$MPEGDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$MPEGDecodeDelegateDefault"; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MPEGDecodeDelegate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MPEGDecodeDelegate in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MPEGDecodeDelegate="$MPEGDecodeDelegate" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_MPEGDecodeDelegate="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_MPEGDecodeDelegate" && ac_cv_path_MPEGDecodeDelegate=""$MPEGDecodeDelegateDefault""
+ ;;
+esac
+fi
+MPEGDecodeDelegate=$ac_cv_path_MPEGDecodeDelegate
+if test -n "$MPEGDecodeDelegate"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPEGDecodeDelegate" >&5
+$as_echo "$MPEGDecodeDelegate" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi;
# Extract the first word of ""$MPEGEncodeDelegateDefault"", so it can be a program name with args.
set dummy "$MPEGEncodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -33794,6 +33752,50 @@
fi
+if test "$MPEGEncodeDelegate" == "$MPEGEncodeDelegateDefault" ; then
+ MPEGEncodeDelegateDefault='ffmpeg'
+ # Extract the first word of ""$MPEGEncodeDelegateDefault"", so it can be a program name with args.
+set dummy "$MPEGEncodeDelegateDefault"; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MPEGEncodeDelegate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MPEGEncodeDelegate in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MPEGEncodeDelegate="$MPEGEncodeDelegate" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_MPEGEncodeDelegate="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_MPEGEncodeDelegate" && ac_cv_path_MPEGEncodeDelegate=""$MPEGEncodeDelegateDefault""
+ ;;
+esac
+fi
+MPEGEncodeDelegate=$ac_cv_path_MPEGEncodeDelegate
+if test -n "$MPEGEncodeDelegate"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPEGEncodeDelegate" >&5
+$as_echo "$MPEGEncodeDelegate" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi;
# Extract the first word of ""$MrSIDDecodeDelegateDefault"", so it can be a program name with args.
set dummy "$MrSIDDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -34593,15 +34595,13 @@
MogrifyDelegate="${BIN_DIR}/${MogrifyDelegateDefault}"
# Set delegate booleans
-have_ffmpeg='no'; if test "$MPEGDecodeDelegate" != "$MPEGDecodeDelegateDefault" ; then have_ffmpeg='yes'; fi
-have_fig2dev='no' ; if test "$FIGDecodeDelegate" != "$FIGDecodeDelegateDefault" ; then have_fig2dev='yes'; fi
+have_avconv='no'; if test "$MPEGDecodeDelegate" != "$MPEGDecodeDelegateDefault" ; then have_avconv='yes'; fi
have_gs='no' ; if test "$PSDelegate" != "$PSDelegateDefault"; then have_gs='yes'; fi
have_hp2xx='no' ; if test "$HPGLDecodeDelegate" != "$HPGLDecodeDelegateDefault" ; then have_hp2xx='yes'; fi
have_ilbmtoppm='no' ; if test "$ILBMDecodeDelegate" != "$ILBMDecodeDelegateDefault" ; then have_ilbmtoppm='yes'; fi
have_mrsid='no'; if test "$MrSIDDecodeDelegate" != "$MrSIDDecodeDelegateDefault" ; then have_mrsid='yes'; fi
have_pcl='no' ; if test "$PCLDelegate" != "$PCLDelegateDefault"; then have_pcl='yes'; fi
have_ppmtoilbm='no' ; if test "$ILBMEncodeDelegate" != "$ILBMEncodeDelegateDefault" ; then have_ppmtoilbm='yes'; fi
-have_ralcgm='no' ; if test "$CGMDecodeDelegate" != "$CGMDecodeDelegateDefault" ; then have_ralcgm='yes'; fi
have_xps='no' ; if test "$XPSDelegate" != "$XPSDelegateDefault"; then have_xps='yes'; fi
#
@@ -34713,7 +34713,6 @@
BlenderDecodeDelegate="$BlenderDecodeDelegateDefault"
BZIPDelegate="$BZIPDelegateDefault"
BrowseDelegate="$BrowseDelegateDefault"
- CGMDecodeDelegate="$CGMDecodeDelegateDefault"
CatDelegate="$CatDelegateDefault"
ConvertDelegate="$ConvertDelegateDefault"
DisplayDelegate="$DisplayDelegateDefault"
@@ -34721,7 +34720,6 @@
DVIDecodeDelegate="$DVIDecodeDelegateDefault"
EchoDelegate="$EchoDelegateDefault"
EditorDelegate="$EditorDelegateDefault"
- FIGDecodeDelegate="$FIGDecodeDelegateDefault"
GnuplotDecodeDelegate="$GnuplotDecodeDelegateDefault"
GVCDecodeDelegate="$GVCDecodeDelegateDefault"
HPGLDecodeDelegate="$HPGLDecodeDelegateDefault"
@@ -34801,8 +34799,6 @@
-
-
#
# RPM support.
#
@@ -35507,7 +35503,7 @@
if test "$have_djvu" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES djvu"
fi
-if test "$have_ffmpeg" = 'yes' ; then
+if test "$have_avconv" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES mpeg"
fi
if test "$have_mupdf" = 'yes' ; then
@@ -35516,9 +35512,6 @@
if test "$have_fftw" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES fftw"
fi
-if test "$have_fig2dev" = 'yes' && test "$have_ps" = 'yes' ; then
- MAGICK_DELEGATES="$MAGICK_DELEGATES xfig"
-fi
if test "$have_fpx" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES fpx"
fi
@@ -35570,9 +35563,6 @@
if test "$have_ps" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES ps"
fi
-if test "$have_ralcgm" = 'yes' ; then
- MAGICK_DELEGATES="$MAGICK_DELEGATES cgm"
-fi
if test "$have_ra_ppm" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES rad"
fi
diff --git a/configure.ac b/configure.ac
index 5d52391..76410fb 100755
--- a/configure.ac
+++ b/configure.ac
@@ -3236,8 +3236,8 @@
LPRDelegateDefault='lpr'
LaunchDelegateDefault='gimp'
MANDelegateDefault='groff'
-MPEGDecodeDelegateDefault='ffmpeg'
-MPEGEncodeDelegateDefault='ffmpeg'
+MPEGDecodeDelegateDefault='avconv'
+MPEGEncodeDelegateDefault='avconv'
MrSIDDecodeDelegateDefault='mrsidgeodecode'
MVDelegateDefault='mv'
PCLDelegateDefault='pcl6'
@@ -3290,7 +3290,15 @@
AC_PATH_PROG(LaunchDelegate, "$LaunchDelegateDefault", "$LaunchDelegateDefault")
AC_PATH_PROG(MANDelegate, "$MANDelegateDefault", "$MANDelegateDefault")
AC_PATH_PROG(MPEGDecodeDelegate, "$MPEGDecodeDelegateDefault", "$MPEGDecodeDelegateDefault")
+if test "$MPEGDecodeDelegate" == "$MPEGDecodeDelegateDefault" ; then
+ MPEGDecodeDelegateDefault='ffmpeg'
+ AC_PATH_PROG(MPEGDecodeDelegate, "$MPEGDecodeDelegateDefault", "$MPEGDecodeDelegateDefault")
+fi;
AC_PATH_PROG(MPEGEncodeDelegate, "$MPEGEncodeDelegateDefault", "$MPEGEncodeDelegateDefault")
+if test "$MPEGEncodeDelegate" == "$MPEGEncodeDelegateDefault" ; then
+ MPEGEncodeDelegateDefault='ffmpeg'
+ AC_PATH_PROG(MPEGEncodeDelegate, "$MPEGEncodeDelegateDefault", "$MPEGEncodeDelegateDefault")
+fi;
AC_PATH_PROG(MrSIDDecodeDelegate, "$MrSIDDecodeDelegateDefault", "$MrSIDDecodeDelegateDefault")
AC_PATH_PROG(MVDelegate, "$MVDelegateDefault", "$MVDelegateDefault")
AC_PATH_PROG(PCLDelegate, "$PCLDelegateDefault", "$PCLDelegateDefault")
@@ -3325,7 +3333,7 @@
MogrifyDelegate="${BIN_DIR}/${MogrifyDelegateDefault}"
# Set delegate booleans
-have_ffmpeg='no'; if test "$MPEGDecodeDelegate" != "$MPEGDecodeDelegateDefault" ; then have_ffmpeg='yes'; fi
+have_avconv='no'; if test "$MPEGDecodeDelegate" != "$MPEGDecodeDelegateDefault" ; then have_avconv='yes'; fi
have_gs='no' ; if test "$PSDelegate" != "$PSDelegateDefault"; then have_gs='yes'; fi
have_hp2xx='no' ; if test "$HPGLDecodeDelegate" != "$HPGLDecodeDelegateDefault" ; then have_hp2xx='yes'; fi
have_ilbmtoppm='no' ; if test "$ILBMDecodeDelegate" != "$ILBMDecodeDelegateDefault" ; then have_ilbmtoppm='yes'; fi
@@ -3813,7 +3821,7 @@
if test "$have_djvu" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES djvu"
fi
-if test "$have_ffmpeg" = 'yes' ; then
+if test "$have_avconv" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES mpeg"
fi
if test "$have_mupdf" = 'yes' ; then