vlc | branch: master | Martin Storsjö <mar...@martin.st> | Sat Jun 23 00:39:14 2018 +0300| [f942eac0d25cb6921324ffa1b3c7d7436a27cf5f] | committer: Martin Storsjö
contrib: lame: Avoid the dependency on gettext Modify configure.in before reconfiguring, to avoid requiring the dependency on gettext. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f942eac0d25cb6921324ffa1b3c7d7436a27cf5f --- contrib/src/lame/rules.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/src/lame/rules.mak b/contrib/src/lame/rules.mak index f4c4b1d1bb..45186e2505 100644 --- a/contrib/src/lame/rules.mak +++ b/contrib/src/lame/rules.mak @@ -3,9 +3,6 @@ LAME_VERSION := 3.99.5 LAME_URL := $(SF)/lame/lame-$(LAME_VERSION).tar.gz -# gettext is necessary for $(RECONF) of lame -DEPS_lame = gettext - $(TARBALLS)/lame-$(LAME_VERSION).tar.gz: $(call download_pkg,$(LAME_URL),lame) @@ -16,6 +13,9 @@ lame: lame-$(LAME_VERSION).tar.gz .sum-lame $(APPLY) $(SRC)/lame/lame-forceinline.patch $(APPLY) $(SRC)/lame/sse.patch $(APPLY) $(SRC)/lame/lame-outdated-autotools.patch + # Avoid relying on iconv.m4 from gettext, when reconfiguring. + # This is only used by the frontend which we disable. + cd $(UNPACK_DIR) && sed -i.orig 's/^AM_ICONV/#&/' configure.in $(UPDATE_AUTOCONFIG) $(MOVE) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
