From b570406ab8343c048d2b7fc0347bf8039069b5df Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 3 Sep 2008 14:07:26 +0200 Subject: [PATCH] Update videolan to 0.8.6i+bugfixes --- doc/packages-list.txt | 2 +- lfs/videolan | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 0fe67b8e2f..b4ff5e5b92 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -293,7 +293,7 @@ * vdr-1.6.0 * vim-7.0 * vlan.1.9 -* vlc-0.8.6h +* vlc-0.8.6i * vnstat-1.6 * vnstati-beta3 * vsftpd-2.0.5 diff --git a/lfs/videolan b/lfs/videolan index 2ad406576e..22cca311c4 100644 --- a/lfs/videolan +++ b/lfs/videolan @@ -24,10 +24,11 @@ include Config -VER = 0.8.6h - +VER = 0.8.6i THISAPP = vlc-$(VER) 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) @@ -40,11 +41,13 @@ DEPS = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg" # 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 = 4a6eece2f56d4ad5dfa786e934d2b4a8 +$(DL_FILE)_MD5 = 3c90520c9f22a68d287458d5a8af989e +$(DL_FILE1)_MD5 = 36ea293b5ebb604778b321b5e3e3cdc4 install : $(TARGET) @@ -77,6 +80,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @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 \ -- 2.39.2