From 32b8772ca7061c1c26ec499c4cbf1a7bf5f1073c Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Tue, 2 Mar 2010 00:22:40 +0100
Subject: gd: Upgrade from 2.0.33 to 2.0.36RC1

* Move the checksums into the recipe
* Pick 2.0.35+2.0.36rc1 as the name to remain easily upgradable
* This should resolve:
    http://portaudit.FreeBSD.org/6e099997-25d8-11dc-878b-000c29c5647f.html
    http://portaudit.FreeBSD.org/4e8344a3-ca52-11de-8ee8-00215c6a37bb.html
---
 conf/checksums.ini                |  4 ----
 recipes/gd/gd_2.0.33.bb           | 30 ------------------------------
 recipes/gd/gd_2.0.35+2.0.36rc1.bb | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 34 deletions(-)
 delete mode 100644 recipes/gd/gd_2.0.33.bb
 create mode 100644 recipes/gd/gd_2.0.35+2.0.36rc1.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index ac4aeaa79a..06517288cb 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -8454,10 +8454,6 @@ sha256=c3b8b7b57019927dad40870c379eecfa6389443f7e2096aa0157a0224d400da1
 md5=e1a41daf3bfc221afaf56751dc506f95
 sha256=e6bff5c00d7d93bade78535573494673f581118c38a8ca13c3afd63809335ba0
 
-[http://www.boutell.com/gd/http/gd-2.0.33.tar.gz]
-md5=be0a6d326cd8567e736fbc75df0a5c45
-sha256=2ba10c830e24781ec2e0594c6e49353e512e8bda782bc9a1851e70a5e8ced93e
-
 [http://downloads.sourceforge.net/gdado/gdado-2.2.tar.gz]
 md5=b84114df6ca8b20560524afed0e21b25
 sha256=cc272f097832e074804bf405f2c013b4f941ad57f0f5f5ec6c08edecc9ad17fa
diff --git a/recipes/gd/gd_2.0.33.bb b/recipes/gd/gd_2.0.33.bb
deleted file mode 100644
index 7e47b0883e..0000000000
--- a/recipes/gd/gd_2.0.33.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SECTION = "libs"
-LICENSE = "GD"
-DESCRIPTION = "gd is a library used to create PNG, JPEG, or WBMP images."
-DEPENDS = "libpng jpeg zlib"
-PR = "r2"
-
-SRC_URI = "http://www.boutell.com/gd/http/gd-${PV}.tar.gz"
-S = "${WORKDIR}/gd-${PV}"
-
-inherit autotools binconfig gettext
-
-EXTRA_OECONF += " --with-zlib=${STAGING_LIBDIR}/.. \
-                  --with-png=${STAGING_LIBDIR}/.. \
-                  --with-jpeg=${STAGING_LIBDIR}/.. \
-                  --without-freetype \
-                  --without-fontconfig \
-                  --without-xpm \
-                  --without-x"
-
-EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"'
-
-headers = "gd.h gdcache.h gd_io.h gdfx.h gdfontmb.h \
-	   gdfontg.h gdfontl.h gdfonts.h gdfontt.h"
-
-do_stage () {
-	oe_libinstall -so -a libgd ${STAGING_LIBDIR}/
-	for i in ${headers}; do
-		install -m 0644 $i ${STAGING_INCDIR}/
-	done
-}
diff --git a/recipes/gd/gd_2.0.35+2.0.36rc1.bb b/recipes/gd/gd_2.0.35+2.0.36rc1.bb
new file mode 100644
index 0000000000..efba70e9d5
--- /dev/null
+++ b/recipes/gd/gd_2.0.35+2.0.36rc1.bb
@@ -0,0 +1,33 @@
+SECTION = "libs"
+LICENSE = "GD"
+DESCRIPTION = "gd is a library used to create PNG, JPEG, or WBMP images."
+DEPENDS = "libpng jpeg zlib"
+PR = "r2"
+
+SRC_URI = "http://www.libgd.org/releases/gd-2.0.36RC1.tar.gz;name=src"
+SRC_URI[src.md5sum] = "39ac48e6d5e0012a3bd2248a0102f209"
+SRC_URI[src.sha256sum] = "dd7c1795271221b9237769b96b8cec7fbdc5db7b8954d864ead51fc1296a6ac8"
+
+S = "${WORKDIR}/gd-2.0.36RC1"
+
+inherit autotools binconfig gettext
+
+EXTRA_OECONF += " --with-zlib=${STAGING_LIBDIR}/.. \
+                  --with-png=${STAGING_LIBDIR}/.. \
+                  --with-jpeg=${STAGING_LIBDIR}/.. \
+                  --without-freetype \
+                  --without-fontconfig \
+                  --without-xpm \
+                  --without-x"
+
+EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"'
+
+headers = "gd.h gdcache.h gd_io.h gdfx.h gdfontmb.h \
+	   gdfontg.h gdfontl.h gdfonts.h gdfontt.h"
+
+do_stage () {
+	oe_libinstall -so -a libgd ${STAGING_LIBDIR}/
+	for i in ${headers}; do
+		install -m 0644 $i ${STAGING_INCDIR}/
+	done
+}
-- 
cgit v1.2.3