vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <h...@beauzee.fr> | Tue Jan 15 15:03:35 2019 +0100| [fff4b16979803b38f8520b2bf83d45ae9a1d1833] | committer: Hugo Beauzée-Luyssen
contrib: libass depends on iconv Or rather, it can be built without it, but not depending on it can cause an indeterministic build, with sometimes an iconv enabled libass, and sometimes an non-iconv libass build. On some other occasions, it can also fail: - libiconv.a gets installed early on - libass then determines that it can use it, regardless of iconv.h - libass starts building - ass.c iconv code fails to build due to missing iconv.h - iconv.h gets installed afterward, but the build failed already (cherry picked from commit b6aa8c2f0b206790c8569e450b8fa66bc77a9032) Signed-off-by: Hugo Beauzée-Luyssen <h...@beauzee.fr> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=fff4b16979803b38f8520b2bf83d45ae9a1d1833 --- contrib/src/ass/rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak index 25c3893ab3..e5b0a31aeb 100644 --- a/contrib/src/ass/rules.mak +++ b/contrib/src/ass/rules.mak @@ -51,7 +51,7 @@ endif $(UPDATE_AUTOCONFIG) $(MOVE) -DEPS_ass = freetype2 $(DEPS_freetype2) fribidi +DEPS_ass = freetype2 $(DEPS_freetype2) fribidi iconv $(DEPS_iconv) ifneq ($(WITH_FONTCONFIG), 0) DEPS_ass += fontconfig $(DEPS_fontconfig) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
