Updated videolan, add vdr-softdevice plugin

[ipfire-2.x.git] / lfs / videolan

diff --git a/lfs/videolan b/lfs/videolan
index 9ca6b96786c0bbdec63295a8cd9db8b8dca0c72f..675ef0c37b149159d8979a94e361626425e96c3a 100644 (file)
--- a/lfs/videolan
+++ b/lfs/videolan
@@ -24,17 +24,17 @@
 
 include Config
 
-VER        = 0.8.6c
+VER        = 0.8.6f
 
 THISAPP    = vlc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = videolan
-PAK_VER    = 1
+PAK_VER    = 2
 
-DEPS       = "libshout libmpeg2 libmad"
+DEPS       = "libshout libmpeg2 libmad ffmpeg"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3e5f3d7973874a36554fb0c8c77fc63e
+$(DL_FILE)_MD5 = c3aded2583fcdb9f4c71d3fc3601b73b
 
 install : $(TARGET)
 
@@ -76,18 +76,19 @@ $(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 \
-                                                                                       --enable-a52 --enable-dts --enable-alsa \
-                                                                                       --enable-unicode-utf8 --enable-v4l --enable-vcd \
-                                                                                       --enable-ogg -enable-vorbis --enable-theora \
-                                                                                       --with-ffmpeg-faac --with-ffmpeg-zlib --enable-mad \
-                                                                                       --enable-libdvbpsi --enable-faac --enable-mkv  \
-                                                                                       --enable-x264 --enable-release \
-                                                                                       --disable-nls
+       @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 \
+                                                               --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 \
+                                                               --disable-nls
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)