From 3de6d1b99ffcfe91d91174e64e63a1db66ae7462 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 10 Jun 2008 01:02:12 +0200 Subject: [PATCH] Updated vlc to actual version Add DVB support to vlc Add libdvbpsi --- config/rootfiles/packages/libdvbpsi | 40 +++++++++++++ config/rootfiles/packages/videolan | 3 + doc/packages-list.txt | 3 +- lfs/libdvbpsi | 84 ++++++++++++++++++++++++++++ lfs/v4l-dvb | 3 +- lfs/videolan | 22 ++++---- make.sh | 1 + src/patches/reiser4-for-2.6.20.patch | 0 8 files changed, 144 insertions(+), 12 deletions(-) create mode 100644 config/rootfiles/packages/libdvbpsi create mode 100644 lfs/libdvbpsi mode change 100755 => 100644 src/patches/reiser4-for-2.6.20.patch diff --git a/config/rootfiles/packages/libdvbpsi b/config/rootfiles/packages/libdvbpsi new file mode 100644 index 0000000000..911b5fdef2 --- /dev/null +++ b/config/rootfiles/packages/libdvbpsi @@ -0,0 +1,40 @@ +#usr/include/dvbpsi +#usr/include/dvbpsi/cat.h +#usr/include/dvbpsi/demux.h +#usr/include/dvbpsi/descriptor.h +#usr/include/dvbpsi/dr.h +#usr/include/dvbpsi/dr_02.h +#usr/include/dvbpsi/dr_03.h +#usr/include/dvbpsi/dr_04.h +#usr/include/dvbpsi/dr_05.h +#usr/include/dvbpsi/dr_06.h +#usr/include/dvbpsi/dr_07.h +#usr/include/dvbpsi/dr_08.h +#usr/include/dvbpsi/dr_09.h +#usr/include/dvbpsi/dr_0a.h +#usr/include/dvbpsi/dr_0b.h +#usr/include/dvbpsi/dr_0c.h +#usr/include/dvbpsi/dr_0d.h +#usr/include/dvbpsi/dr_0e.h +#usr/include/dvbpsi/dr_0f.h +#usr/include/dvbpsi/dr_42.h +#usr/include/dvbpsi/dr_47.h +#usr/include/dvbpsi/dr_48.h +#usr/include/dvbpsi/dr_4d.h +#usr/include/dvbpsi/dr_4e.h +#usr/include/dvbpsi/dr_52.h +#usr/include/dvbpsi/dr_55.h +#usr/include/dvbpsi/dr_56.h +#usr/include/dvbpsi/dr_59.h +#usr/include/dvbpsi/dr_69.h +#usr/include/dvbpsi/dvbpsi.h +#usr/include/dvbpsi/eit.h +#usr/include/dvbpsi/pat.h +#usr/include/dvbpsi/pmt.h +#usr/include/dvbpsi/psi.h +#usr/include/dvbpsi/sdt.h +#usr/lib/libdvbpsi.a +#usr/lib/libdvbpsi.la +usr/lib/libdvbpsi.so +usr/lib/libdvbpsi.so.5 +usr/lib/libdvbpsi.so.5.0.0 diff --git a/config/rootfiles/packages/videolan b/config/rootfiles/packages/videolan index 7c7d4372cc..ddad49457d 100644 --- a/config/rootfiles/packages/videolan +++ b/config/rootfiles/packages/videolan @@ -24,6 +24,7 @@ usr/lib/vlc/access/libaccess_smb_plugin.so usr/lib/vlc/access/libaccess_tcp_plugin.so usr/lib/vlc/access/libaccess_udp_plugin.so usr/lib/vlc/access/libcdda_plugin.so +usr/lib/vlc/access/libdvb_plugin.so usr/lib/vlc/access/libv4l_plugin.so usr/lib/vlc/access/libvcd_plugin.so #usr/lib/vlc/access_filter @@ -131,6 +132,7 @@ usr/lib/vlc/demux/librawdv_plugin.so usr/lib/vlc/demux/libreal_plugin.so usr/lib/vlc/demux/libsgimb_plugin.so usr/lib/vlc/demux/libsubtitle_plugin.so +usr/lib/vlc/demux/libts_plugin.so usr/lib/vlc/demux/libtta_plugin.so usr/lib/vlc/demux/libty_plugin.so usr/lib/vlc/demux/libvobsub_plugin.so @@ -147,6 +149,7 @@ usr/lib/vlc/gui/libncurses_plugin.so #usr/lib/vlc/libmemcpy3dn.a #usr/lib/vlc/libmemcpymmx.a #usr/lib/vlc/libmemcpymmxext.a +#usr/lib/vlc/libmux_ts.a #usr/lib/vlc/libstream_out_switcher.a #usr/lib/vlc/misc usr/lib/vlc/misc/libdummy_plugin.so diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 97b2531e94..2f629b570b 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -145,6 +145,7 @@ * libaal-1.0.5 * libart_lgpl-2.3.17 * libcap-1.10 +* libdvbpsi5-0.1.6 * libid3tag-0.15.1b * libidn-0.6.14 * libmad-0.15.1b @@ -286,7 +287,7 @@ * vdr-1.6.0 * vim-7.0 * vlan.1.9 -* vlc-0.8.6f +* vlc-0.8.6h * vnstat-1.6 * vnstati-beta3 * vsftpd-2.0.5 diff --git a/lfs/libdvbpsi b/lfs/libdvbpsi new file mode 100644 index 0000000000..168f108d2d --- /dev/null +++ b/lfs/libdvbpsi @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.1.6 + +THISAPP = libdvbpsi5-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libdvbpsi +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = bd2d9861be3311e1e03c91cd9345f542 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(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 + cd $(DIR_APP) && make + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/v4l-dvb b/lfs/v4l-dvb index 7c2e7376d4..925c0414f5 100644 --- a/lfs/v4l-dvb +++ b/lfs/v4l-dvb @@ -86,5 +86,6 @@ else endif cd $(DIR_APP) && make $(MAKETUNING) all cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) + -ln -s $(DIR_APP)/ /usr/src/v4l-dvb +# @rm -rf $(DIR_APP) @$(POSTBUILD) 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) diff --git a/make.sh b/make.sh index a7645d2e1c..ca3790915b 100755 --- a/make.sh +++ b/make.sh @@ -508,6 +508,7 @@ buildipfire() { ipfiremake libmad ipfiremake libogg ipfiremake libvorbis + ipfiremake libdvbpsi ipfiremake lame ipfiremake sox ipfiremake libshout diff --git a/src/patches/reiser4-for-2.6.20.patch b/src/patches/reiser4-for-2.6.20.patch old mode 100755 new mode 100644 -- 2.39.2