Commit 85fadc92 authored by Rafaël Carré's avatar Rafaël Carré

contribs: fix FFmpeg target when building ARM

Specify --target-os=linux when HAVE_LINUX is 1
Don't depend on libvpx on armel
parent df6818dd
...@@ -169,6 +169,7 @@ FFMPEGCONF+= --enable-libamr-nb --enable-libamr-wb --enable-nonfree ...@@ -169,6 +169,7 @@ FFMPEGCONF+= --enable-libamr-nb --enable-libamr-wb --enable-nonfree
endif endif
ifdef HAVE_LINUX ifdef HAVE_LINUX
FFMPEGCONF+= --target-os=linux
ifdef HAVE_MAEMO ifdef HAVE_MAEMO
ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),) ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),)
FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8 FFMPEGCONF += --disable-runtime-cpudetect --enable-neon --cpu=cortex-a8
...@@ -1112,8 +1113,12 @@ else ...@@ -1112,8 +1113,12 @@ else
ifdef HAVE_UCLIBC ifdef HAVE_UCLIBC
.ffmpeg: ffmpeg .ffmpeg: ffmpeg
else else
ifeq ($(ARCH),armel)
.ffmpeg: ffmpeg .lame .gsm .zlib
else
.ffmpeg: ffmpeg .lame .gsm .libvpx .zlib .ffmpeg: ffmpeg .lame .gsm .libvpx .zlib
endif endif
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) (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)
touch $@ touch $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment