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 (file)
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 fb4b888c4252348f28eca075ca014fffd3c54dfb..bdfc792d908974c3d13937f62ce7882ccec6fe56 100755 (executable)
--- 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 ced0c953f4ce7acb51f3d79ad771cd48992c45f6..6a99d42b7f019a79065994cc8490220af262da58 100755 (executable)
--- 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 00c92fbb788ae57e26e0ba85eb683a0cba9f5ec5..3d7bd7ca6cc91576b0a8f2c974cb1e444ab87fd0 100644 (file)
--- 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