bump version libiconv-1.16 and fix download link

diff --git a/make/archives.mk b/make/archives.mk
index 09fd6afe4d245e21a0c1248f5983f575a516858a..ed45149a5a984860e50bd13a1029242aea61626f 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -18,8 +18,8 @@ $(ARCHIVE)/libass-$(LIBASS_VER).tar.xz:
 $(ARCHIVE)/libmad-0.15.1b.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/libmad-0.15.1b.tar.gz
 
-$(ARCHIVE)/libiconv-1.14.tar.gz:
-       $(WGET) http://www.fhloston-paradise.de/libiconv-1.14.tar.gz
+$(ARCHIVE)/libiconv-$(LIBICONV_VER).tar.gz:
+       $(WGET) https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(LIBICONV_VER).tar.gz
 
 $(ARCHIVE)/libid3tag-0.15.1b.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/libid3tag-0.15.1b.tar.gz

diff --git a/make/libraries.mk b/make/libraries.mk
index a7d696b0a955f4d70947dbeed8ad103f74a04438..594101d5521b2b7550d9d31d6b779329602da22d 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -854,17 +854,25 @@ $(D)/libopenthreads: $(ARCHIVE)/OpenThreads-$(LIBOPENTHREADS_VER).tar.gz | $(TAR
        $(REMOVE)/OpenThreads-$(LIBOPENTHREADS_VER)
        $(TOUCH)
 
-$(D)/libiconv: $(ARCHIVE)/libiconv-1.14.tar.gz | $(TARGETPREFIX)
+$(D)/libiconv: $(ARCHIVE)/libiconv-$(LIBICONV_VER).tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
-       $(UNTAR)/libiconv-1.14.tar.gz
-       pushd $(BUILD_TMP)/libiconv-1.14 && \
-               $(PATCH)/libiconv-1-fixes.patch && \
-               $(CONFIGURE) --build=$(BUILD) --host=$(TARGET) --target=$(TARGET) --prefix= --datarootdir=/.remove && \
-               $(MAKE) && \
+       $(UNTAR)/libiconv-$(LIBICONV_VER).tar.gz
+       pushd $(BUILD_TMP)/libiconv-$(LIBICONV_VER) && \
+               sed -i -e '/preload/d' Makefile.in; \
+               $(CONFIGURE) CPPFLAGS="$(TARGET_CPPFLAGS) -fPIC" \
+                       --target=$(TARGET) \
+                       --prefix= \
+                       --datarootdir=/.remove \
+                       --enable-static \
+                       --disable-shared \
+                       --enable-relocatable \
+                       ; \
+               $(MAKE); \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
        rm -fr $(TARGETPREFIX)/lib/preloadable_libiconv.so
-       $(REMOVE)/libiconv-1.14
+       $(REWRITE_LIBTOOL)/libcharset.la
        $(REWRITE_LIBTOOL)/libiconv.la
+       $(REMOVE)/libiconv-$(LIBICONV_VER)
        $(TOUCH)
 
 $(D)/libusb: $(ARCHIVE)/libusb-$(LIBUSB_VER).tar.bz2 | $(TARGETPREFIX)

diff --git a/make/versions.mk b/make/versions.mk
index e040fa474723fb55fea76ed9ba1c952a05c2c1b2..3fb10562f97447b620ee484dcb3544f13c1e25c4 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -208,6 +208,9 @@ LIBOGG_VER = 1.3.3
 # libvorbis is an Ogg Vorbis audio decoder (also known as "tremor"), implemented with no floating point arithmetic. This makes it particularly amenable to use on systems which lack floating point hardware
 LIBVORBIS_VER = 1.3.6
 
+# Libiconv is the library that allows you to convert data from one encoding into another
+LIBICONV_VER = 1.16
+
 # openthreads; an object-oriented thread interface for C++ programmers
 LIBOPENTHREADS_VER=3.2