From 9232685b8c68eb9b9d7523906f846a2696abbdad Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 16 Apr 2008 19:32:09 +0200 Subject: [PATCH] Updated videolan, add vdr-softdevice plugin --- config/rootfiles/packages/vdr-softdevice | 24 +++++++++++ config/rootfiles/packages/videolan | 23 +++++++---- doc/packages-list.txt | 2 +- lfs/ffmpeg | 11 ++--- lfs/vdr | 9 +++- lfs/vdr-softdevice | 52 ++++++++++++++++++++++++ lfs/videolan | 35 ++++++++-------- make.sh | 2 +- 8 files changed, 124 insertions(+), 34 deletions(-) create mode 100644 config/rootfiles/packages/vdr-softdevice create mode 100644 lfs/vdr-softdevice diff --git a/config/rootfiles/packages/vdr-softdevice b/config/rootfiles/packages/vdr-softdevice new file mode 100644 index 000000000..e33e0d037 --- /dev/null +++ b/config/rootfiles/packages/vdr-softdevice @@ -0,0 +1,24 @@ +opt/vdr/PLUGINS/lib/libsoftdevice-fb.so.1.6.0 +opt/vdr/PLUGINS/lib/libsoftdevice-shm.so.1.6.0 +opt/vdr/PLUGINS/lib/libvdr-softdevice.so.1.6.0 +#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-softdevice.mo +opt/vdr/locale/de_DE/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-softdevice.mo +#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-softdevice.mo diff --git a/config/rootfiles/packages/videolan b/config/rootfiles/packages/videolan index 487ce03c6..7c570d314 100644 --- a/config/rootfiles/packages/videolan +++ b/config/rootfiles/packages/videolan @@ -1,5 +1,5 @@ usr/bin/vlc -#usr/bin/vlc-config +usr/bin/vlc-config #usr/include/vlc #usr/include/vlc/aout.h #usr/include/vlc/decoder.h @@ -23,8 +23,8 @@ usr/lib/vlc/access/libaccess_mms_plugin.so 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/libv4l_plugin.so usr/lib/vlc/access/libcdda_plugin.so +usr/lib/vlc/access/libv4l_plugin.so usr/lib/vlc/access/libvcd_plugin.so #usr/lib/vlc/access_filter usr/lib/vlc/access_filter/libaccess_filter_dump_plugin.so @@ -71,6 +71,7 @@ usr/lib/vlc/audio_mixer/libtrivial_mixer_plugin.so #usr/lib/vlc/audio_output usr/lib/vlc/audio_output/libalsa_plugin.so usr/lib/vlc/audio_output/libaout_file_plugin.so +usr/lib/vlc/audio_output/libaout_sdl_plugin.so usr/lib/vlc/audio_output/liboss_plugin.so #usr/lib/vlc/codec usr/lib/vlc/codec/liba52_plugin.so @@ -138,13 +139,15 @@ usr/lib/vlc/demux/libwav_plugin.so usr/lib/vlc/demux/libxa_plugin.so #usr/lib/vlc/gui usr/lib/vlc/gui/libncurses_plugin.so -usr/lib/vlc/libi420_rgb_mmx.a -usr/lib/vlc/libi420_ymga_mmx.a -usr/lib/vlc/libi420_yuy2_mmx.a -usr/lib/vlc/libi422_yuy2_mmx.a -usr/lib/vlc/libmemcpy3dn.a -usr/lib/vlc/libmemcpymmx.a -usr/lib/vlc/libmemcpymmxext.a +#usr/lib/vlc/libffmpeg.a +#usr/lib/vlc/libi420_rgb_mmx.a +#usr/lib/vlc/libi420_ymga_mmx.a +#usr/lib/vlc/libi420_yuy2_mmx.a +#usr/lib/vlc/libi422_yuy2_mmx.a +#usr/lib/vlc/libmemcpy3dn.a +#usr/lib/vlc/libmemcpymmx.a +#usr/lib/vlc/libmemcpymmxext.a +#usr/lib/vlc/libstream_out_switcher.a #usr/lib/vlc/misc usr/lib/vlc/misc/libdummy_plugin.so usr/lib/vlc/misc/libexport_plugin.so @@ -219,6 +222,7 @@ usr/lib/vlc/video_filter/libwall_plugin.so #usr/lib/vlc/video_output usr/lib/vlc/video_output/libfb_plugin.so usr/lib/vlc/video_output/libimage_plugin.so +usr/lib/vlc/video_output/libvout_sdl_plugin.so #usr/lib/vlc/visualization usr/lib/vlc/visualization/libvisual_plugin.so #usr/share/applications/vlc.desktop @@ -268,6 +272,7 @@ usr/share/vlc/http/images/slider_left.png usr/share/vlc/http/images/slider_point.png usr/share/vlc/http/images/slider_right.png usr/share/vlc/http/images/slow.png +usr/share/vlc/http/images/snapshot.png usr/share/vlc/http/images/sort.png usr/share/vlc/http/images/sout.png usr/share/vlc/http/images/speaker.png diff --git a/doc/packages-list.txt b/doc/packages-list.txt index f24ec8573..e3eabeb95 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -282,7 +282,7 @@ * vdr-1.6.0 * vim-7.0 * vlan.1.9 -* vlc-0.8.6c +* vlc-0.8.6f * vsftpd-2.0.5 * w_scan-20080105 * wget-1.10.2 diff --git a/lfs/ffmpeg b/lfs/ffmpeg index 721d1f9da..86f464c6e 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -79,13 +79,14 @@ $(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 \ + ln -s $(THISAPP) /usr/src/ffmpeg + cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \ --enable-shared \ --enable-postproc \ --enable-gpl - cd $(DIR_APP) && make - cd $(DIR_APP) && make install - cd $(DIR_APP) && make install-libs + cd $(DIR_SRC)/ffmpeg && make + cd $(DIR_SRC)/ffmpeg && make install + cd $(DIR_SRC)/ffmpeg && make install-libs ldconfig - @rm -rf $(DIR_APP) +# @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/vdr b/lfs/vdr index f1aee1679..01f592ae1 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -28,6 +28,8 @@ VER = 1.6.0 THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FILE1 = vdr-streamdev-20080325-http-0_4.tgz +DL_FILE2 = vdr-softdevice-cvs-2008-04-16.tar.bz2 + DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -41,13 +43,15 @@ DEPS = "freefont fontconfig" # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(DL_FILE1) $(DL_FILE2) $(DL_FILE3) +objects = $(DL_FILE) $(DL_FILE1) $(DL_FILE2) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE1) = $(DL_FROM)/$(DL_FILE1) +$(DL_FILE2) = $(DL_FROM)/$(DL_FILE2) $(DL_FILE)_MD5 = 76f4ebe6525a35e33313d27a3f8e80c0 $(DL_FILE1)_MD5 = 874026c643601692077c42ee7a70b720 +$(DL_FILE2)_MD5 = 2b2eec38a653c205967849efb907b707 install : $(TARGET) @@ -82,6 +86,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP)/PLUGINS/src && tar zxf $(DIR_DL)/$(DL_FILE1) cd $(DIR_APP)/PLUGINS/src && ln -s streamdev-0.3.3-20080325-http streamdev + cd $(DIR_APP)/PLUGINS/src && tar jxf $(DIR_DL)/$(DL_FILE2) + cd $(DIR_APP)/PLUGINS/src && ln -s softdevice-cvs-2008-04-16 softdevice + cd $(DIR_APP)/PLUGINS/src/softdevice && ./configure cd $(DIR_APP) && make VIDEODIR=/var/video plugins $(MAKETUNING) cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING) cd $(DIR_APP) && make PREFIX=. DESTDIR=/opt/vdr/ install diff --git a/lfs/vdr-softdevice b/lfs/vdr-softdevice new file mode 100644 index 000000000..a457ddca6 --- /dev/null +++ b/lfs/vdr-softdevice @@ -0,0 +1,52 @@ +############################################################################### +# # +# 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 = plugin + +THISAPP = vdr-softdevice-$(VER) +DIR_APP = $(DIR_SRC)/$(THISAPP) +PROG = vdr-softdevice +PAK_VER = 1 + +DEPS = "ffmpeg alsa" + +############################################################################### +# Top-level Rules +############################################################################### + + +install : + +check : + +download : + +md5 : + +dist: + $(PAK) + +############################################################################### diff --git a/lfs/videolan b/lfs/videolan index 9ca6b9678..675ef0c37 100644 --- 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) diff --git a/make.sh b/make.sh index caf9acc3b..98fc8b665 100755 --- a/make.sh +++ b/make.sh @@ -517,7 +517,6 @@ buildipfire() { ipfiremake mpc ipfiremake xvid ipfiremake libmpeg2 - ipfiremake videolan ipfiremake cmake ipfiremake libpri ipfiremake asterisk @@ -566,6 +565,7 @@ buildipfire() { ipfiremake fontconfig ipfiremake freefont ipfiremake ffmpeg + ipfiremake videolan ipfiremake vdr ipfiremake w_scan ipfiremake git