[vlc-commits] contrib: fix ffmpeg dependencies

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jun 29 10:09:55 2011 +0300| [e2d3685a5a246e8950c140ee6b5e3c269a517769] | committer: Rémi Denis-Courmont

contrib: fix ffmpeg dependencies

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e2d3685a5a246e8950c140ee6b5e3c269a517769
---

 contrib/src/ffmpeg/rules.mak |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index d7c15ac..03c9267 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -26,29 +26,29 @@ ifdef BUILD_ENCODERS
 # TODO:
 #FFMPEGCONF+= --enable-libmp3lame
 #.ffmpeg: .lame
+#PKGS += lame
 else
 FFMPEGCONF += --disable-encoders --disable-muxers
 # XXX: REVISIT --enable-small ?
 endif
 
-ifdef HAVE_CROSS_COMPILE
-FFMPEGCONF += --enable-cross-compile --cross-prefix=$(HOST)-
-endif
-# XXX: REVISIT: gsm and vpx not used by VLC so should in PKGS?
-ifneq ($(filter gsm,$(PKGS)),)
 #FFMPEGCONF+= --enable-libgsm
 #.ffmpeg: .gsm
-endif
-ifneq ($(filter vpx,$(PKGS)),)
+#PKGS += gsm
+
 #FFMPEGCONF += --enable-libvpx
 #.ffmpeg: .vpx
-endif
+#PKGS += vpx
 
 # XXX: REVISIT
 #ifndef HAVE_FPU
 #FFMPEGCONF+= --disable-mpegaudio-hp
 #endif
 
+ifdef HAVE_CROSS_COMPILE
+FFMPEGCONF += --enable-cross-compile --cross-prefix=$(HOST)-
+endif
+
 # ARM stuff
 ifeq ($(ARCH),arm)
 FFMPEGCONF += --disable-runtime-cpudetect
@@ -73,6 +73,7 @@ ifeq ($(ARCH),x86_64)
 FFMPEGCONF += --cpu=core2
 endif
 .ffmpeg: .yasm
+PKGS += yasm
 endif
 
 # Linux
@@ -86,12 +87,16 @@ FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack
 FFMPEGCONF += --enable-w32threads \
 	--disable-bzlib --disable-bsfs \
 	--disable-decoder=dca --disable-encoder=vorbis
+
 ifdef HAVE_WIN64
 FFMPEGCONF += --disable-dxva2
+
 FFMPEGCONF += --cpu=athlon64 --arch=x86_64
 else # !WIN64
 FFMPEGCONF += --enable-dxva2
 .ffmpeg: .directx
+PKGS += directx
+
 FFMPEGCONF+= --cpu=i686 --arch=x86
 endif
 else
@@ -109,7 +114,7 @@ FFMPEG_CFLAGS += --std=gnu99
 
 # Build
 
-PKGS += libav
+PKGS += ffmpeg
 
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
 	$(error FFmpeg snapshot is too old, VCS must be used!)