update graphicsmagick

4 files changed, 47 insertions, 63 deletions

diff --git a/src/graphicsmagick-1-fix-xml2-config.patch b/src/graphicsmagick-1-fix-xml2-config.patch
deleted file mode 100644
index 3cd69e8..0000000
--- a/src/graphicsmagick-1-fix-xml2-config.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-This patch has been taken from:
-https://sourceforge.net/p/graphicsmagick/bugs/154/
-
-diff --git a/configure.ac b/configure.ac
-index 979d2c4..12d4555 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -2373,12 +2373,13 @@ then
-         # Debian installs libxml headers under /usr/include/libxml2/libxml with
-         # the shared library installed under /usr/lib, whereas the package
-         # installs itself under $prefix/libxml and $prefix/lib.
--        xml2_prefix=`xml2-config --prefix`
-+        xml2_prefix=`"$xml2_config" --prefix`
-         if test -d "${xml2_prefix}/include/libxml2"
-         then
-           CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
-         fi
-         LDFLAGS="$LDFLAGS -L${xml2_prefix}/lib"
-+        LIBS="$LIBS `"$xml2_config" --libs`"
-      fi
-     failed=0
-     passed=0
-@@ -2401,8 +2402,9 @@ then
-         LDFLAGS="$OLD_LDFLAGS"
-         CPPFLAGS="$OLD_CPPFLAGS"
-     else
--	LIB_XML='-lxml2'
-+	LIB_XML=`"$xml2_config" --libs`
- 	LIBS="$LIB_XML $LIBS"
-+	CPPFLAGS="$CPPFLAGS `"$xml2_config" --cflags`"
- 	AC_DEFINE(HasXML,1,Define if you have XML library)
- 	AC_MSG_RESULT(yes)
-         have_xml='yes'
-diff --git a/magick/GraphicsMagick.pc.in b/magick/GraphicsMagick.pc.in
-index 5757b37..87e3fd4 100644
---- a/magick/GraphicsMagick.pc.in
-+++ b/magick/GraphicsMagick.pc.in
-@@ -8,4 +8,6 @@ Name: GraphicsMagick
- Version: @PACKAGE_VERSION@
- Description: GraphicsMagick image processing library
-+Requires.private: libxml-2.0
- Libs: -L${libdir} -lGraphicsMagick
-+Libs.private: @MAGICK_API_LDFLAGS@ @MAGICK_API_LIBS@
- Cflags: -I${includedir} @MAGICK_API_PC_CPPFLAGS@
diff --git a/src/graphicsmagick-1-fixes.patch b/src/graphicsmagick-1-fixes.patch
new file mode 100644
index 0000000..0aa9a07
--- /dev/null
+++ b/src/graphicsmagick-1-fixes.patch
@@ -0,0 +1,44 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Volker Diels-Grabsch <v@njh.eu>
+Date: Sat, 11 Dec 2010 22:50:57 +0100
+Subject: [PATCH 1/2] fix .pc file for xml2 dependency
+
+This patch has been taken from:
+https://sourceforge.net/p/graphicsmagick/bugs/154/
+
+diff --git a/magick/GraphicsMagick.pc.in b/magick/GraphicsMagick.pc.in
+index 1111111..2222222 100644
+--- a/magick/GraphicsMagick.pc.in
++++ b/magick/GraphicsMagick.pc.in
+@@ -7,5 +7,7 @@ includedir=@includedir@/GraphicsMagick
+ Name: GraphicsMagick
+ Version: @PACKAGE_VERSION@
+ Description: GraphicsMagick image processing library
++Requires.private: libxml-2.0
+ Libs: -L${libdir} -lGraphicsMagick
++Libs.private: @MAGICK_API_LDFLAGS@ @MAGICK_API_LIBS@
+ Cflags: -I${includedir} @MAGICK_API_PC_CPPFLAGS@
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Sun, 10 Feb 2013 15:24:58 +1100
+Subject: [PATCH 2/2] relax autoconf version requirement
+
+
+diff --git a/configure.ac b/configure.ac
+index 1111111..2222222 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,7 +11,7 @@
+ # Written by Bob Friesenhahn <bfriesen@GraphicsMagick.org>
+ #
+ 
+-AC_PREREQ(2.69)
++AC_PREREQ(2.67)
+ AC_INIT(magick/magick.h)
+ 
+ # Specify directory where m4 macros may be found.
diff --git a/src/graphicsmagick-2-fix-autoconf-version.patch b/src/graphicsmagick-2-fix-autoconf-version.patch
deleted file mode 100644
index dd9e1ee..0000000
--- a/src/graphicsmagick-2-fix-autoconf-version.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,7 +11,7 @@
- # Written by Bob Friesenhahn <bfriesen@GraphicsMagick.org>
- #
-  
--AC_PREREQ(2.69)
-+AC_PREREQ(2.67)
- AC_INIT(magick/magick.h)
- 
- # Specify directory where m4 macros may be found.
diff --git a/src/graphicsmagick.mk b/src/graphicsmagick.mk
index 76bcc75..c746025 100644
--- a/src/graphicsmagick.mk
+++ b/src/graphicsmagick.mk
@@ -4,10 +4,10 @@ PKG             := graphicsmagick
 $(PKG)_WEBSITE  := http://www.graphicsmagick.org/
 $(PKG)_DESCR    := GraphicsMagick
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.21
-$(PKG)_CHECKSUM := 9045304d991776b6a37e1b45b9b6ef152593ada0d49bc744263565617cbf3c1f
+$(PKG)_VERSION  := 1.3.32
+$(PKG)_CHECKSUM := 44d866d39af7574cf6246a6e246cb5888b232a8c5721b3d0e146a96cbb37d4a4
 $(PKG)_SUBDIR   := GraphicsMagick-$($(PKG)_VERSION)
-$(PKG)_FILE     := GraphicsMagick-$($(PKG)_VERSION).tar.xz
+$(PKG)_FILE     := GraphicsMagick-$($(PKG)_VERSION).tar.lz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc bzip2 freetype jasper jpeg lcms libltdl libpng libxml2 pthreads tiff zlib