Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
ed96e803
Commit
ed96e803
authored
Oct 22, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: fix libass linking to iconv
parent
20502daa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
0 deletions
+37
-0
contrib/src/ass/e572a26.patch
contrib/src/ass/e572a26.patch
+36
-0
contrib/src/ass/rules.mak
contrib/src/ass/rules.mak
+1
-0
No files found.
contrib/src/ass/e572a26.patch
0 → 100644
View file @
ed96e803
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
contrib/src/ass/rules.mak
View file @
ed96e803
...
@@ -39,6 +39,7 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass
...
@@ -39,6 +39,7 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass
$(UNPACK)
$(UNPACK)
$(APPLY)
$(SRC)
/ass/ass-macosx.patch
$(APPLY)
$(SRC)
/ass/ass-macosx.patch
$(APPLY)
$(SRC)
/ass/ass-solaris.patch
$(APPLY)
$(SRC)
/ass/ass-solaris.patch
$(APPLY)
$(SRC)
/ass/e572a26.patch
$(UPDATE_AUTOCONFIG)
$(UPDATE_AUTOCONFIG)
$(MOVE)
$(MOVE)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment