From: cristy Date: Tue, 2 Feb 2010 04:14:40 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10012 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6a37036db6c40bd6888828fca9cee1555dc297e;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index ecc0c8785..067c1b394 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.5.9 -%define Patchlevel 1 +%define Patchlevel 2 Name: ImageMagick Version: %{VERSION} diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index e1f76f15c..66966a54a 100755 --- a/Magick++/bin/Magick++-config +++ b/Magick++/bin/Magick++-config @@ -52,7 +52,7 @@ while test $# -gt 0; do echo '-I/usr/local/include/ImageMagick' ;; --ldflags) - echo '-L/usr/local/lib ' + echo '-L/usr/local/lib -Wl,--as-needed' ;; --libs) echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl" diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 1a5cc571f..628980ef8 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -140,9 +140,9 @@ foreach $delegate (qw/bzlib djvu fftw fontconfig freetype jpeg jng jp2 lcms mpeg # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile my $INC_magick = '-I../ -I.. -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl -lm'; -my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -W -pthread"; -my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'} "; -my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} "; +my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -O3 -g -Wall -W -pthread"; +my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'} -Wl,--as-needed"; +my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} -Wl,--as-needed"; if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) { my($Ipaths, $Lpaths) = AutodetectWin32gcc(); diff --git a/config/configure.xml b/config/configure.xml index c91efee7d..e7e81e9e9 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,22 +8,22 @@ - + - + - + - + - + diff --git a/libtool b/libtool index 14696e7ea..230f1c36d 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.5.9-1 +# Generated automatically by config.status (ImageMagick) 6.5.9-2 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # @@ -138,7 +138,7 @@ old_postuninstall_cmds="" LTCC="gcc -std=gnu99" # LTCC compiler flags. -LTCFLAGS="-fopenmp -g -O2 -Wall -W -pthread" +LTCFLAGS="-fopenmp -O3 -g -Wall -W -pthread" # Take the output of nm and produce a listing of raw symbols and C names. global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" diff --git a/magick/Magick-config b/magick/Magick-config index 92915ca2b..2132b9ad0 100755 --- a/magick/Magick-config +++ b/magick/Magick-config @@ -49,7 +49,7 @@ while test $# -gt 0; do echo '-I/usr/local/include/ImageMagick' ;; --ldflags) - echo '-L/usr/local/lib ' + echo '-L/usr/local/lib -Wl,--as-needed' ;; --libs) echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl" diff --git a/magick/version.h b/magick/version.h index 2b14bdaed..86f75f08a 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ extern "C" { #define MagickLibVersion 0x659 #define MagickLibVersionText "6.5.9" #define MagickLibVersionNumber 3,0,0 -#define MagickLibAddendum "-1" +#define MagickLibAddendum "-2" #define MagickLibInterface 3 #define MagickReleaseDate "2010-02-01" #define MagickChangeDate "20100127" diff --git a/version.sh b/version.sh index 18fc5106f..2b2a2c836 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.5.9' PACKAGE_LIB_VERSION="0x659" -PACKAGE_RELEASE="1" +PACKAGE_RELEASE="2" PACKAGE_LIB_VERSION_NUMBER="6,5,9,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/wand/Wand-config b/wand/Wand-config index 0420f5816..245cafd49 100755 --- a/wand/Wand-config +++ b/wand/Wand-config @@ -49,7 +49,7 @@ while test $# -gt 0; do echo '-I/usr/local/include/ImageMagick' ;; --ldflags) - echo '-L/usr/local/lib ' + echo '-L/usr/local/lib -Wl,--as-needed' ;; --libs) echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl" diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index b90edf5fc..bd922d05a 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -124,7 +124,7 @@
diff --git a/www/api/animate.html b/www/api/animate.html index a9a1ddfd0..aa1fa3520 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -186,7 +186,7 @@ _8c.html" target="source" name="AnimateImages">AnimateImages Discourse Server • - Studio + Studio  
diff --git a/www/api/annotate.html b/www/api/annotate.html index 9d5dd97fc..441fc8f94 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -124,7 +124,7 @@
diff --git a/www/api/attribute.html b/www/api/attribute.html index 762b2bb54..948e49991 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -124,7 +124,7 @@