contribs: fix FFmpeg target when building ARM

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ce4574d2090fa392aa61ef33bf69264168ef5efd..ff8eab463daeac1879878cfb4b85dc00c23a5c09 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -169,6 +169,7 @@ FFMPEGCONF+= --enable-libamr-nb --enable-libamr-wb --enable-nonfree
 endif
 
 ifdef HAVE_LINUX
+FFMPEGCONF+= --target-os=linux
 ifdef HAVE_MAEMO
 ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),)
 FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8
@@ -1112,7 +1113,11 @@ else
 ifdef HAVE_UCLIBC
 .ffmpeg: ffmpeg
 else
-.ffmpeg: ffmpeg .lame .gsm .libvpx
+ifeq ($(ARCH),armel)
+.ffmpeg: ffmpeg .lame .gsm .zlib
+else
+.ffmpeg: ffmpeg .lame .gsm .libvpx .zlib
+endif
 endif
 endif
        (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DHAVE_STDINT_H" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
@@ -1614,10 +1619,11 @@ zlib-$(ZLIB_VERSION).tar.gz:
 
 zlib: zlib-$(ZLIB_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/zlib.patch
+       patch -p0 < Patches/zlib-wince.patch
+       patch -p0 < Patches/zlib-static.patch
 
 .zlib: zlib
-       (cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make install)
+       (cd zlib; $(HOSTCC) ./configure --prefix=$(PREFIX) --static && make install)
        $(INSTALL_NAME)
        touch $@