Changeset 8068

Timestamp:

05/26/12 10:02:12 (12 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/branches/ImageMagick-6

Files:

• ImageMagick.spec (modified) (1 diff)
• PerlMagick/Makefile.PL (modified) (3 diffs)
• PerlMagick/check.sh (modified) (1 diff)
• coders/sfw.c (modified) (1 diff)
• config/ImageMagick.rdf (modified) (2 diffs)
• config/configure.xml (modified) (3 diffs)
• configure (modified) (10 diffs)
• configure.ac (modified) (1 diff)
• libtool (modified) (8 diffs)
• magick/magick-config.h (modified) (6 diffs)
• magick/version.h (modified) (1 diff)
• version.sh (modified) (1 diff)

ImageMagick/branches/ImageMagick-6/ImageMagick.spec

@@ -1 +1 @@
 %global VERSION  6.7.7
-%global Patchlevel  2
+%global Patchlevel  3
 
 Name:           ImageMagick

ImageMagick/branches/ImageMagick-6/PerlMagick/Makefile.PL

@@ -199 +199 @@
 
    # C compiler
-   #'CC' => 'gcc -std=gnu99 -std=gnu99',
+   #'CC' => 'g++',
 
    # C pre-processor flags (e.g. -I & -D options)
@@ -208 +208 @@
 
    # Linker
-   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'},
+   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'g++' : $Config{'ld'},
 
    # Linker flags for building an executable
@@ -229 +229 @@
 
    # Use same compiler as ImageMagick
-   'PERLMAINCC' => ' -fopenmp',
+   'PERLMAINCC' => 'g++ -fopenmp',
    'AR' => 'ar',
-   'LD' => '',
+   'LD' => 'g++',
 
    # Set Perl installation prefix to ImageMagick installation prefix

ImageMagick/branches/ImageMagick-6/PerlMagick/check.sh

@@ -42 +42 @@
 if test -x PerlMagick -a -f Makefile.aperl ; then
   # Static build test incantation
-  ${MAKE} -f Makefile.aperl CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
+  ${MAKE} -f Makefile.aperl CC='g++' TEST_VERBOSE=1 test
 elif test -f Makefile -a -f Magick.o; then
   # Shared build test incantation
-  ${MAKE} CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
+  ${MAKE} CC='g++' TEST_VERBOSE=1 test
 else
   echo 'PerlMagick has not been built!'

ImageMagick/branches/ImageMagick-6/coders/sfw.c

@@ -130 +130 @@
     while (p < q)
     {
-      for (i=0; i < length; i++)
+      for (i=0; i < (ssize_t) length; i++)
         if (p[i] != target[i])
           break;
-      if (i == length)
+      if (i == (ssize_t) length)
         return((unsigned char *) p);
       p++;

ImageMagick/branches/ImageMagick-6/config/ImageMagick.rdf

@@ -6 +6 @@
     <shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc>
     <homepage rdf:resource="http://www.imagemagick.org/"/>
-    <created>2012-05-25</created>
+    <created>2012-05-26</created>
 
     <description xml:lang="en">
@@ -58 +58 @@
       <Version>
           <name>stable</name>
-          <created>2012-05-25</created>
+          <created>2012-05-26</created>
           <revision>6.7.7</revision>
-          <patch-level>-2</patch-level>
+          <patch-level>-3</patch-level>
       </Version>
     </release>

ImageMagick/branches/ImageMagick-6/config/configure.xml

@@ -10 +10 @@
   <configure name="VERSION" value="6.7.7"/>
   <configure name="LIB_VERSION" value="0x677"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,7,7,2"/>
-  <configure name="SVN_REVISION" value="8052" />
-  <configure name="RELEASE_DATE" value="2012-05-25"/>
-  <configure name="CONFIGURE" value="./configure "/>
+  <configure name="LIB_VERSION_NUMBER" value="6,7,7,3"/>
+  <configure name="SVN_REVISION" value="" />
+  <configure name="RELEASE_DATE" value="2012-05-26"/>
+  <configure name="CONFIGURE" value="./configure  '--disable-shared' 'CC=g++'"/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
@@ -24 +24 @@
   <configure name="CODER_PATH" value="/usr/local/lib/ImageMagick-6.7.7/modules-Q16/coders"/>
   <configure name="FILTER_PATH" value="/usr/local/lib/ImageMagick-6.7.7/modules-Q16/filters"/>
-  <configure name="CC" value="gcc -std=gnu99 -std=gnu99"/>
+  <configure name="CC" value="g++"/>
   <configure name="CFLAGS" value="-fopenmp -g -O2 -Wall -pthread"/>
   <configure name="CPPFLAGS" value="-I/usr/local/include/ImageMagick"/>
@@ -30 +30 @@
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
   <configure name="LDFLAGS" value="-L/usr/local/lib -L/usr/lib"/>
-  <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng15 -ldjvulibre -lfftw3 -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"/>
+  <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng15 -ldjvulibre -lfftw3 -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread "/>
   <configure name="CXX" value="g++"/>
   <configure name="CXXFLAGS" value="-g -O2 -pthread"/>
-  <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-wmf=no --with-perl=no"/>
+  <configure name="DISTCHECK_CONFIG_FLAGS" value="'CC=g++' --disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-wmf=no --with-perl=no"/>
   <configure name="TARGET_CPU" value="x86_64"/>
   <configure name="TARGET_VENDOR" value="unknown"/>

ImageMagick/branches/ImageMagick-6/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ImageMagick 6.7.7-2.
+# Generated by GNU Autoconf 2.69 for ImageMagick 6.7.7-3.
 #
 # Report bugs to <http://www.imagemagick.org>.
@@ -595 +595 @@
 PACKAGE_NAME='ImageMagick'
 PACKAGE_TARNAME='ImageMagick'
-PACKAGE_VERSION='6.7.7-2'
-PACKAGE_STRING='ImageMagick 6.7.7-2'
+PACKAGE_VERSION='6.7.7-3'
+PACKAGE_STRING='ImageMagick 6.7.7-3'
 PACKAGE_BUGREPORT='http://www.imagemagick.org'
 PACKAGE_URL=''
@@ -1759 +1759 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ImageMagick 6.7.7-2 to adapt to many kinds of systems.
+\`configure' configures ImageMagick 6.7.7-3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1834 +1834 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ImageMagick 6.7.7-2:";;
+     short | recursive ) echo "Configuration of ImageMagick 6.7.7-3:";;
    esac
   cat <<\_ACEOF
@@ -2054 +2054 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-ImageMagick configure 6.7.7-2
+ImageMagick configure 6.7.7-3
 generated by GNU Autoconf 2.69
 
@@ -3105 +3105 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ImageMagick $as_me 6.7.7-2, which was
+It was created by ImageMagick $as_me 6.7.7-3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -3644 +3644 @@
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=8052
-
+MAGICK_SVN_REVISION=
 
 
@@ -4128 +4127 @@
 # Define the identity of the package.
  PACKAGE='ImageMagick'
- VERSION='6.7.7-2'
+ VERSION='6.7.7-3'
 
 
@@ -36504 +36503 @@
 # values after options handling.
 ac_log="
-This file was extended by ImageMagick $as_me 6.7.7-2, which was
+This file was extended by ImageMagick $as_me 6.7.7-3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -36570 +36569 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ImageMagick config.status 6.7.7-2
+ImageMagick config.status 6.7.7-3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

ImageMagick/branches/ImageMagick-6/configure.ac

@@ -20 +20 @@
 m4_define([magick_minor_version], [7])
 m4_define([magick_micro_version], [7])
-m4_define([magick_patchlevel_version], [2])
+m4_define([magick_patchlevel_version], [3])
 m4_define([magick_version],
           [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])

ImageMagick/branches/ImageMagick-6/libtool

@@ -2 +2 @@
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.7.7-2
+# Generated automatically by config.status (ImageMagick) 6.7.7-3
 # Libtool was configured on host magick.imagemagick.org:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
@@ -75 +75 @@
 
 # Whether or not to build shared libraries.
-build_libtool_libs=yes
+build_libtool_libs=no
 
 # Whether or not to build static libraries.
@@ -84 +84 @@
 
 # Whether or not to optimize for fast installation.
-fast_install=yes
+fast_install=needless
 
 # The PATH separator for the build system.
@@ -165 +165 @@
 
 # A C compiler.
-LTCC="gcc -std=gnu99 -std=gnu99"
+LTCC="g++"
 
 # LTCC compiler flags.
@@ -285 +285 @@
 
 # Whether dlopen of programs is supported.
-dlopen_self=yes
+dlopen_self=no
 
 # Whether dlopen of statically linked programs is supported.
-dlopen_self_static=yes
+dlopen_self_static=unknown
 
 # Commands to strip libraries.
@@ -306 +306 @@
 
 # A language specific compiler.
-CC="gcc -std=gnu99 -std=gnu99"
+CC="g++"
 
 # Is the compiler the GNU compiler?
@@ -312 +312 @@
 
 # Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
+no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
 
 # Additional compiler flags for building library objects.
@@ -327 +327 @@
 
 # Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
+build_libtool_need_lc=yes
 
 # Whether or not to disallow shared libs when runtime libs are static.

ImageMagick/branches/ImageMagick-6/magick/magick-config.h

@@ -555 +555 @@
 
 /* Define to 1 if you have a working `mmap' system call. */
-#ifndef MAGICKCORE_HAVE_MMAP_FILEIO
-#define MAGICKCORE_HAVE_MMAP_FILEIO 1
-#endif
+/* #undef HAVE_MMAP_FILEIO */
 
 /* Define to 1 if you have the `munmap' function. */
@@ -1143 +1141 @@
 
 /* Define to 1 if the system has the type `_Bool'. */
-#ifndef MAGICKCORE_HAVE__BOOL
-#define MAGICKCORE_HAVE__BOOL 1
-#endif
+/* #undef HAVE__BOOL */
 
 /* Define to 1 if you have the `_exit' function. */
@@ -1221 +1217 @@
 
 /* Define if using libltdl to support dynamically loadable modules */
-#ifndef MAGICKCORE_LTDL_DELEGATE
-#define MAGICKCORE_LTDL_DELEGATE 1
-#endif
+/* #undef LTDL_DELEGATE */
 
 /* Define if the OS needs help to load dependent libraries for dlopen(). */
@@ -1303 +1297 @@
 /* Define to the full name and version of this package. */
 #ifndef MAGICKCORE_PACKAGE_STRING
-#define MAGICKCORE_PACKAGE_STRING "ImageMagick 6.7.7-2"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 6.7.7-3"
 #endif
 
@@ -1318 +1312 @@
 /* Define to the version of this package. */
 #ifndef MAGICKCORE_PACKAGE_VERSION
-#define MAGICKCORE_PACKAGE_VERSION "6.7.7-2"
+#define MAGICKCORE_PACKAGE_VERSION "6.7.7-3"
 #endif
 
@@ -1508 +1502 @@
 /* Version number of package */
 #ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "6.7.7-2"
+#define MAGICKCORE_VERSION "6.7.7-3"
 #endif
 

ImageMagick/branches/ImageMagick-6/magick/version.h

@@ -28 +28 @@
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "8052"
+#define MagickSVNRevision  ""
 #define MagickLibVersion  0x677
 #define MagickLibVersionText  "6.7.7"
 #define MagickLibVersionNumber  5,0,0
-#define MagickLibAddendum  "-2"
+#define MagickLibAddendum  "-3"
 #define MagickLibInterface  5
 #define MagickLibMinInterface  5
-#define MagickReleaseDate  "2012-05-25"
-#define MagickChangeDate   "20120525"
+#define MagickReleaseDate  "2012-05-26"
+#define MagickChangeDate   "20120526"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

ImageMagick/branches/ImageMagick-6/version.sh

@@ -14 +14 @@
 PACKAGE_PERL_VERSION='6.77'
 PACKAGE_LIB_VERSION="0x677"
-PACKAGE_RELEASE="2"
+PACKAGE_RELEASE="3"
 PACKAGE_LIB_VERSION_NUMBER="6,7,7,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`