X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fvideolan;h=17a9f7ac8cbe698ebf111ed7f32599c2f7b5baa6;hp=69de921adb3c9dcc0f1e61fa6ca02e0b96dad255;hb=f63935b14af95fdeb2ae0324f4e8ddecd9c495c1;hpb=32307bc63de25ee01198dfef5d7ff10a6c5038c8

diff --git a/lfs/videolan b/lfs/videolan
index 69de921adb..17a9f7ac8c 100644
--- a/lfs/videolan
+++ b/lfs/videolan
@@ -24,27 +24,30 @@
 
 include Config
 
-VER        = 0.8.6c
-
+VER        = 0.8.6i
 THISAPP    = vlc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE1   = $(THISAPP)-bugfix-080903.patch.bz2
+
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = videolan
-PAK_VER    = 1
+PAK_VER    = 5
 
-DEPS       = "libshout libmpeg2 libmad"
+DEPS       = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg faad2"
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(DL_FILE1)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE1) = $(DL_FROM)/$(DL_FILE1)
 
-$(DL_FILE)_MD5 = 3e5f3d7973874a36554fb0c8c77fc63e
+$(DL_FILE)_MD5 = 3c90520c9f22a68d287458d5a8af989e
+$(DL_FILE1)_MD5 = 36ea293b5ebb604778b321b5e3e3cdc4
 
 install : $(TARGET)
 
@@ -76,12 +79,25 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared --disable-ffmpeg \
-											--disable-wxwidgets --disable-skins2 --without-x \
-											--enable-httpd --enable-pth --enable-shout \
-											--enable-smb --enable-cddax --enable-ncurses \
-											--disable-nls
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	#Apply some patched from videolan 8.6-bugfix branch,
+	#ignore the error because one patch is already applied
+	-cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/$(DL_FILE1) | patch -p1
+	cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared --with-ffmpeg-tree=/usr/src/ffmpeg \
+								   --with-ffmpeg-config=/usr/src/ffmpeg \
+								--disable-wxwidgets --disable-skins2 \
+								--enable-httpd --enable-pth --enable-shout \
+								--enable-smb --enable-cddax --enable-ncurses \
+								--enable-a52 --enable-dts --enable-alsa \
+								--enable-unicode-utf8 --enable-v4l --enable-vcd \
+								--enable-ogg --enable-vorbis --enable-theora \
+								--enable-mad --enable-v4l --enable-dvb \
+								--with-dvb=/usr/src/v4l-dvb \
+								--with-v4l=/usr/src/v4l-dvb \
+								--enable-libdvbpsi --enable-faac --enable-mkv \
+								--enable-x264 --enable-release --enable-sout \
+								--disable-nls --enable-faad \
+								--enable-directfb --with-directfb=/usr/src/directfb
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)