[vlc-devel] [vlc-commits] Contribs: fix zvbi compilation for Android

[Felix Paul Kühne]

Hey J-B,

> On 10.12.2014, at 22:14, Jean-Baptiste Kempf <git at videolan.org> wrote:
> 
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Dec 10 22:13:45 2014 +0100| [be0c8c647577b61574bd212c5afb1d7992e89236] | committer: Jean-Baptiste Kempf
> 
> Contribs: fix zvbi compilation for Android
> 
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=be0c8c647577b61574bd212c5afb1d7992e89236
> ---
> 
> contrib/src/zvbi/rules.mak          |    8 +++++---
> contrib/src/zvbi/zvbi-android.patch |   37 +++++++++++++++++++++++++++++++++++
> 2 files changed, 42 insertions(+), 3 deletions(-)
> 
> diff --git a/contrib/src/zvbi/rules.mak b/contrib/src/zvbi/rules.mak
> index 5c866a8..aac57f4 100644
> --- a/contrib/src/zvbi/rules.mak
> +++ b/contrib/src/zvbi/rules.mak
> @@ -23,6 +23,9 @@ endif
> ifdef HAVE_DARWIN_OS
> 	$(APPLY) $(SRC)/zvbi/zvbi-fix-clang-support.patch
> endif
> +ifdef HAVE_ANDROID
> +	$(APPLY) $(SRC)/zvbi/zvbi-android.patch
> +endif
> 	$(MOVE)
> 
> DEPS_zvbi = pthreads iconv $(DEPS_iconv)
> @@ -33,6 +36,7 @@ ZVBICONF := \
> 	--disable-nls --disable-proxy \
> 	--without-doxygen \
> 	$(HOSTCONF)
> +
> ifdef HAVE_MACOSX
> ZVBI_CFLAGS += -fnested-functions
> endif
> @@ -41,10 +45,8 @@ ZVBI_CFLAGS += -DPTW32_STATIC_LIB
> endif
> 
> .zvbi: zvbi
> -	 $(UPDATE_AUTOCONFIG)
> -ifdef HAVE_WIN32
> +	$(UPDATE_AUTOCONFIG)
> 	$(RECONF)
> -endif

Why are you removing the HAVE_WIN32 here? This adds a build system dependency of gettext, which is not desirable when compiling for iOS.

Is RECONF actually needed? To succeed in compiling for iOS and OS X, UPDATE_AUTOCONFIG is absolutely sufficient.. Maybe add a ifndef HAVE_DARWIN_OS here?

Best regards,

Felix