Changeset 7026

Timestamp:

03/02/12 14:18:30 (15 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/branches/ImageMagick-6.7.5

Files:

• Makefile.in (modified) (2 diffs)
• config/ImageMagick.rdf (modified) (2 diffs)
• config/configure.xml (modified) (1 diff)
• configure (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• m4/ax_check_compile_flag.m4 (added)
• m4/ax_gcc_x86_cpuid.m4 (added)
• magick/version.h (modified) (2 diffs)

ImageMagick/branches/ImageMagick-6.7.5/Makefile.in

@@ -280 +280 @@
         $(top_srcdir)/m4/ax_c___attribute__.m4 \
         $(top_srcdir)/m4/ax_cflags_warn_all.m4 \
+        $(top_srcdir)/m4/ax_check_compile_flag.m4 \
         $(top_srcdir)/m4/ax_compare_version.m4 \
         $(top_srcdir)/m4/ax_cxx_bool.m4 \
@@ -285 +286 @@
         $(top_srcdir)/m4/ax_cxx_namespaces.m4 \
         $(top_srcdir)/m4/ax_gcc_archflag.m4 \
+        $(top_srcdir)/m4/ax_gcc_x86_cpuid.m4 \
         $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \
         $(top_srcdir)/m4/ax_opencl.m4 \

ImageMagick/branches/ImageMagick-6.7.5/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-03-01</created>
+    <created>2012-03-02</created>
 
     <description xml:lang="en">
@@ -58 +58 @@
       <Version>
           <name>stable</name>
-          <created>2012-03-01</created>
+          <created>2012-03-02</created>
           <revision>6.7.5</revision>
       </Version>

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

@@ -11 +11 @@
   <configure name="LIB_VERSION" value="0x675"/>
   <configure name="LIB_VERSION_NUMBER" value="6,7,5,8"/>
-  <configure name="SVN_REVISION" value="7001" />
-  <configure name="RELEASE_DATE" value="2012-03-01"/>
+  <configure name="SVN_REVISION" value="7017" />
+  <configure name="RELEASE_DATE" value="2012-03-02"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

ImageMagick/branches/ImageMagick-6.7.5/configure

@@ -3617 +3617 @@
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=7001
+MAGICK_SVN_REVISION=7017
 
 
@@ -8372 +8372 @@
 if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then
 for arch in $ax_gcc_arch; do
-  if test "xyes" = xyes; then # if we require portable code
+  if test "xno" = xyes; then # if we require portable code
     flags="-mtune=$arch"
     # -mcpu=$arch and m$arch generate nonportable code on every arch except

ImageMagick/branches/ImageMagick-6.7.5/configure.ac

@@ -265 +265 @@
 AM_WITH_DMALLOC
 AX_C___ATTRIBUTE__
-AX_GCC_ARCHFLAG
+AX_GCC_ARCHFLAG([no])
 PKG_PROG_PKG_CONFIG
 

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

@@ -28 +28 @@
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "7001"
+#define MagickSVNRevision  "7017"
 #define MagickLibVersion  0x675
 #define MagickLibVersionText  "6.7.5"
@@ -35 +35 @@
 #define MagickLibInterface  5
 #define MagickLibMinInterface  5
-#define MagickReleaseDate  "2012-03-01"
-#define MagickChangeDate   "20120229"
+#define MagickReleaseDate  "2012-03-02"
+#define MagickChangeDate   "20120302"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)