From c37574e2ce73f14d9dc56e45071d5d23f8d08cec Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 16 Feb 2013 01:04:55 +0000 Subject: [PATCH] --- MagickCore/version.h | 4 +-- PerlMagick/Magick.pm | 81 ++---------------------------------------- PerlMagick/Makefile.PL | 18 ++++++---- configure | 21 +++++------ configure.ac | 22 ++++++------ 5 files changed, 40 insertions(+), 106 deletions(-) diff --git a/MagickCore/version.h b/MagickCore/version.h index d268f1653..2770fc1ae 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC" -#define MagickSVNRevision "11008:11035M" +#define MagickSVNRevision "11008:11053M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 1 #define MagickLibMinInterface 1 -#define MagickReleaseDate "2013-02-13" +#define MagickReleaseDate "2013-02-15" #define MagickChangeDate "20121005" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm index 98b2f5e2e..72c3c1079 100644 --- a/PerlMagick/Magick.pm +++ b/PerlMagick/Magick.pm @@ -19,90 +19,15 @@ package Image::Magick; use strict; use Carp; -use vars qw($VERSION @ISA @EXPORT $AUTOLOAD); - -require 5.002; -require Exporter; -require DynaLoader; -require AutoLoader; - -@ISA = qw(Exporter DynaLoader); -# Items to export into callers namespace by default. Note: do not export -# names by default without a very good reason. Use EXPORT_OK instead. -# Do not simply export all your public functions/methods/constants. -@EXPORT = - qw( - Success Transparent Opaque QuantumDepth QuantumRange MaxRGB - WarningException ResourceLimitWarning TypeWarning OptionWarning - DelegateWarning MissingDelegateWarning CorruptImageWarning - FileOpenWarning BlobWarning StreamWarning CacheWarning CoderWarning - ModuleWarning DrawWarning ImageWarning XServerWarning RegistryWarning - ConfigureWarning ErrorException ResourceLimitError TypeError - OptionError DelegateError MissingDelegateError CorruptImageError - FileOpenError BlobError StreamError CacheError CoderError - ModuleError DrawError ImageError XServerError RegistryError - ConfigureError FatalErrorException - ); - -$VERSION = '7.00'; - -sub AUTOLOAD { - # This AUTOLOAD is used to 'autoload' constants from the constant() - # XS function. If a constant is not found then control is passed - # to the AUTOLOAD in AutoLoader. - - my $constname; - ($constname = $AUTOLOAD) =~ s/.*:://; - die "&${AUTOLOAD} not defined. The required ImageMagick libraries are not installed or not installed properly.\n" if $constname eq 'constant'; - my $val = constant($constname, @_ ? $_[0] : 0); - if ($! != 0) { - if ($! =~ /Invalid/) { - $AutoLoader::AUTOLOAD = $AUTOLOAD; - goto &AutoLoader::AUTOLOAD; - } - else { - my($pack,$file,$line) = caller; - die "Your vendor has not defined PerlMagick macro $pack\:\:$constname, used at $file line $line.\n"; - } - } - eval "sub $AUTOLOAD { $val }"; - goto &$AUTOLOAD; -} - -bootstrap Image::Magick $VERSION; - -# Preloaded methods go here. - -sub new -{ - my $this = shift; - my $class = ref($this) || $this || "Image::Magick"; - my $self = [ ]; - bless $self, $class; - $self->set(@_) if @_; - return $self; -} - -sub New -{ - my $this = shift; - my $class = ref($this) || $this || "Image::Magick"; - my $self = [ ]; - bless $self, $class; - $self->set(@_) if @_; - return $self; -} - -# Autoload methods go after =cut, and are processed by the autosplit program. - -END { UNLOAD () }; + +use parent qw/Image::Magick::Q16HDRI/; 1; __END__ =head1 NAME -Image::Magick - objected-oriented Perl interface to ImageMagick. Use it to read, manipulate, or write an image or image sequence from within a Perl script. +Image::Magick - objected-oriented Perl interface to ImageMagick for default quantum (Q16HDRI). Use it to read, manipulate, or write an image or image sequence from within a Perl script. =head1 SYNOPSIS diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 7e11c47cb..48b3b54e5 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -161,11 +161,11 @@ foreach my $delegate (@tested_delegates) { } # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile -my $INC_magick = '-I../ -I.. -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; -my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-Q16HDRI -lperl -lm'; +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'} -I/usr/include/freetype2 -fopenmp -g -O2 -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"; -my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-Q16HDRI $Config{'ldflags'} "; -my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-Q16HDRI $Config{'lddlflags'} "; +my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'ldflags'} "; +my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'lddlflags'} "; if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) { my($Ipaths, $Lpaths) = AutodetectWin32gcc(); @@ -174,7 +174,7 @@ if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) { # Setup for strawberry perl. # $INC_magick = "$Ipaths"; - $LIBS_magick = "-lMagickCore-Q16HDRI"; + $LIBS_magick = "-lMagickCore-7.Q16HDRI"; $CCFLAGS_magick = "$Config{'ccflags'}"; $LDFLAGS_magick = "$Config{'ldflags'} $Lpaths "; $LDDLFLAGS_magick = "$Config{'lddlflags'} $Lpaths "; @@ -196,6 +196,9 @@ WriteMakefile # Module version 'VERSION' => '7.00', + # Prerequisite version + 'PREREQ_PM' => {'parent' => '0'}, + # Preprocessor defines 'DEFINE' => ' -D_LARGE_FILES=1 -DHAVE_CONFIG_H', # e.g., '-DHAVE_SOMETHING' @@ -206,7 +209,7 @@ WriteMakefile #'CC' => 'gcc -std=gnu99 -std=gnu99', # C pre-processor flags (e.g. -I & -D options) - # 'CPPFLAGS' => "$Config{'cppflags'} -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2", + # 'CPPFLAGS' => "$Config{'cppflags'} -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", # C compiler flags (e.g. -O -g) 'CCFLAGS' => $CCFLAGS_magick, @@ -244,6 +247,9 @@ WriteMakefile test => { TESTS => $delegate_tests}, ($Config{'archname'} =~ /-object$/i ? ('CAPI' => 'TRUE') : ()), + + # sane version + depend => { '$(FIRST_MAKEFILE)' => '$(VERSION_FROM)' } ); diff --git a/configure b/configure index 740e06b5c..4f0d64218 100755 --- a/configure +++ b/configure @@ -3668,7 +3668,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=11008:11035M +MAGICK_SVN_REVISION=11008:11053M # Substitute library versioning @@ -8931,8 +8931,9 @@ if test "${im_cv_ld_lazyload}" != 'none' ; then fi case "$host" in -*darwin* | *-macos10*) - # Check whether --enable-osx-universal-binary was given. + *darwin* | *-macos10*) + CFLAGS="${CFLAGS} -DFORTIFY_SOURCE=0" + # Check whether --enable-osx-universal-binary was given. if test "${enable_osx_universal_binary+set}" = set; then : enableval=$enable_osx_universal_binary; build_osxuniversal="${enableval}" else @@ -8940,16 +8941,16 @@ else fi - if test "${build_osxuniversal}" != no ; then - if test "$enable_dependency_tracking" != no ; then - as_fn_error $? "--enable-osx-universal-binary requires --disable-dependency-tracking. + if test "${build_osxuniversal}" != no ; then + if test "$enable_dependency_tracking" != no ; then + as_fn_error $? "--enable-osx-universal-binary requires --disable-dependency-tracking. Please re-run configure with these options: --disable-dependency-tracking --enable-osx-universal-binary " "$LINENO" 5 - fi - CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" - CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" - LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" + fi + CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" + CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" + LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" fi ;; esac diff --git a/configure.ac b/configure.ac index 5c530bda7..398dca909 100755 --- a/configure.ac +++ b/configure.ac @@ -383,23 +383,25 @@ fi dnl Platform-specific stuff case "$host" in -*darwin* | *-macos10*) - dnl OS X universal binary support, requires --disable-dependency-tracking - AC_ARG_ENABLE([osx-universal-binary], + *darwin* | *-macos10*) + dnl Disable FORTIFY_SOURCE to fix a bug in LVVM / OpenMP support + CFLAGS="${CFLAGS} -DFORTIFY_SOURCE=0" + dnl OS X universal binary support, requires --disable-dependency-tracking + AC_ARG_ENABLE([osx-universal-binary], AC_HELP_STRING([--enable-osx-universal-binary], [build universal binary on OS X [[default=no]]]), [build_osxuniversal="${enableval}"], [build_osxuniversal=no]) - if test "${build_osxuniversal}" != no ; then - if test "$enable_dependency_tracking" != no ; then - AC_MSG_ERROR([--enable-osx-universal-binary requires --disable-dependency-tracking. + if test "${build_osxuniversal}" != no ; then + if test "$enable_dependency_tracking" != no ; then + AC_MSG_ERROR([--enable-osx-universal-binary requires --disable-dependency-tracking. Please re-run configure with these options: --disable-dependency-tracking --enable-osx-universal-binary ]) - fi - CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" - CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" - LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" + fi + CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" + CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" + LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386" fi ;; esac -- 2.40.0