Updated splix to 2.0.0-rc2.

[people/pmueller/ipfire-2.x.git] / lfs / ffmpeg

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index f8022990ba1d745971e10d850e69fdb764aeb7af..55472c5ee2ed43f89a2aa318c78bc004a2ef0a47 100644 (file)
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -33,7 +33,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
 PAK_VER    = 2
 
-DEPS       = "sdl lame libvorbis libxvid"
+DEPS       = "sdl lame libvorbis xvid"
 
 ###############################################################################
 # Top-level Rules
@@ -80,11 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \
                                      --enable-shared \
                                     --enable-postproc \
-                                    --enable-gpl \
-                                    --enable-libmp3lame \
-                                    --enable-libvorbis \
-                                    --enable-libxvid
-       cd $(DIR_SRC)/ffmpeg && make
+                                    --enable-gpl
+       cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/ffmpeg && make install
        cd $(DIR_SRC)/ffmpeg && make install-libs
        ldconfig