[vlc-commits] Contribs: fix libass linking to iconv

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Oct 22 17:56:46 2015 +0200| [19a1780581a89a46d393df7e1976fba4c7debd46] | committer: Jean-Baptiste Kempf

Contribs: fix libass linking to iconv

(cherry picked from commit ed96e803fc9b2be4e05a745d9f589b1e50c4e186)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=19a1780581a89a46d393df7e1976fba4c7debd46
---

 contrib/src/ass/e572a26.patch |   36 ++++++++++++++++++++++++++++++++++++
 contrib/src/ass/rules.mak     |    1 +
 2 files changed, 37 insertions(+)

diff --git a/contrib/src/ass/e572a26.patch b/contrib/src/ass/e572a26.patch
new file mode 100644
index 0000000..9c0f8bb
--- /dev/null
+++ b/contrib/src/ass/e572a26.patch
@@ -0,0 +1,36 @@
+From e572a26d29ddff883880ef7b1c295acaa62a8a2f Mon Sep 17 00:00:00 2001
+From: wm4 <wm4 at nowhere>
+Date: Tue, 13 Oct 2015 22:18:30 +0200
+Subject: [PATCH] configure: include -liconv if that is found
+
+---
+ configure.ac | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d6fbe34..6bd96b6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,8 +22,9 @@ AC_CHECK_HEADERS([stdint.h iconv.h])
+ AC_CHECK_FUNCS([strdup strndup])
+ 
+ # Checks for libraries.
+-AC_SEARCH_LIBS([libiconv_open], [iconv], AC_DEFINE(CONFIG_ICONV, 1, [use iconv]))
+-AC_SEARCH_LIBS([iconv_open], [iconv], AC_DEFINE(CONFIG_ICONV, 1, [use iconv]))
++use_libiconv=false
++AC_SEARCH_LIBS([libiconv_open], [iconv], use_libiconv=true)
++AC_SEARCH_LIBS([iconv_open], [iconv], use_libiconv=true)
+ AC_CHECK_LIB([m], [fabs])
+ 
+ # Check for libraries via pkg-config
+@@ -220,6 +221,10 @@ AM_CONDITIONAL([ENABLE_PROFILE], [test x$enable_profile = xyes])
+ 
+ # add libraries/packages to pkg-config for static linking
+ pkg_libs="-lm"
++if test "$use_libiconv" = true; then
++    AC_DEFINE(CONFIG_ICONV, 1, [use iconv])
++    pkg_libs="${pkg_libs} -liconv"
++fi
+ pkg_requires="freetype2 >= 9.10.3"
+ pkg_requires="fribidi >= 0.19.0, ${pkg_requires}"
+ if test x$fontconfig = xtrue; then
diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index adb5d00..2873026 100644
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -34,6 +34,7 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass
 	$(UNPACK)
 	$(APPLY) $(SRC)/ass/ass-macosx.patch
 	$(APPLY) $(SRC)/ass/ass-solaris.patch
+	$(APPLY) $(SRC)/ass/e572a26.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)