From 29008ee2bd913a2555e017bc1d858727b0d116c7 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 20 Oct 2013 17:02:10 +1100
Subject: update package gd

---
 src/gd-1-libpng15.patch | 17 -----------------
 src/gd.mk               | 34 +++++++++++-----------------------
 2 files changed, 11 insertions(+), 40 deletions(-)
 delete mode 100644 src/gd-1-libpng15.patch

diff --git a/src/gd-1-libpng15.patch b/src/gd-1-libpng15.patch
deleted file mode 100644
index 5c4af61..0000000
--- a/src/gd-1-libpng15.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-This patch has been taken from:
-http://bugs.gentoo.org/show_bug.cgi?id=305101
-http://repos.archlinux.org/wsvn/packages/gd/trunk/libpng14.patch
-
---- a/gd_png.c
-+++ b/gd_png.c
-@@ -149,7 +149,7 @@
- 	return NULL;
-   }
- 
--	if (!png_check_sig (sig, 8)) { /* bad signature */
-+	if (png_sig_cmp (sig, 0, 8)) { /* bad signature */
-     	return NULL;		/* bad signature */
- 	}
diff --git a/src/gd.mk b/src/gd.mk
index 28d50bd..747313d 100644
--- a/src/gd.mk
+++ b/src/gd.mk
@@ -3,44 +3,32 @@
 
 PKG             := gd
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.0.35
-$(PKG)_CHECKSUM := ccf34a610abff2dbf133a20c4d2a4aa94939018a
-$(PKG)_SUBDIR   := gd-$($(PKG)_VERSION)
-$(PKG)_FILE     := gd-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://www.libgd.org/releases/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc freetype libpng jpeg libxml2 pthreads
+$(PKG)_VERSION  := 2.1.0
+$(PKG)_CHECKSUM := 66c56fc07246b66ba649c83e996fd2085ea2f9e2
+$(PKG)_SUBDIR   := libgd-$($(PKG)_VERSION)
+$(PKG)_FILE     := libgd-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := https://bitbucket.org/libgd/gd-libgd/downloads/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc fontconfig freetype jpeg libpng libvpx pthreads tiff
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package gd.' >&2;
-    echo $(gd_VERSION)
-endef
-define $(PKG)_UPDATE_orig
-    $(WGET) -q -O- 'http://www.libgd.org/releases/' | \
-    $(SED) -n 's,.*gd-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    $(WGET) -q -O- 'https://bitbucket.org/libgd/gd-libgd/downloads/' | \
+    $(SED) -n 's,.*libgd-\([0-9.]*\)\.tar.*,\1,p' | \
     head -1
 endef
 
 define $(PKG)_BUILD
-    touch '$(1)/aclocal.m4'
-    touch '$(1)/config.hin'
-    touch '$(1)/Makefile.in'
-    $(SED) -i 's,-I@includedir@,-I@includedir@ -DNONDLL,' '$(1)/config/gdlib-config.in'
-    $(SED) -i 's,-lX11 ,,g'     '$(1)/configure'
-    $(SED) -i 's,png12,png16,g' '$(1)/configure'
+    $(SED) -i 's,-I@includedir@,-I@includedir@ -DNONDLL -DBGDWIN32,' '$(1)/config/gdlib-config.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-freetype='$(PREFIX)/$(TARGET)' \
         --without-x \
-        LIBPNG_CONFIG='$(PREFIX)/$(TARGET)/bin/libpng-config' \
-        CFLAGS='-DNONDLL -DXMD_H -L$(PREFIX)/$(TARGET)/lib' \
-        LIBS="`$(PREFIX)/$(TARGET)/bin/xml2-config --libs`"
+        CFLAGS='-DNONDLL'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gd.exe' \
-        `'$(PREFIX)/$(TARGET)/bin/gdlib-config' --cflags` \
-        -lgd `'$(PREFIX)/$(TARGET)/bin/gdlib-config' --libs`
+        `'$(PREFIX)/$(TARGET)/bin/gdlib-config' --cflags --libs`
 endef
-- 
cgit v0.12