From 7367856ad21325fc522e1a48f53cb55159cbbc00 Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Sat, 11 Jan 2020 12:18:49 +0100
Subject: [PATCH] bump version libiconv-1.16 and fix download link

---
 make/archives.mk  |  4 ++--
 make/libraries.mk | 22 +++++++++++++++-------
 make/versions.mk  |  3 +++
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/make/archives.mk b/make/archives.mk
index 09fd6af..ed45149 100755
--- 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 a7d696b..594101d 100755
--- 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 e040fa4..3fb1056 100644
--- 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
 
-- 
2.39.5