summaryrefslogtreecommitdiff
path: root/package/libgd
diff options
context:
space:
mode:
Diffstat (limited to 'package/libgd')
-rw-r--r--package/libgd/Makefile12
-rw-r--r--package/libgd/patches/patch-gd_io_h10
-rw-r--r--package/libgd/patches/patch-src_gd_bmp_c11
3 files changed, 18 insertions, 15 deletions
diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index 4e6105e70..e4d913beb 100644
--- a/package/libgd/Makefile
+++ b/package/libgd/Makefile
@@ -3,19 +3,21 @@
include ${TOPDIR}/rules.mk
-PKG_NAME:= gd
-PKG_VERSION:= 2.0.35
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 982963448dc36f20cb79b6e9ba6fdede
+PKG_NAME:= libgd
+PKG_VERSION:= 2.1.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 03588159bf4faab9079849c8d709acc6
PKG_DESCR:= A library for the dynamic creation of images
PKG_SECTION:= libs
PKG_DEPENDS:= libjpeg libpng
PKG_BUILDDEP:= libpng jpeg
PKG_URL:= http://www.libgd.org/
-PKG_SITES:= http://www.libgd.org/releases/
+PKG_SITES:= https://bitbucket.org/libgd/gd-libgd/downloads/
PKG_LIBNAME:= libgd
PKG_OPTS:= dev
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libgd/patches/patch-gd_io_h b/package/libgd/patches/patch-gd_io_h
deleted file mode 100644
index 1d083673c..000000000
--- a/package/libgd/patches/patch-gd_io_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- gd-2.0.36.orig/gd_io.h 2007-11-27 09:30:34.000000000 +0100
-+++ gd-2.0.36/gd_io.h 2012-10-14 16:10:30.000000000 +0200
-@@ -26,6 +26,7 @@ typedef struct gdIOCtx
-
- void (*gd_free) (struct gdIOCtx *);
-
-+ void *data;
- }
- gdIOCtx;
-
diff --git a/package/libgd/patches/patch-src_gd_bmp_c b/package/libgd/patches/patch-src_gd_bmp_c
new file mode 100644
index 000000000..cfbffca74
--- /dev/null
+++ b/package/libgd/patches/patch-src_gd_bmp_c
@@ -0,0 +1,11 @@
+--- libgd-2.1.0.orig/src/gd_bmp.c 2013-06-25 11:58:23.000000000 +0200
++++ libgd-2.1.0/src/gd_bmp.c 2013-12-08 16:23:11.000000000 +0100
+@@ -792,7 +792,7 @@ static int bmp_read_1bit(gdImagePtr im,
+ }
+
+ /* The line must be divisible by 4, else its padded with NULLs */
+- padding = ((int)ceill(0.1 * info->width)) % 4;
++ padding = ((int)ceil(0.1 * info->width)) % 4;
+ if (padding) {
+ padding = 4 - padding;
+ }