Changeset 282

Show
Ignore:
Timestamp:
10/03/09 14:06:16 (6 months ago)
Author:
cristy
Message:
 
Location:
ImageMagick/trunk
Files:
9 modified

Legend:

Unmodified
Added
Removed

  • ImageMagick/trunk/ChangeLog

    r275 r282  
     12009-10-03  6.5.6-8 Nick Wellnhofer <wellnhofer@aevum...> 
     2  * adds some missing libraries to the LIBADD entries in coders/Makefile.am, 
     3    filters/Makefile.am and wand/Makefile.am. 
     4 
    152009-10-01  6.5.6-7 Cristy  <quetzlzacatenango@image...> 
    26  * Don't use group4 compression if the image is truecolor. 

  • ImageMagick/trunk/Makefile.in

    r204 r282  
    8787#  limitations under the License. 
    8888# 
    89 #  Copyright (C) 2003 - 2008 GraphicsMagick Group 
    90 # 
    9189#  Makefile for building ImageMagick Coder library. 
    9290 
    … …  
    104102#  See the License for the specific language governing permissions and 
    105103#  limitations under the License. 
    106 # 
    107 #  Copyright (C) 2003 - 2008 GraphicsMagick Group 
    108104# 
    109105#  Makefile for building the MagickCore API. 
    … …  
    166162#  See the License for the specific language governing permissions and 
    167163#  limitations under the License. 
    168 # 
    169 #  Copyright (C) 2003 - 2008 GraphicsMagick Group 
    170164# 
    171165#  Makefile for building ImageMagick utilities. 
    … …  
    540534@DPS_DELEGATE_TRUE@@WITH_MODULES_TRUE@am_coders_dps_la_rpath = -rpath \ 
    541535@DPS_DELEGATE_TRUE@@WITH_MODULES_TRUE@  $(codersdir) 
    542 coders_dpx_la_DEPENDENCIES = $(MAGICKCORE_LIBS) 
     536coders_dpx_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) 
    543537am_coders_dpx_la_OBJECTS = coders/coders_dpx_la-dpx.lo 
    544538coders_dpx_la_OBJECTS = $(am_coders_dpx_la_OBJECTS) 
    … …  
    618612        $@ 
    619613@WITH_MODULES_TRUE@am_coders_gray_la_rpath = -rpath $(codersdir) 
    620 coders_hald_la_DEPENDENCIES = $(MAGICKCORE_LIBS) 
     614coders_hald_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) 
    621615am_coders_hald_la_OBJECTS = coders/coders_hald_la-hald.lo 
    622616coders_hald_la_OBJECTS = $(am_coders_hald_la_OBJECTS) 
    … …  
    731725        $(coders_map_la_LDFLAGS) $(LDFLAGS) -o $@ 
    732726@WITH_MODULES_TRUE@am_coders_map_la_rpath = -rpath $(codersdir) 
    733 coders_mat_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) 
     727coders_mat_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ 
     728        $(am__DEPENDENCIES_1) 
    734729am_coders_mat_la_OBJECTS = coders/coders_mat_la-mat.lo 
    735730coders_mat_la_OBJECTS = $(am_coders_mat_la_OBJECTS) 
    … …  
    898893        $(coders_pix_la_LDFLAGS) $(LDFLAGS) -o $@ 
    899894@WITH_MODULES_TRUE@am_coders_pix_la_rpath = -rpath $(codersdir) 
    900 coders_plasma_la_DEPENDENCIES = $(MAGICKCORE_LIBS) 
     895coders_plasma_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \ 
     896        $(am__DEPENDENCIES_1) 
    901897am_coders_plasma_la_OBJECTS = coders/coders_plasma_la-plasma.lo 
    902898coders_plasma_la_OBJECTS = $(am_coders_plasma_la_OBJECTS) 
    … …  
    916912@PNG_DELEGATE_TRUE@@WITH_MODULES_TRUE@am_coders_png_la_rpath = -rpath \ 
    917913@PNG_DELEGATE_TRUE@@WITH_MODULES_TRUE@  $(codersdir) 
    918 coders_pnm_la_DEPENDENCIES = $(MAGICKCORE_LIBS) 
     914coders_pnm_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) 
    919915am_coders_pnm_la_OBJECTS = coders/coders_pnm_la-pnm.lo 
    920916coders_pnm_la_OBJECTS = $(am_coders_pnm_la_OBJECTS) 
    … …  
    12451241        $(coders_yuv_la_LDFLAGS) $(LDFLAGS) -o $@ 
    12461242@WITH_MODULES_TRUE@am_coders_yuv_la_rpath = -rpath $(codersdir) 
    1247 filters_analyze_la_DEPENDENCIES = $(MAGICKCORE_LIBS) 
     1243filters_analyze_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \ 
     1244        $(am__DEPENDENCIES_1) 
    12481245am_filters_analyze_la_OBJECTS = filters/filters_analyze_la-analyze.lo 
    12491246filters_analyze_la_OBJECTS = $(am_filters_analyze_la_OBJECTS) 
    … …  
    16371634        $(LDFLAGS) -o $@ 
    16381635wand_libMagickWand_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \ 
    1639         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) 
     1636        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ 
     1637        $(am__DEPENDENCIES_1) 
    16401638am__objects_18 = wand/wand_libMagickWand_la-animate.lo \ 
    16411639        wand/wand_libMagickWand_la-compare.lo \ 
    … …  
    31173115coders_dpx_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) 
    31183116coders_dpx_la_LDFLAGS = $(MODULECOMMONFLAGS) 
    3119 coders_dpx_la_LIBADD = $(MAGICKCORE_LIBS)  
     3117coders_dpx_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS) 
    31203118 
    31213119# DOT coder module 
    … …  
    31893187coders_hald_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) 
    31903188coders_hald_la_LDFLAGS = $(MODULECOMMONFLAGS) 
    3191 coders_hald_la_LIBADD = $(MAGICKCORE_LIBS) 
     3189coders_hald_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS) 
    31923190 
    31933191# HRZ coder module 
    … …  
    32673265coders_mat_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) 
    32683266coders_mat_la_LDFLAGS = $(MODULECOMMONFLAGS) 
    3269 coders_mat_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) 
     3267coders_mat_la_LIBADD = $(MAGICKCORE_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) 
    32703268 
    32713269# MATTE coder module 
    … …  
    34053403coders_plasma_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) 
    34063404coders_plasma_la_LDFLAGS = $(MODULECOMMONFLAGS) 
    3407 coders_plasma_la_LIBADD = $(MAGICKCORE_LIBS) 
     3405coders_plasma_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) 
    34083406 
    34093407# PNM coder module 
    … …  
    34113409coders_pnm_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) 
    34123410coders_pnm_la_LDFLAGS = $(MODULECOMMONFLAGS) 
    3413 coders_pnm_la_LIBADD = $(MAGICKCORE_LIBS) 
     3411coders_pnm_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS) 
    34143412 
    34153413# PREVIEW coder module 
    … …  
    40624060filters_analyze_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) 
    40634061filters_analyze_la_LDFLAGS = $(MODULECOMMONFLAGS) 
    4064 filters_analyze_la_LIBADD = $(MAGICKCORE_LIBS) 
     4062filters_analyze_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) 
    40654063wandincdir = $(topincludedir)/wand 
    40664064WAND_SOURCES = \ 
    … …  
    41664164  $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE) 
    41674165 
    4168 wand_libMagickWand_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(MATH_LIBS) 
     4166wand_libMagickWand_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS) 
    41694167WAND_EXTRA_DIST = \ 
    41704168        wand/ChangeLog \ 

  • ImageMagick/trunk/PerlMagick/Makefile.PL

    r225 r282  
    7575 
    7676   # Linker flags for building an executable 
    77    'LDFLAGS' =>  "-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand $Config{'ldflags'} -lfreetype", 
     77   'LDFLAGS' =>  "-L../magick/.libs -lMagickCore $Config{'ldflags'} -lfreetype", 
    7878 
    7979   # Linker flags for building a dynamically loadable module 
    80    'LDDLFLAGS' => "-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand $Config{'lddlflags'} -lfreetype", 
     80   'LDDLFLAGS' => "-L../magick/.libs -lMagickCore $Config{'lddlflags'} -lfreetype", 
    8181 
    8282   # Install PerlMagick binary into ImageMagick bin directory 
    … …  
    8484 
    8585   # Library specification 
    86    'LIBS' => [ '-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand -lperl -lm' ], 
     86   'LIBS' => [ '-L../magick/.libs -lMagickCore -L../wand/.libs -lperl -lm' ], 
    8787 
    8888   # Perl binary name (if a Perl binary is built) 

  • ImageMagick/trunk/coders/Makefile.am

    r204 r282  
    1212#  See the License for the specific language governing permissions and 
    1313#  limitations under the License. 
    14 # 
    15 #  Copyright (C) 2003 - 2008 GraphicsMagick Group 
    1614# 
    1715#  Makefile for building ImageMagick Coder library. 
    … …  
    422420coders_dpx_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS) 
    423421coders_dpx_la_LDFLAGS      = $(MODULECOMMONFLAGS) 
    424 coders_dpx_la_LIBADD       = $(MAGICKCORE_LIBS)  
     422coders_dpx_la_LIBADD       = $(MAGICKCORE_LIBS) $(GOMP_LIBS) 
    425423 
    426424# DOT coder module 
    … …  
    494492coders_hald_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS) 
    495493coders_hald_la_LDFLAGS     = $(MODULECOMMONFLAGS) 
    496 coders_hald_la_LIBADD      = $(MAGICKCORE_LIBS) 
     494coders_hald_la_LIBADD      = $(MAGICKCORE_LIBS) $(GOMP_LIBS) 
    497495 
    498496# HRZ coder module 
    … …  
    572570coders_mat_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS) 
    573571coders_mat_la_LDFLAGS      = $(MODULECOMMONFLAGS) 
    574 coders_mat_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS) 
     572coders_mat_la_LIBADD       = $(MAGICKCORE_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) 
    575573 
    576574# MATTE coder module 
    … …  
    711709coders_plasma_la_CPPFLAGS  = $(MODULE_EXTRA_CPPFLAGS) 
    712710coders_plasma_la_LDFLAGS   = $(MODULECOMMONFLAGS) 
    713 coders_plasma_la_LIBADD    = $(MAGICKCORE_LIBS) 
     711coders_plasma_la_LIBADD    = $(MAGICKCORE_LIBS) $(MATH_LIBS) 
    714712 
    715713# PNM coder module 
    … …  
    717715coders_pnm_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS) 
    718716coders_pnm_la_LDFLAGS      = $(MODULECOMMONFLAGS) 
    719 coders_pnm_la_LIBADD       = $(MAGICKCORE_LIBS) 
     717coders_pnm_la_LIBADD       = $(MAGICKCORE_LIBS) $(GOMP_LIBS) 
    720718 
    721719# PREVIEW coder module 

  • ImageMagick/trunk/filters/Makefile.am

    r1 r282  
    3434filters_analyze_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS) 
    3535filters_analyze_la_LDFLAGS      = $(MODULECOMMONFLAGS) 
    36 filters_analyze_la_LIBADD       = $(MAGICKCORE_LIBS) 
     36filters_analyze_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS) 
    3737 

  • ImageMagick/trunk/magick/Makefile.am

    r137 r282  
    1212#  See the License for the specific language governing permissions and 
    1313#  limitations under the License. 
    14 # 
    15 #  Copyright (C) 2003 - 2008 GraphicsMagick Group 
    1614# 
    1715#  Makefile for building the MagickCore API. 

  • ImageMagick/trunk/magick/version.h

    r280 r282  
    3333#define MagickLibSubversion  "-8" 
    3434#define MagickReleaseDate  "2009-10-03" 
    35 #define MagickChangeDate   "20091001" 
     35#define MagickChangeDate   "20091003" 
    3636#define MagickAuthoritativeURL  "http://www.imagemagick.org" 
    3737#define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.5.6/index.html" 

  • ImageMagick/trunk/utilities/Makefile.am

    r1 r282  
    1212#  See the License for the specific language governing permissions and 
    1313#  limitations under the License. 
    14 # 
    15 #  Copyright (C) 2003 - 2008 GraphicsMagick Group 
    1614# 
    1715#  Makefile for building ImageMagick utilities. 

  • ImageMagick/trunk/wand/Makefile.am

    r1 r282  
    122122  -version-info \ 
    123123  $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE) 
    124 wand_libMagickWand_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(MATH_LIBS) 
     124wand_libMagickWand_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS) 
    125125 
    126126WAND_EXTRA_DIST = \