From d2be7786f155aeaff75bccb47a6be8b8c1ed4dca Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 19 Mar 2013 20:46:06 +0100 Subject: [PATCH] vdr: Update to 1.7.41. --- config/rootfiles/packages/vdr | 335 ++++++++-------------------------- config/vdr/bin/runvdr | 53 ------ config/vdr/bin/runvdr-soft | 5 - lfs/vdr | 96 +++++----- 4 files changed, 122 insertions(+), 367 deletions(-) delete mode 100755 config/vdr/bin/runvdr delete mode 100755 config/vdr/bin/runvdr-soft diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr index eee440e06..3bc0aad64 100644 --- a/config/rootfiles/packages/vdr +++ b/config/rootfiles/packages/vdr @@ -1,264 +1,79 @@ -#opt/vdr/etc -#opt/vdr/etc/plugins -#opt/vdr/locale/ca_ES -#opt/vdr/locale/ca_ES/LC_MESSAGES -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr.mo -#opt/vdr/locale/cs_CZ -#opt/vdr/locale/cs_CZ/LC_MESSAGES -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr.mo -#opt/vdr/locale/da_DK -#opt/vdr/locale/da_DK/LC_MESSAGES -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr.mo -#opt/vdr/locale/de_DE -#opt/vdr/locale/de_DE/LC_MESSAGES -#opt/vdr/locale/de_DE/LC_MESSAGES/vdr-epgsearch.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-hello.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-pictures.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/de_DE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/de_DE/LC_MESSAGES/vdr.mo -#opt/vdr/locale/el_GR -#opt/vdr/locale/el_GR/LC_MESSAGES -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr.mo -#opt/vdr/locale/es_ES -#opt/vdr/locale/es_ES/LC_MESSAGES -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr.mo -#opt/vdr/locale/et_EE -#opt/vdr/locale/et_EE/LC_MESSAGES -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr.mo -#opt/vdr/locale/fi_FI -#opt/vdr/locale/fi_FI/LC_MESSAGES -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr.mo -#opt/vdr/locale/fr_FR -#opt/vdr/locale/fr_FR/LC_MESSAGES -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr.mo -#opt/vdr/locale/hr_HR -#opt/vdr/locale/hr_HR/LC_MESSAGES -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr.mo -#opt/vdr/locale/hu_HU -#opt/vdr/locale/hu_HU/LC_MESSAGES -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr.mo -#opt/vdr/locale/it_IT -#opt/vdr/locale/it_IT/LC_MESSAGES -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr.mo -#opt/vdr/locale/nl_NL -#opt/vdr/locale/nl_NL/LC_MESSAGES -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr.mo -#opt/vdr/locale/nn_NO -#opt/vdr/locale/nn_NO/LC_MESSAGES -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr.mo -#opt/vdr/locale/pl_PL -#opt/vdr/locale/pl_PL/LC_MESSAGES -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr.mo -#opt/vdr/locale/pt_PT -#opt/vdr/locale/pt_PT/LC_MESSAGES -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr.mo -#opt/vdr/locale/ro_RO -#opt/vdr/locale/ro_RO/LC_MESSAGES -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr.mo -#opt/vdr/locale/ru_RU -#opt/vdr/locale/ru_RU/LC_MESSAGES -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr.mo -#opt/vdr/locale/sl_SI -#opt/vdr/locale/sl_SI/LC_MESSAGES -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr.mo -#opt/vdr/locale/sv_SE -#opt/vdr/locale/sv_SE/LC_MESSAGES -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr.mo -#opt/vdr/locale/tr_TR -#opt/vdr/locale/tr_TR/LC_MESSAGES -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr.mo -#opt/vdr/locale/uk_UA -#opt/vdr/locale/uk_UA/LC_MESSAGES -#opt/vdr/locale/uk_UA/LC_MESSAGES/vdr.mo -#opt/vdr/locale/zh_CN -#opt/vdr/locale/zh_CN/LC_MESSAGES -#opt/vdr/locale/zh_CN/LC_MESSAGES/vdr.mo -#opt/vdr -#opt/vdr/PLUGINS -#opt/vdr/PLUGINS/lib -#opt/vdr/PLUGINS/lib/libsoftdevice-dfb.so.1.6.0 -#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-conflictcheckonly.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-epgsearch.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-epgsearchonly.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-hello.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-osddemo.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-pictures.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-quickepgsearch.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-skincurses.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-sky.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-softdevice.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-status.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-streamdev-client.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-streamdev-server.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-svccli.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-svcsvr.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-svdrpdemo.so.1.6.0 -#opt/vdr/bin -opt/vdr/bin/runvdr -#opt/vdr/bin/runvdr-soft -opt/vdr/bin/svdrpsend.pl -opt/vdr/bin/vdr -#opt/vdr/locale -#opt/vdr/locale/ca_ES -#opt/vdr/locale/ca_ES/LC_MESSAGES -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/cs_CZ -#opt/vdr/locale/cs_CZ/LC_MESSAGES -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/da_DK -#opt/vdr/locale/da_DK/LC_MESSAGES -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/de_DE -#opt/vdr/locale/de_DE/LC_MESSAGES -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-hello.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-pictures.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/el_GR -#opt/vdr/locale/el_GR/LC_MESSAGES -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/es_ES -#opt/vdr/locale/es_ES/LC_MESSAGES -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/et_EE -#opt/vdr/locale/et_EE/LC_MESSAGES -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fi_FI -#opt/vdr/locale/fi_FI/LC_MESSAGES -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/fr_FR -#opt/vdr/locale/fr_FR/LC_MESSAGES -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/hr_HR -#opt/vdr/locale/hr_HR/LC_MESSAGES -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/hu_HU -#opt/vdr/locale/hu_HU/LC_MESSAGES -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/it_IT -#opt/vdr/locale/it_IT/LC_MESSAGES -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/nl_NL -#opt/vdr/locale/nl_NL/LC_MESSAGES -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/nn_NO -#opt/vdr/locale/nn_NO/LC_MESSAGES -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/pl_PL -#opt/vdr/locale/pl_PL/LC_MESSAGES -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/pt_PT -#opt/vdr/locale/pt_PT/LC_MESSAGES -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ro_RO -#opt/vdr/locale/ro_RO/LC_MESSAGES -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ru_RU -#opt/vdr/locale/ru_RU/LC_MESSAGES -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/sl_SI -#opt/vdr/locale/sl_SI/LC_MESSAGES -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/sv_SE -#opt/vdr/locale/sv_SE/LC_MESSAGES -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/tr_TR -#opt/vdr/locale/tr_TR/LC_MESSAGES -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/share -#opt/vdr/share/man -#opt/vdr/share/man/man1 -#opt/vdr/share/man/man1/vdr.1.gz -#opt/vdr/share/man/man5 -#opt/vdr/share/man/man5/vdr.5.gz -#opt/vdr/video -#var/video -opt/vdr/etc/channels.conf -opt/vdr/etc/diseqc.conf -opt/vdr/etc/keymacros.conf -#var/video/plugins -opt/vdr/etc/plugins/streamdevhosts.conf -opt/vdr/etc/setup.conf -opt/vdr/etc/sources.conf -opt/vdr/etc/svdrphosts.conf etc/rc.d/init.d/vdr -etc/rc.d/rc3.d/S60vdr etc/rc.d/rc0.d/K40vdr +etc/rc.d/rc3.d/S60vdr etc/rc.d/rc6.d/K40vdr +#etc/sysconfig/vdr-plugins.d +etc/vdr +etc/vdr/channels.conf +etc/vdr/diseqc.conf +etc/vdr/keymacros.conf +etc/vdr/scr.conf +etc/vdr/sources.conf +etc/vdr/svdrphosts.conf +usr/bin/svdrpsend +#usr/include/libsi +#usr/include/libsi/descriptor.h +#usr/include/libsi/headers.h +#usr/include/libsi/section.h +#usr/include/libsi/si.h +#usr/include/libsi/util.h +#usr/include/vdr +#usr/include/vdr/audio.h +#usr/include/vdr/channels.h +#usr/include/vdr/ci.h +#usr/include/vdr/config.h +#usr/include/vdr/cutter.h +#usr/include/vdr/device.h +#usr/include/vdr/diseqc.h +#usr/include/vdr/dvbci.h +#usr/include/vdr/dvbdevice.h +#usr/include/vdr/dvbplayer.h +#usr/include/vdr/dvbspu.h +#usr/include/vdr/dvbsubtitle.h +#usr/include/vdr/eit.h +#usr/include/vdr/eitscan.h +#usr/include/vdr/epg.h +#usr/include/vdr/filter.h +#usr/include/vdr/font.h +#usr/include/vdr/i18n.h +#usr/include/vdr/interface.h +#usr/include/vdr/keys.h +#usr/include/vdr/lirc.h +#usr/include/vdr/menu.h +#usr/include/vdr/menuitems.h +#usr/include/vdr/nit.h +#usr/include/vdr/osd.h +#usr/include/vdr/osdbase.h +#usr/include/vdr/pat.h +#usr/include/vdr/player.h +#usr/include/vdr/plugin.h +#usr/include/vdr/receiver.h +#usr/include/vdr/recorder.h +#usr/include/vdr/recording.h +#usr/include/vdr/remote.h +#usr/include/vdr/remux.h +#usr/include/vdr/ringbuffer.h +#usr/include/vdr/sdt.h +#usr/include/vdr/sections.h +#usr/include/vdr/shutdown.h +#usr/include/vdr/skinclassic.h +#usr/include/vdr/skinlcars.h +#usr/include/vdr/skins.h +#usr/include/vdr/skinsttng.h +#usr/include/vdr/sourceparams.h +#usr/include/vdr/sources.h +#usr/include/vdr/spu.h +#usr/include/vdr/status.h +#usr/include/vdr/svdrp.h +#usr/include/vdr/themes.h +#usr/include/vdr/thread.h +#usr/include/vdr/timers.h +#usr/include/vdr/tools.h +#usr/include/vdr/transfer.h +#usr/include/vdr/videodir.h +usr/sbin/runvdr +usr/sbin/vdr +usr/share/vdr +var/cache/vdr var/ipfire/backup/addons/includes/vdr +#var/video diff --git a/config/vdr/bin/runvdr b/config/vdr/bin/runvdr deleted file mode 100755 index f17b70c85..000000000 --- a/config/vdr/bin/runvdr +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# runvdr: Loads the DVB driver and runs VDR -# -# If VDR exits abnormally, the driver will be reloaded -# and VDR restarted. -# -# Any command line parameters will be passed on to the -# actual 'vdr' program. -# - -PLUGOPTS="-Pstreamdev-server" - -VDRPRG="./bin/vdr" -VDRCMD="/bin/nice --11 $VDRPRG -w 60 -c /opt/vdr/etc $PLUGOPTS $*" - -KILL="killall -q -TERM" - -if [ "$(ps -A | grep " vdr$")" != "" ]; then - echo Error! VDR is already running! - exit 1 -fi - -mkdir -p /var/video -cd /opt/vdr -while (true) do -# -# If you have stability Problems at tuning or similar -# unload and reload the dvb-modules here ... -# Example is for Hauppauge Nexus 2.0 -# -# rmmod dvb_ttpci -# rmmod stv0299 -# rmmod dvb_core -# modprobe dvb_ttpci -# sleep 5 -# -# Check if DVB device is present / remove this check if you -# would use vdr as streaming client only -# - if [ ! -e /dev/dvb/adapter0/frontend0 ]; then - echo No DVB tuner found! - exit 1 - fi -# -# Run VDR -# - eval "$VDRCMD" - if test $? -eq 0 -o $? -eq 2; then exit; fi - $KILL $VDRPRG - sleep 10 - echo "`date` restarting VDR" -done diff --git a/config/vdr/bin/runvdr-soft b/config/vdr/bin/runvdr-soft deleted file mode 100755 index 6f187eb8c..000000000 --- a/config/vdr/bin/runvdr-soft +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -clear -runvdr -P\'softdevice -vo fb:\' > /tmp/vdrsoft.log 2>&1 -tail /tmp/vdrsoft.log -rm /tmp/vdrsoft.log diff --git a/lfs/vdr b/lfs/vdr index 46ea5d3f9..f881134dc 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -24,39 +24,43 @@ include Config -VER = 1.6.0 +VER = 1.7.41 THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 -DL_FILE1 = vdr-streamdev-20080325-http-0_4.tgz -DL_FILE2 = vdr-softdevice-0.5.0.tgz -DL_FILE3 = vidix-1.0.0.tar.bz2 -DL_FILE4 = vdr-epgsearch-0.9.24.tgz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr -PAK_VER = 5 +PAK_VER = 6 DEPS = "freefont" +MAKE_OPTIONS = \ + PREFIX=/usr \ + BINDIR=/usr/bin \ + CACHEDIR=/var/cache/vdr \ + CONFDIR=/etc/vdr \ + INCDIR=/usr/include/vdr \ + LIBDIR=/usr/lib/vdr \ + LOCDIR=/usr/share/locale \ + MANDIR=/usr/share/man \ + RESDIR=/usr/share/vdr \ + RUNDIR=/var/run \ + VARDIR=/var \ + VIDEODIR=/var/video \ + CFLAGS="$(CFLAGS)" \ + CXXFLAGS="$(CXXFLAGS)" + ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(DL_FILE1) $(DL_FILE2) $(DL_FILE3) $(DL_FILE4) +objects = $(DL_FILE) -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE1) = $(DL_FROM)/$(DL_FILE1) -$(DL_FILE2) = $(DL_FROM)/$(DL_FILE2) -$(DL_FILE3) = $(DL_FROM)/$(DL_FILE3) -$(DL_FILE4) = $(DL_FROM)/$(DL_FILE4) +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 76f4ebe6525a35e33313d27a3f8e80c0 -$(DL_FILE1)_MD5 = 874026c643601692077c42ee7a70b720 -$(DL_FILE2)_MD5 = e106876497db478f3b9ba4da0e5532f8 -$(DL_FILE3)_MD5 = 3471d1f385871f7e00e6e178ccdfff0b -$(DL_FILE4)_MD5 = 4f0b1d7bdc6f24478f2670769547d7db +$(DL_FILE)_MD5 = c7928bff45fa1c0e6dadf2c0a5adf94b install : $(TARGET) @@ -90,42 +94,36 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - # Install obsolete V4L1 videodev header. - cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h - - # Accept also DVB_API_VERSION 5 - cd $(DIR_APP) && sed -i -e "s|DVB_API_VERSION != 3|& \&\& DVB_API_VERSION != 5|g" dvbdevice.h - - 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 zxf $(DIR_DL)/$(DL_FILE2) - cd $(DIR_APP)/PLUGINS/src && ln -s softdevice-0.5.0 softdevice - cd $(DIR_APP)/PLUGINS/src/softdevice && ./configure - cd $(DIR_APP)/PLUGINS/src && tar jxf $(DIR_DL)/$(DL_FILE3) - cd $(DIR_APP)/PLUGINS/src && ln -s vidix-1.0.0 vidix - cd $(DIR_APP)/PLUGINS/src/vidix && ./configure - cd $(DIR_APP)/PLUGINS/src && tar xvf $(DIR_DL)/$(DL_FILE4) - cd $(DIR_APP)/PLUGINS/src && ln -s epgsearch-0.9.24 epgsearch - cd $(DIR_APP) && patch -Np1 -i PLUGINS/src/epgsearch/patches/MainMenuHooks-v1_0.patch - cd $(DIR_APP)/PLUGINS/src/epgsearch && sed -i '/include/a #include /' \ - epgsearch.c - cd $(DIR_APP)/PLUGINS/src/epgsearch && patch -Np1 < $(DIR_SRC)/src/patches/vdr-plugin-epgsearch-gcc44.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-1.6.0-gcc44-fixes.patch - cd $(DIR_APP) && make VIDEODIR=/var/video plugins $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make DFB_SUPPORT=1 FB_SUPPORT=1 VIDIX_SUPPORT=1 $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make PREFIX=. DESTDIR=/opt/vdr/ install - -mkdir -p /opt/vdr/etc - cd $(DIR_APP) && install *.conf /opt/vdr/etc/ - cp -Rvf $(DIR_SRC)/config/vdr /opt + # Compile main package. + cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir + + # Compile bundled plugins. + #cd $(DIR_APP) && for plugin in ...; do \ + # make $(MAKETUNING) -C PLUGINS/src/$$plugin VDRDIR=$(DIR_APP) \ + # CFLAGS="$(CFLAGS) -I$(DIR_APP)/include" \ + # CXXFLAGS="$(CXXFLAGS) -I$(DIR_APP)/include" \ + # PLGCFG=$(DIR_APP)/plugins.mk all || exit 1; \ + #done + + # Install main package. + cd $(DIR_APP) && make install-bin install-dirs install-includes $(MAKE_OPTIONS) + mv -v /usr/bin/vdr /usr/sbin/vdr + + sed -e "s/VDR_PLUGIN_VERSION/$(VER)/" \ + < $(DIR_SRC)/config/vdr/runvdr > /usr/sbin/runvdr + chmod 755 /usr/sbin/runvdr + + # Install configuration. + mkdir -pv /etc/vdr + mkdir -pv /etc/sysconfig/vdr-plugins.d + cd $(DIR_APP) && install -m 644 *.conf /etc/vdr + + # Install start links and backup include file. ln -sf ../init.d/vdr /etc/rc.d/rc3.d/S60vdr ln -sf ../init.d/vdr /etc/rc.d/rc0.d/K40vdr ln -sf ../init.d/vdr /etc/rc.d/rc6.d/K40vdr install -v -m 644 $(DIR_SRC)/config/backup/includes/vdr \ - /var/ipfire/backup/addons/includes/vdr - - # Remove obsolete V4L1 videodev header. - rm -f /usr/include/linux/videodev.h + /var/ipfire/backup/addons/includes/vdr @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.39.2