[csw-devel] SF.net SVN: gar:[3292] csw/mgar/pkg/ImageMagick/trunk
hson at users.sourceforge.net
hson at users.sourceforge.net
Fri Feb 20 18:31:15 CET 2009
Revision: 3292
http://gar.svn.sourceforge.net/gar/?rev=3292&view=rev
Author: hson
Date: 2009-02-20 17:31:15 +0000 (Fri, 20 Feb 2009)
Log Message:
-----------
imagemagick: Update to 6.4.9 plus dynamic gspec
Modified Paths:
--------------
csw/mgar/pkg/ImageMagick/trunk/Makefile
csw/mgar/pkg/ImageMagick/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ImageMagick/trunk/files/CSWimagemagick.gspec
csw/mgar/pkg/ImageMagick/trunk/files/Makefile.patch
csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.i
csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.s
csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.i
csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.s
csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.i
csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.s
Removed Paths:
-------------
csw/mgar/pkg/ImageMagick/trunk/files/CSWimagick.gspec
Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-02-20 15:36:05 UTC (rev 3291)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2009-02-20 17:31:15 UTC (rev 3292)
@@ -1,6 +1,6 @@
-GARNAME = ImageMagick
-GARVERSION = 6.2.7
-GARSUBREV = 8
+GARNAME = imagemagick
+GARVERSION = 6.4.9
+GARSUBREV = 4
CATEGORIES = lib
DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images
@@ -11,10 +11,25 @@
PhotoCD, and GIF.
endef
-MASTER_SITES = ftp://ftp.fifi.org/pub/$(GARNAME)/
-DISTFILES = $(GARNAME)-$(GARVERSION)-$(GARSUBREV).tar.bz2
-DISTFILES += $(call admfiles,CSWimagick,)
+MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/
+DISTFILES = ImageMagick-$(GARVERSION)-$(GARSUBREV).tar.bz2
+DISTFILES += libMagick++.so.10.0.4.i
+DISTFILES += libMagick++.so.10.0.4.s
+DISTFILES += libMagick.so.10.0.4.i
+DISTFILES += libMagick.so.10.0.4.s
+DISTFILES += libWand.so.10.0.4.i
+DISTFILES += libWand.so.10.0.4.s
+DISTNAME = ImageMagick-$(GARVERSION)-$(GARSUBREV)
+
+LICENSE = LICENSE
+
+REQUIRED_PKGS += CSWbzip2 CSWfconfig CSWftype2 CSWgcc2g++rt CSWggettextrt
+REQUIRED_PKGS += CSWggettext CSWsunmath
+REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit
+REQUIRED_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg
+REQUIRED_PKGS += CSWlibxml2 CSWopenexr CSWperl CSWpng CSWtiff CSWwmf CSWzlib
+
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-(\d+).tar.bz2
@@ -22,11 +37,27 @@
CONFIGURE_ARGS += --with-perl=$(bindir)/perl
CONFIGURE_ARGS += --enable-shared --disable-static
+PATCHFILES += Makefile.patch
+
# Test has to be run *after* install
TEST_SCRIPTS =
+EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod
+
include gar/category.mk
-post-install:
- @echo " ==> Running tests for $(GARNAME)"
- @$(MAKE) -C $(WORKSRC) check
+post-install-isa-sparcv8:
+ @cp $(FILEDIR)/libMagick.so.10.0.4.s $(INSTALLISADIR)/opt/csw/lib/libMagick.so.10
+ @cp $(FILEDIR)/libWand.so.10.0.4.s $(INSTALLISADIR)/opt/csw/lib/libWand.so.10
+ @cp $(FILEDIR)/libMagick++.so.10.0.4.s $(INSTALLISADIR)/opt/csw/lib/libMagick++.so.10
+ #@ln -s libMagick.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libMagick.so.10
+ #@ln -s libWand.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libWand.so.10
+ #@ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libMagick++.so.10
+
+post-install-isa-i386:
+ @cp $(FILEDIR)/libMagick.so.10.0.4.i $(INSTALLISADIR)/opt/csw/lib/libMagick.so.10
+ @cp $(FILEDIR)/libWand.so.10.0.4.i $(INSTALLISADIR)/opt/csw/lib/libWand.so.10
+ @cp $(FILEDIR)/libMagick++.so.10.0.4.i $(INSTALLISADIR)/opt/csw/lib/libMagick++.so.10
+ #@ln -s libMagick.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libMagick.so.10
+ #@ln -s libWand.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libWand.so.10
+ #@ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)/opt/csw/lib/libMagick++.so.10
Modified: csw/mgar/pkg/ImageMagick/trunk/checksums
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/checksums 2009-02-20 15:36:05 UTC (rev 3291)
+++ csw/mgar/pkg/ImageMagick/trunk/checksums 2009-02-20 17:31:15 UTC (rev 3292)
@@ -1,2 +1,8 @@
-be62221c469009a1082298ccad31579e download/ImageMagick-6.2.7-8.tar.bz2
-68a34a6120d6f69b2e18e2b99d01497c download/CSWimagick.gspec
+8eba684cd31a3de7eac0f6ed02ce8018 download/ImageMagick-6.4.9-4.tar.bz2
+26ba45bf8a01f64c01973522657e1e09 download/libMagick++.so.10.0.4.i
+d4d961c6aab8c2fb4067953f80a5213b download/libMagick++.so.10.0.4.s
+c6254fa21d534ca99be36547ce599709 download/libMagick.so.10.0.4.i
+c3da4ba416306f5c064cfcc109f69091 download/libMagick.so.10.0.4.s
+f46e2f8d0bd8f2c1206534592ebda333 download/libWand.so.10.0.4.i
+0f6e06e2d8e5b446e90be3a8ae328761 download/libWand.so.10.0.4.s
+6bd361fe352c7d497d60d8d2cbe7cfd4 download/Makefile.patch
Added: csw/mgar/pkg/ImageMagick/trunk/files/CSWimagemagick.gspec
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/files/CSWimagemagick.gspec (rev 0)
+++ csw/mgar/pkg/ImageMagick/trunk/files/CSWimagemagick.gspec 2009-02-20 17:31:15 UTC (rev 3292)
@@ -0,0 +1,4 @@
+%var bitname imagemagick
+%var pkgname CSWimagemagick
+%include url file://%{PKGLIB}/csw_dyndepend.gspec
+%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE
Deleted: csw/mgar/pkg/ImageMagick/trunk/files/CSWimagick.gspec
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/files/CSWimagick.gspec 2009-02-20 15:36:05 UTC (rev 3291)
+++ csw/mgar/pkg/ImageMagick/trunk/files/CSWimagick.gspec 2009-02-20 17:31:15 UTC (rev 3292)
@@ -1,4 +0,0 @@
-%var bitname imagemagick
-%var pkgname CSWimagick
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/COPYRIGHT
Added: csw/mgar/pkg/ImageMagick/trunk/files/Makefile.patch
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/files/Makefile.patch (rev 0)
+++ csw/mgar/pkg/ImageMagick/trunk/files/Makefile.patch 2009-02-20 17:31:15 UTC (rev 3292)
@@ -0,0 +1,11 @@
+--- ImageMagick-6.4.9-4.orig/Makefile.in 2009-02-12 23:04:45.000000000 +0100
++++ ImageMagick-6.4.9-4/Makefile.in 2009-02-18 07:30:25.392728347 +0100
+@@ -2929,7 +2929,7 @@
+ coders_fpx_la_SOURCES = coders/fpx.c
+ coders_fpx_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
+ coders_fpx_la_LDFLAGS = $(MODULECOMMONFLAGS)
+-coders_fpx_la_LIBADD = $(MAGICKCORE_LIBS) $(FPX_LIBS) -lstdc++
++coders_fpx_la_LIBADD = $(MAGICKCORE_LIBS) $(FPX_LIBS)
+
+ # GIF coder module
+ coders_gif_la_SOURCES = coders/gif.c
Added: csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.i
===================================================================
(Binary files differ)
Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.i
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.s
===================================================================
(Binary files differ)
Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/libMagick++.so.10.0.4.s
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.i
===================================================================
(Binary files differ)
Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.i
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.s
===================================================================
(Binary files differ)
Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/libMagick.so.10.0.4.s
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.i
===================================================================
(Binary files differ)
Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.i
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.s
===================================================================
(Binary files differ)
Property changes on: csw/mgar/pkg/ImageMagick/trunk/files/libWand.so.10.0.4.s
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list