Revision: 16496
http://gar.svn.sourceforge.net/gar/?rev=16496&view=rev
Author: dmichelsen
Date: 2011-12-14 09:03:11 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
ImageMagick/trunk: Update to 6.7.3-10, general rework
Modified Paths:
--------------
csw/mgar/pkg/ImageMagick/trunk/Makefile
csw/mgar/pkg/ImageMagick/trunk/checksums
Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-12-14 01:02:15 UTC (rev
16495)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-12-14 09:03:11 UTC (rev
16496)
@@ -1,6 +1,6 @@
NAME = imagemagick
-VERSION = 6.7.0
-GARSUBREV = 8
+VERSION = 6.7.3
+GARSUBREV = 10
CATEGORIES = lib
DESCRIPTION = A comprehensive package supporting automated and interative
manipulation of images
@@ -17,66 +17,84 @@
PATCHFILES += 0001-Do-not-strip-norunpath.patch
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+# Compilation breaks with internal error on SOS12 and SOS12U1
+GARCOMPILER = SOS12U2
+
VENDOR_URL = http://www.imagemagick.org
LICENSE = LICENSE
-PACKAGES += CSWlibmagick++4
-PKGFILES_CSWlibmagick++4 += $(call pkgfiles_lib,libMagick++.so.4)
-SPKG_DESC_CSWlibmagick++4 += Library from ImageMagick, libMagick++.so.4
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWjpeg
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblcms2-2
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblqr
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWtiff
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibmagickcore4
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWftype2
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWbzip2
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibmagickwand4
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWfconfig
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibfftw3-3
-RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblzma5
+BUILD_DEP_PKGS += CSWdjvulibredevel
+BUILD_DEP_PKGS += CSWgraphvizdevel
+BUILD_DEP_PKGS += CSWilmbasedevel
+BUILD_DEP_PKGS += CSWliblcms-dev
+BUILD_DEP_PKGS += CSWlibcairo-dev
+BUILD_DEP_PKGS += CSWliblqrdevel
+BUILD_DEP_PKGS += CSWlibwmf-dev
+BUILD_DEP_PKGS += CSWliblzma-dev
+BUILD_DEP_PKGS += CSWopenexrdevel
+BUILD_DEP_PKGS += CSWlibwebp-dev
+BUILD_DEP_PKGS += CSWlibfpx-dev
-PACKAGES += CSWlibmagickcore4
-PKGFILES_CSWlibmagickcore4 += $(call pkgfiles_lib,libMagickCore.so.4)
-SPKG_DESC_CSWlibmagickcore4 += Library from ImageMagick, libMagickCore.so.4
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWjpeg
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWliblcms2-2
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWliblqr
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWtiff
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWftype2
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWbzip2
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWfconfig
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibfftw3-3
-RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWliblzma5
+PACKAGES += CSWlibmagick++5
+PKGFILES_CSWlibmagick++5 += $(call pkgfiles_lib,libMagick++.so.5)
+SPKG_DESC_CSWlibmagick++5 += Library from ImageMagick, libMagick++.so.5
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWliblcms2-2
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWliblqr1-0
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibmagickcore5
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibmagickwand5
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibfftw3-3
+RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWliblzma5
+
+PACKAGES += CSWlibmagickcore5
+PKGFILES_CSWlibmagickcore5 += $(call pkgfiles_lib,libMagickCore.so.5)
+SPKG_DESC_CSWlibmagickcore5 += Library from ImageMagick, libMagickCore.so.5
+RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWliblcms2-2
+RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWliblqr1-0
+RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibfftw3-3
+RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWliblzma5
+
# Gnuplot is detected by the magic cookie #!/usr/local/bin/gnuplot
# XXX: Is this correct?
-CHECKPKG_OVERRIDES_CSWlibmagickcore4 +=
file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.4.0.1
+# CHECKPKG_OVERRIDES_CSWlibmagickcore5 +=
file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.5.0.0
-PACKAGES += CSWlibmagickwand4
-PKGFILES_CSWlibmagickwand4 += $(call pkgfiles_lib,libMagickWand.so.4)
-SPKG_DESC_CSWlibmagickwand4 += Library from ImageMagick, libMagickWand.so.4
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWjpeg
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblcms2-2
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblqr
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWtiff
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibmagickcore4
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWftype2
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWbzip2
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWfconfig
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibfftw3-3
-RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblzma5
+PACKAGES += CSWlibmagickwand5
+PKGFILES_CSWlibmagickwand5 += $(call pkgfiles_lib,libMagickWand.so.5)
+SPKG_DESC_CSWlibmagickwand5 += Library from ImageMagick, libMagickWand.so.5
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWliblcms2-2
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWliblqr1-0
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibmagickcore5
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibfftw3-3
+RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWliblzma5
PACKAGES += CSWimagemagick-dev
SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries
@@ -84,9 +102,9 @@
PKGFILES_DEVEL_MAN3_MANPAGE =
PKGFILES_CSWimagemagick-dev += $(PKGFILES_DEVEL)
PKGFILES_CSWimagemagick-dev += $(docdir)/.*
-RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++4
-RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore4
-RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand4
+RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++5
+RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore5
+RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand5
RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWperl
# This is all in /opt/csw/share/doc
CHECKPKG_OVERRIDES_CSWimagemagick-dev += file-with-bad-content
@@ -94,34 +112,38 @@
PACKAGES += CSWimagemagick
SPKG_DESC_CSWimagemagick = A comprehensive package supporting automated and
interative manipulation of images
# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore4
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand4
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore5
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand5
RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblcms2-2
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWbzip2
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibbz2-1-0
RUNTIME_DEP_PKGS_CSWimagemagick += CSWilmbase
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibpng12-0
RUNTIME_DEP_PKGS_CSWimagemagick += CSWgtk2
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWglib2
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWjpeg
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfpx
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfpx1
RUNTIME_DEP_PKGS_CSWimagemagick += CSWjasper
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiff
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibtiff3
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxml2-2
RUNTIME_DEP_PKGS_CSWimagemagick += CSWfconfig
RUNTIME_DEP_PKGS_CSWimagemagick += CSWjbigkit
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblqr
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblqr1-0
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcdt5
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibz1
RUNTIME_DEP_PKGS_CSWimagemagick += CSWftype2
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg2-2
RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexrrt
RUNTIME_DEP_PKGS_CSWimagemagick += CSWdjvulibrert
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgraph5
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWpango
+RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo2
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWgcc3g++rt
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfftw3-3
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf0-2-7
RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7
@@ -134,27 +156,28 @@
PKGFILES_CSWpm-image-magick += $(mandir)/.*\.3perl
RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWperl
-RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWlibmagickcore4
+RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWlibmagickcore5
-BUILD_DEP_PKGS += CSWdjvulibredevel
-BUILD_DEP_PKGS += CSWgraphvizdevel
-BUILD_DEP_PKGS += CSWilmbasedevel
-BUILD_DEP_PKGS += CSWliblcms-dev
-BUILD_DEP_PKGS += CSWlibcairodevel
-BUILD_DEP_PKGS += CSWliblqrdevel
-BUILD_DEP_PKGS += CSWlibwmf-dev
-BUILD_DEP_PKGS += CSWliblzma-dev
-BUILD_DEP_PKGS += CSWopenexrdevel
-BUILD_DEP_PKGS += CSWlibwebp-dev
+REINPLACE_USRLOCAL += config/mime.xml
+REINPLACEMENTS += gnuplot
+REINPLACE_MATCH_gnuplot = /usr/local/bin/gnuplot
+REINPLACE_WITH_gnuplot = $(bindir)/gnuplot
+REINPLACE_FILES_gnuplot += magick/magic.c
+
+# This is part of ImageMagick and should be automatically adjusted during
configure time
+REINPLACEMENTS += display
+REINPLACE_MATCH_display = /usr/local/bin/display
+REINPLACE_WITH_display = $(bindir)/display
+REINPLACE_FILES_display += magick/delegate.c
+
+REINPLACEMENTS += nostdcpplib
+REINPLACE_MATCH_nostdcpplib = -lstdc\+\+
+REINPLACE_WITH_nostdcpplib =
+REINPLACE_FILES_nostdcpplib = Makefile.in
+
EXTRA_LINKER_FLAGS = -norunpath
-# Somehow the above flag does not make it to the linker
-#CHECKPKG_OVERRIDES_CSWlibmagick++4 +=
bad-rpath-entry|/lib|opt/csw/lib/libMagick++.so.4.0.1
-#CHECKPKG_OVERRIDES_CSWlibmagick++4 +=
bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.4.0.1
-#CHECKPKG_OVERRIDES_CSWlibmagick++4 +=
bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.4.0.1
-#CHECKPKG_OVERRIDES_CSWlibmagick++4 +=
bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.4.0.1
-
# This is for libdps, skipping this line makes the following tests fail:
# FAIL: tests/validate-formats-on-disk.sh
# FAIL: Magick++/tests/coderInfo.sh
@@ -165,22 +188,19 @@
RUNPATH_ISALIST = $(libpath_install)
CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-perl=$(bindir)/perl
CONFIGURE_ARGS += --enable-shared --disable-static
CONFIGURE_ARGS += --enable-hdri
CONFIGURE_ARGS += --with-dps=yes
+
# Ghostscript lib is linked to Sun X11
# CONFIGURE_ARGS += --with-gslib=no
-# Solaris 8 and 9 doesn't have complex.h
-# CONFIGURE_ARGS += --without-fftw
+
CONFIGURE_ARGS += --with-modules=yes
-# Let's try to use openmp and see what it does for performance
-#CONFIGURE_ARGS += --disable-openmp
CONFIGURE_ARGS += --disable-silent-rules
# Until librsvg,graphviz and perl is 64bit
+CONFIGURE_ARGS-32 += --with-perl=$(bindir)/perl
CONFIGURE_ARGS-64 += --without-gvc
-CONFIGURE_ARGS-64 += --without-rsvg
CONFIGURE_ARGS-64 += --without-perl
CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
@@ -190,13 +210,9 @@
# http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=18889
SKIPTEST ?= 1
-# Dependencies not 64-bit yet
-#BUILD64 = 1
+BUILD64 = 1
+ISAEXEC = 1
-# Is this really a problem?
-#CHECKPKG_OVERRIDES_CSWimagemagick +=
soname-not-found|libdps.so.5|is|needed|by|opt/csw/lib/ImageMagick-6.7.0/modules-Q16/coders/dps.so
-#CHECKPKG_OVERRIDES_CSWimagemagick +=
soname-not-found|libdpstk.so.5|is|needed|by|opt/csw/lib/ImageMagick-6.7.0/modules-Q16/coders/dps.so
-
# Only remove libtool files from the public lib directory, keep the private
ones for libtool dlopn
MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la
@@ -206,13 +222,6 @@
EXTRA_PAX_ARGS += -s ',$(bindir)/compare,$(bindir)/compare-imagemagick,'
EXTRA_PAX_ARGS += -s
',$(mandir)/man1/compare\.1,$(mandir)/man1/compare-imagemagick.1,'
-STRIP_LIBTOOL = 1
-
include gar/category.mk
SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV)
-
-post-install-modulated:
- perl -pi \
- -e 's,/usr/local/bin,$(bindir),g' \
- $(DESTDIR)$(sysconfdir)/ImageMagick/mime.xml
Modified: csw/mgar/pkg/ImageMagick/trunk/checksums
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/checksums 2011-12-14 01:02:15 UTC (rev
16495)
+++ csw/mgar/pkg/ImageMagick/trunk/checksums 2011-12-14 09:03:11 UTC (rev
16496)
@@ -1 +1 @@
-67d8631c20fc9a2409343c02b159407d ImageMagick-6.7.0-8.tar.xz
+6bf001ae206bffe77693732e4e886532 ImageMagick-6.7.3-10.tar.xz
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
