diff options
| author |   Eric Hameleers <alien@slackware.com> | 2016-02-13 00:10:26 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2016-02-13 00:10:26 +0000 |
| commit | c9cbf856f1789f4394d46138373ef6d97c4a7776 (patch) | |
| tree | 5b2066281b13b00558bb914cd33ad8d534e8bce3 /vlc/build/libass_fix_iconv.patch | |
| parent | e23630c6d2e5ef9f361f9fb569a0b2ba10990388 (diff) | |
| download | asb-c9cbf856f1789f4394d46138373ef6d97c4a7776.tar.gz asb-c9cbf856f1789f4394d46138373ef6d97c4a7776.tar.xz | |
Initial revision
Diffstat (limited to 'vlc/build/libass_fix_iconv.patch')
| -rw-r--r-- | vlc/build/libass_fix_iconv.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/vlc/build/libass_fix_iconv.patch b/vlc/build/libass_fix_iconv.patch new file mode 100644 index 00000000..419e38e8 --- /dev/null +++ b/vlc/build/libass_fix_iconv.patch @@ -0,0 +1,38 @@ +Downloaded from http://git.videolan.org/?p=vlc/vlc-2.2.git;a=blob_plain;f=contrib/src/ass/e572a26.patch;hb=HEAD + +From e572a26d29ddff883880ef7b1c295acaa62a8a2f Mon Sep 17 00:00:00 2001 +From: wm4 <wm4@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 |