From 4bc79b38f1e8279e0ce75c46e24190bcf4d0669b Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sun, 6 Sep 2020 15:11:53 +0200
Subject: [PATCH] giflib: update to 5.2.1

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/graphics/giflib/package.mk           | 19 ++++++-----
 ...giflib-01-fix-reallocarray-exception.patch | 34 -------------------
 .../giflib/patches/giflib-01-static-lib.patch | 12 +++++++
 3 files changed, 23 insertions(+), 42 deletions(-)
 delete mode 100644 packages/graphics/giflib/patches/giflib-01-fix-reallocarray-exception.patch
 create mode 100644 packages/graphics/giflib/patches/giflib-01-static-lib.patch

diff --git a/packages/graphics/giflib/package.mk b/packages/graphics/giflib/package.mk
index 7da0497bb4..f424b10df7 100644
--- a/packages/graphics/giflib/package.mk
+++ b/packages/graphics/giflib/package.mk
@@ -2,18 +2,21 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 
 PKG_NAME="giflib"
-PKG_VERSION="5.1.4"
-PKG_SHA256="df27ec3ff24671f80b29e6ab1c4971059c14ac3db95406884fc26574631ba8d5"
+PKG_VERSION="5.2.1"
+PKG_SHA256="31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd"
 PKG_LICENSE="OSS"
 PKG_SITE="http://giflib.sourceforge.net/"
-PKG_URL="$SOURCEFORGE_SRC/giflib/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$SOURCEFORGE_SRC/giflib/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_HOST="zlib:host"
 PKG_DEPENDS_TARGET="toolchain zlib"
 PKG_LONGDESC="giflib: giflib service library"
+PKG_TOOLCHAIN="manual"
 
-PKG_CONFIGURE_OPTS_HOST="--disable-shared --enable-static"
-PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX"
-
-post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
+make_host() {
+  make libgif.a CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+makeinstall_host() {
+  make install-include PREFIX="${TOOLCHAIN}"
+  make install-lib PREFIX="${TOOLCHAIN}"
 }
diff --git a/packages/graphics/giflib/patches/giflib-01-fix-reallocarray-exception.patch b/packages/graphics/giflib/patches/giflib-01-fix-reallocarray-exception.patch
deleted file mode 100644
index f2158c66cf..0000000000
--- a/packages/graphics/giflib/patches/giflib-01-fix-reallocarray-exception.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/lib/dgif_lib.c
-+++ b/lib/dgif_lib.c
-@@ -23,6 +23,8 @@
- #include "gif_lib.h"
- #include "gif_lib_private.h"
- 
-+extern void *reallocarray(void *optr, size_t nmemb, size_t size);
-+
- /* compose unsigned little endian value */
- #define UNSIGNED_LITTLE_ENDIAN(lo, hi)	((lo) | ((hi) << 8))
- 
---- a/lib/gif_lib.h
-+++ b/lib/gif_lib.h
-@@ -244,9 +244,6 @@
-                                      GifPixelType ColorTransIn2[]);
- extern int GifBitSize(int n);
- 
--extern void *
--reallocarray(void *optr, size_t nmemb, size_t size);
--
- /******************************************************************************
-  Support for the in-core structures allocation (slurp mode).              
- ******************************************************************************/
---- a/lib/gifalloc.c
-+++ b/lib/gifalloc.c
-@@ -10,6 +10,8 @@
- 
- #include "gif_lib.h"
- 
-+extern void *reallocarray(void *optr, size_t nmemb, size_t size);
-+
- #define MAX(x, y)    (((x) > (y)) ? (x) : (y))
- 
- /******************************************************************************
diff --git a/packages/graphics/giflib/patches/giflib-01-static-lib.patch b/packages/graphics/giflib/patches/giflib-01-static-lib.patch
new file mode 100644
index 0000000000..a5b0ebce3b
--- /dev/null
+++ b/packages/graphics/giflib/patches/giflib-01-static-lib.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -99,9 +99,6 @@
+ install-lib:
+ 	$(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
+ 	$(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"
+-	$(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
+-	ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)"
+-	ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so"
+ install-man:
+ 	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
+ 	$(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1"