From 3b640ed43b1e5260ca276ee18d124de1d24ff97b Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 29 Jul 2013 00:27:59 +0000 Subject: [PATCH] --- MagickCore/version.h | 4 ++-- PerlMagick/Makefile.PL | 4 ++-- PerlMagick/quantum/Makefile.PL | 4 ++-- configure | 5 ++++- configure.ac | 3 +++ 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/MagickCore/version.h b/MagickCore/version.h index 852b53fa9..fec693930 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC" -#define MagickSVNRevision "12786:12793" +#define MagickSVNRevision "12786:12797M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 @@ -43,7 +43,7 @@ extern "C" { #define MagickChangeDate "20120427" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" -#define MagickDelegates "bzlib djvu fftw fontconfig freetype jng jp2 jpeg lcms lzma openexr pango png ps tiff x xml zlib" +#define MagickDelegates "bzlib djvu fftw fontconfig freetype jng jp2 jpeg lcms lzma openexr pango png ps tiff webp x xml zlib" #define MagickHomeURL "file:///usr/share/doc/ImageMagick-7/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickQuantumDepth "Q8" diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index ee8bef1fe..4b296e600 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -163,7 +163,7 @@ foreach my $delegate (@tested_delegates) { # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile my $INC_magick = '-I../ -I.. -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-7.Q16HDRI -lperl -lm'; -my $CCFLAGS_magick = "$Config{'ccflags'} -pthread -I/usr/include/OpenEXR -I/usr/include/libdrm -I/usr/include/freetype2 -fopenmp -g -O2 -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"; +my $CCFLAGS_magick = "$Config{'ccflags'} -pthread -I/usr/include/OpenEXR -I/usr/include/libdrm -I/usr/include/freetype2 -pthread -I/usr/include/OpenEXR -I/usr/include/libdrm -I/usr/include/freetype2 -fopenmp -g -O2 -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"; my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'ldflags'} "; my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'lddlflags'} "; @@ -236,7 +236,7 @@ WriteMakefile # 'OPTIMIZE' => '', # Use same compiler as ImageMagick - 'PERLMAINCC' => ' -fopenmp', + 'PERLMAINCC' => ' ', 'AR' => 'ar', 'LD' => '', diff --git a/PerlMagick/quantum/Makefile.PL b/PerlMagick/quantum/Makefile.PL index 570c90b1e..5f944256d 100644 --- a/PerlMagick/quantum/Makefile.PL +++ b/PerlMagick/quantum/Makefile.PL @@ -163,7 +163,7 @@ foreach my $delegate (@tested_delegates) { # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile my $INC_magick = '-I../ -I../.. -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; my $LIBS_magick = '-L../../MagickCore/.libs -lMagickCore-7.Q16HDRI -lperl -lm'; -my $CCFLAGS_magick = "$Config{'ccflags'} -pthread -I/usr/include/OpenEXR -I/usr/include/libdrm -I/usr/include/freetype2 -fopenmp -g -O2 -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"; +my $CCFLAGS_magick = "$Config{'ccflags'} -pthread -I/usr/include/OpenEXR -I/usr/include/libdrm -I/usr/include/freetype2 -pthread -I/usr/include/OpenEXR -I/usr/include/libdrm -I/usr/include/freetype2 -fopenmp -g -O2 -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"; my $LDFLAGS_magick = "-L../../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'ldflags'} "; my $LDDLFLAGS_magick = "-L../../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'lddlflags'} "; @@ -233,7 +233,7 @@ WriteMakefile # 'OPTIMIZE' => '', # Use same compiler as ImageMagick - 'PERLMAINCC' => ' -fopenmp', + 'PERLMAINCC' => ' ', 'PM' => { 'Q16HDRI.pm' => '$(INST_LIBDIR)/Q16HDRI.pm' }, 'XS' => { 'Q16HDRI.xs' => 'Q16HDRI.xs' }, 'AR' => 'ar', diff --git a/configure b/configure index e8e855f02..1f1fe062e 100755 --- a/configure +++ b/configure @@ -3686,7 +3686,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=12786:12793 +MAGICK_SVN_REVISION=12786:12797M # Substitute library versioning @@ -35441,6 +35441,9 @@ fi if test "$have_ttf" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES ttf" fi +if test "$have_webp" = 'yes' ; then + MAGICK_DELEGATES="$MAGICK_DELEGATES webp" +fi if test "$have_wmf" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES wmf" fi diff --git a/configure.ac b/configure.ac index 97340d24d..fdf1abc7e 100755 --- a/configure.ac +++ b/configure.ac @@ -3860,6 +3860,9 @@ fi if test "$have_ttf" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES ttf" fi +if test "$have_webp" = 'yes' ; then + MAGICK_DELEGATES="$MAGICK_DELEGATES webp" +fi if test "$have_wmf" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES wmf" fi -- 2.50.0