From: Markham <markham001@gmx.de>
Date: Sun, 24 Feb 2019 12:16:13 +0000 (+0100)
Subject: bump version giflib-5.1.6
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=4a9186948eb42af5fc23731ba785ed01538dd282;p=bs-cst-neutrino-hd.git

bump version giflib-5.1.6
---

diff --git a/archive-patches/giflib_no_docs.diff b/archive-patches/giflib_no_docs.diff
new file mode 100644
index 0000000..60d61dd
--- /dev/null
+++ b/archive-patches/giflib_no_docs.diff
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -61,7 +61,7 @@
+ LDLIBS=libgif.a -lm
+ 
+ all: libgif.so libgif.a $(UTILS)
+-	$(MAKE) -C doc
++
+ 
+ $(UTILS):: libgif.a
+ 
diff --git a/make/archives.mk b/make/archives.mk
index fb4b888..bdfc792 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -27,8 +27,8 @@ $(ARCHIVE)/libid3tag-0.15.1b.tar.gz:
 $(ARCHIVE)/libungif-4.1.4.tar.bz2:
 	$(WGET) http://www.fhloston-paradise.de/libungif-4.1.4.tar.bz2
 
-$(ARCHIVE)/giflib-$(GIFLIB_VER).tar.bz2:
-	$(WGET) http://sourceforge.net/projects/giflib/files/$(notdir $@)
+$(ARCHIVE)/giflib-$(GIFLIB_VER).tar.gz:
+	$(WGET) https://sourceforge.net/projects/giflib/files/$(notdir $@)
 
 $(ARCHIVE)/curl-$(CURL_VER).tar.bz2:
 	$(WGET) http://curl.haxx.se/download/$(lastword $(subst /, ,$@))
diff --git a/make/libraries.mk b/make/libraries.mk
index ced0c95..6a99d42 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -383,32 +383,20 @@ $(D)/libdvdcss: $(ARCHIVE)/libdvdcss-$(LIBDVDCSS_VER).tar.bz2 | $(TARGETPREFIX)
 	$(REMOVE)/libdvdcss-$(LIBDVDCSS_VER)
 	$(TOUCH)
 
-$(D)/giflib: $(ARCHIVE)/giflib-$(GIFLIB_VER).tar.bz2 | $(TARGETPREFIX)
+$(D)/giflib: $(ARCHIVE)/giflib-$(GIFLIB_VER).tar.gz | $(TARGETPREFIX)
 	$(START_BUILD)
-	$(UNTAR)/giflib-$(GIFLIB_VER).tar.bz2
+	$(UNTAR)/giflib-$(GIFLIB_VER).tar.gz
 	pushd $(BUILD_TMP)/giflib-$(GIFLIB_VER) && \
-		export ac_cv_prog_have_xmlto=no && \
-		$(CONFIGURE) --prefix= --build=$(BUILD) --host=$(TARGET) --bindir=/.remove && \
-		$(MAKE) all && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+		$(PATCH)/giflib_no_docs.diff; \
+		$(MAKE) CC=$(TARGET)-gcc all && \
+		$(MAKE) install DESTDIR=$(TARGETPREFIX) \
+			PREFIX= \
+			BINDIR=/.remove \
+			MANDIR=/.remove
 	$(REWRITE_LIBTOOL)/libgif.la
 	$(REMOVE)/giflib-$(GIFLIB_VER)
 	$(TOUCH)
 
-$(D)/libungif: $(ARCHIVE)/libungif-4.1.4.tar.bz2 | $(TARGETPREFIX)
-	$(START_BUILD)
-	$(UNTAR)/libungif-4.1.4.tar.bz2
-	pushd $(BUILD_TMP)/libungif-4.1.4 && \
-		rm config.sub && \
-		rm config.guess && \
-		./autogen.sh && \
-		$(CONFIGURE) --prefix= --build=$(BUILD) --host=$(TARGET) --without-x --bindir=/.remove && \
-		$(MAKE) all && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
-	$(REWRITE_LIBTOOL)/libungif.la
-	$(REMOVE)/libungif-4.1.4
-	$(TOUCH)
-
 $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz | $(TARGETPREFIX)
 	$(START_BUILD)
 	$(UNTAR)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz
diff --git a/make/versions.mk b/make/versions.mk
index 00c92fb..3d7bd7c 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -38,7 +38,7 @@ GDB_VER=8.0.1
 GETTEXT_VER = 0.19.8.1
 
 # giflib: converting images replaces libungif
-GIFLIB_VER=5.1.4
+GIFLIB_VER=5.1.6
 
 # curl; command line tool for transferring data with URL syntax
 CURL_VER = 7.64.0