X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fvideolan;h=2ad406576e1f7d2ea19b2508bee3643cc78cdb40;hp=6c1c937ac2fb4de0914007c63a05f36d9d4db355;hb=3de6d1b99ffcfe91d91174e64e63a1db66ae7462;hpb=a869b0645927d826eae67391556bf14348ca6b0e

diff --git a/lfs/videolan b/lfs/videolan
index 6c1c937ac2..2ad406576e 100644
--- a/lfs/videolan
+++ b/lfs/videolan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.8.6f
+VER        = 0.8.6h
 
 THISAPP    = vlc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = videolan
-PAK_VER    = 2
+PAK_VER    = 3
 
-DEPS       = "libshout libmpeg2 libmad directfb ffmpeg"
+DEPS       = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c3aded2583fcdb9f4c71d3fc3601b73b
+$(DL_FILE)_MD5 = 4a6eece2f56d4ad5dfa786e934d2b4a8
 
 install : $(TARGET)
 
@@ -77,17 +77,19 @@ $(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 --enable-shared -with-ffmpeg-tree=/usr/src/ffmpeg \
-								   -with-ffmpeg-config=/usr/src/ffmpeg \
+	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-libdvbpsi --enable-faac --enable-mkv  \
-								--enable-x264 --enable-release \
+								--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-directfb --with-directfb=/usr/src/directfb
 	cd $(DIR_APP) && make $(MAKETUNING)