Commit c7ccd77d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: update libass to 0.13.2

parent 02d5157b
f6776cea3c7b9e47d1f275c7c66b4a6caef7cf25e69c7b4fa8d96474065ac34592cccbf76efb371abed3a353184ffd5b6888a7b6403d378305a60a37a034f67a libass-0.13.0.tar.gz
cb90ab042f23c81d905a9bb1fd57c15133ba10ff3d0fb0afbfe09322016e0163419cc872095e4a73738d8ff27d80935bad0840cc5865f2720c55e8af3af41834 libass-0.13.2.tar.gz
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_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
@@ -214,6 +215,13 @@
# 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])
+ if test x$ac_cv_search_libiconv_open != x'none required' &&
+ test x$ac_cv_search_iconv_open != x'none required'; then
+ pkg_libs="${pkg_libs} -liconv"
+ fi
+fi
pkg_requires="freetype2 >= 9.10.3"
pkg_requires="fribidi >= 0.19.0, ${pkg_requires}"
if test x$fontconfig = xtrue; then
# ASS
ASS_VERSION := 0.13.0
ASS_VERSION := 0.13.2
ASS_URL := https://github.com/libass/libass/releases/download/$(ASS_VERSION)/libass-$(ASS_VERSION).tar.gz
PKGS += ass
......@@ -42,7 +42,6 @@ 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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment