X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fffmpeg;h=0ee9c3e0b1d0d57972e7d47632db11f41c31bac0;hp=7a3afabe8a90722191c725398863ffb0aa6512cc;hb=6a5c29e7507385451b5ba27deb0fa95398c728b5;hpb=4271c78e72049185025e39d4d8de5daed10651e6

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 7a3afabe8..0ee9c3e0b 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -24,9 +24,6 @@
 
 include Config
 
-
-
-
 VER        = 2008-04-13
 THISAPP    = ffmpeg-export-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -34,9 +31,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 1
+PAK_VER    = 4
 
-DEPS       = ""
+DEPS       = "ffmpeg-libs sdl lame libvorbis xvid"
 
 ###############################################################################
 # Top-level Rules
@@ -79,13 +76,15 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr/local \
+	ln -s $(THISAPP) /usr/src/ffmpeg
+	cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \
                                      --enable-shared \
-				     --enable-postproc \
-				     --enable-gpl
-	cd $(DIR_APP) && make
-	cd $(DIR_APP) && make install
-	cd $(DIR_APP) && make install-libs
+									 --enable-postproc \
+									 --enable-pthreads \
+									 --enable-gpl
+	cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_SRC)/ffmpeg && make install
+	cd $(DIR_SRC)/ffmpeg && make install-libs
 	ldconfig
-	@rm -rf $(DIR_APP)
+#	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)