From d2be7786f155aeaff75bccb47a6be8b8c1ed4dca Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 19 Mar 2013 20:46:06 +0100 Subject: [PATCH 01/38] vdr: Update to 1.7.41. --- config/rootfiles/packages/vdr | 335 ++++++++-------------------------- config/vdr/bin/runvdr | 53 ------ config/vdr/bin/runvdr-soft | 5 - lfs/vdr | 94 +++++----- 4 files changed, 121 insertions(+), 366 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 + # Compile main package. + cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir - # 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 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) From e20d949dd89ec9ec8dde455a9c0a4b8f5e385a57 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 20 Mar 2013 13:41:44 +0100 Subject: [PATCH 02/38] vdr: Forgot to add runvdr. --- config/vdr/runvdr | 125 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 config/vdr/runvdr diff --git a/config/vdr/runvdr b/config/vdr/runvdr new file mode 100644 index 000000000..94b117d59 --- /dev/null +++ b/config/vdr/runvdr @@ -0,0 +1,125 @@ +#!/bin/bash + +# runvdr - VDR launcher +# +# runvdr [VDROPTION]... + +shopt -s extglob nocasematch nullglob + +VDR=/usr/sbin/vdr +PLUGINDIR=/usr/lib/vdr +PLUGINVER=VDR_PLUGIN_VERSION +PLUGINSUF=${PLUGINVER:+.$PLUGINVER} + +log() +{ + type -P logger &>/dev/null && \ + logger -s -p daemon.info -t ${0##*/} "$1" 2>&1 || echo "INFO: $1" +} + +plugconf() +{ + local plugin=$1 PLUGIN_OPTIONS= PLUGIN_ENABLED= + if [[ -e /etc/sysconfig/vdr-plugins.d/$plugin.conf ]] ; then + . /etc/sysconfig/vdr-plugins.d/$plugin.conf + case $PLUGIN_ENABLED in no|false|0) return ;; esac + fi + if [[ $PLUGIN_OPTIONS ]] ; then + VDR_OPTIONS+=( --plugin="$plugin $PLUGIN_OPTIONS" ) + else + VDR_OPTIONS+=( --plugin=$plugin ) + fi +} + +build_cmdline() +{ + local plugin= p= + # Add "priority" plugins. + for plugin in $VDR_PLUGIN_ORDER ; do + [[ -e $PLUGINDIR/libvdr-${plugin}.so$PLUGINSUF ]] && plugconf $plugin + done + # Add the rest available. + for plugin in $PLUGINDIR/libvdr-*.so$PLUGINSUF ; do + plugin=${plugin##*/libvdr-} + plugin=${plugin%.so$PLUGINSUF} + for p in $VDR_PLUGIN_ORDER ; do + if [[ $plugin == $p ]] ; then + # Already added. + continue 2 + fi + done + plugconf $plugin + done +} + +reload_dvb() +{ + local modules=$( /sbin/lsmod | \ + awk '/^dvb_core/ { gsub(","," ",$4) ; print $4 }' ) + if [[ $modules ]] ; then + log "Reloading DVB modules" + /sbin/modprobe -r $modules dvb_core + for module in $modules ; do + /sbin/modprobe $module + done + fi +} + +set_rtcwake() +{ + # Check timestamp set by shutdown script. + local nexttimer=$( cat /var/run/vdr/next-timer 2>/dev/null ) + rm -f /var/run/vdr/next-timer + + if [[ $nexttimer != +([0-9]) ]] ; then + # Next timer timestamp not set by shutdown script or bogus, + # try to get it via SVDRP. + nexttimer=$( svdrpsend NEXT abs 2>/dev/null | \ + sed -rne 's/^250[[:space:]]+[0-9]+[[:space:]]+([0-9]+).*/\1/p' ) + fi + + if [[ $nexttimer && $nexttimer -gt $( date +%s ) ]] ; then + [[ -f /etc/sysconfig/vdr ]] && . /etc/sysconfig/vdr + local when=$(( $nexttimer - ${WAKEUP_BEFORE_RECORDING:-10} * 60 )) + local hrwhen=$( date -d "1970-01-01 $when sec UTC" ) + log "Setting wakeup time for next recording: $hrwhen" + /usr/sbin/rtcwake -m no -t $when >/dev/null + fi +} + +if [[ $1 == --set-wakeup ]] ; then + # Just set RTC wakeup for next timer event. + set_rtcwake + exit $? +fi + +rc= +while true ; do + + VDR_OPTIONS=() + if [[ $VDR_INIT ]] ; then + [[ -f /etc/sysconfig/vdr ]] && . /etc/sysconfig/vdr + [[ $DAEMON_COREFILE_LIMIT ]] && \ + ulimit -S -c $DAEMON_COREFILE_LIMIT &>/dev/null && \ + VDR_OPTIONS+=( --userdump ) && cd ${TMPDIR:-/tmp} + build_cmdline + fi + + $VDR "$@" "${VDR_OPTIONS[@]}" + rc=$? + + # 137: "kill -KILL" eg in killproc(), others: "man vdr" + case $rc in + 0|2|137) + log "VDR exited with status $rc, exiting" + break + ;; + *) + log "VDR exited with status $rc, attempting restart" + case $RELOAD_DVB in yes|true|1) reload_dvb ;; esac + ;; + esac + +done + +exit $rc From c435d7dc16c0e5c83842be62e6a8681db6abe253 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 20 Mar 2013 17:30:09 +0100 Subject: [PATCH 03/38] vdr: Add plugins: -streamdev, -epgsearch, -vnsiserver3. --- config/rootfiles/packages/vdr-epgsearch | 14 +++ config/rootfiles/packages/vdr-streamdev | 8 ++ config/rootfiles/packages/vdr-vnsiserver3 | 3 + config/rootfiles/packages/vdr_epgsearch | 25 ---- config/rootfiles/packages/vdr_softdevice | 26 ----- config/vdr/plugins.d/conflictcheckonly.conf | 7 ++ config/vdr/plugins.d/epgsearch.conf | 6 + config/vdr/plugins.d/epgsearchonly.conf | 7 ++ config/vdr/plugins.d/quickepgsearch.conf | 7 ++ config/vdr/plugins.d/streamdev-server.conf | 5 + lfs/vdr | 4 +- lfs/vdr-epgsearch | 109 ++++++++++++++++++ lfs/{vdr_softdevice => vdr-streamdev} | 69 +++++++++-- lfs/{vdr_epgsearch => vdr-vnsiserver3} | 60 ++++++++-- make.sh | 3 + .../vdr-epgsearch-1.0.1.beta3-paths.patch | 82 +++++++++++++ 16 files changed, 361 insertions(+), 74 deletions(-) create mode 100644 config/rootfiles/packages/vdr-epgsearch create mode 100644 config/rootfiles/packages/vdr-streamdev create mode 100644 config/rootfiles/packages/vdr-vnsiserver3 delete mode 100644 config/rootfiles/packages/vdr_epgsearch delete mode 100644 config/rootfiles/packages/vdr_softdevice create mode 100644 config/vdr/plugins.d/conflictcheckonly.conf create mode 100644 config/vdr/plugins.d/epgsearch.conf create mode 100644 config/vdr/plugins.d/epgsearchonly.conf create mode 100644 config/vdr/plugins.d/quickepgsearch.conf create mode 100644 config/vdr/plugins.d/streamdev-server.conf create mode 100644 lfs/vdr-epgsearch rename lfs/{vdr_softdevice => vdr-streamdev} (51%) rename lfs/{vdr_epgsearch => vdr-vnsiserver3} (57%) create mode 100644 src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch diff --git a/config/rootfiles/packages/vdr-epgsearch b/config/rootfiles/packages/vdr-epgsearch new file mode 100644 index 000000000..d09bf4b97 --- /dev/null +++ b/config/rootfiles/packages/vdr-epgsearch @@ -0,0 +1,14 @@ +etc/sysconfig/vdr-plugins.d/conflictcheckonly.conf +etc/sysconfig/vdr-plugins.d/epgsearch.conf +etc/sysconfig/vdr-plugins.d/epgsearchonly.conf +etc/sysconfig/vdr-plugins.d/quickepgsearch.conf +etc/vdr/plugins/epgsearch +etc/vdr/plugins/epgsearch/conf.d +usr/bin/createcats +usr/lib/vdr/libvdr-conflictcheckonly.so.1.7.41 +usr/lib/vdr/libvdr-epgsearch.so.1.7.41 +usr/lib/vdr/libvdr-epgsearchonly.so.1.7.41 +usr/lib/vdr/libvdr-quickepgsearch.so.1.7.41 +#var/lib/vdr +#var/lib/vdr/data +var/lib/vdr/data/epgsearch diff --git a/config/rootfiles/packages/vdr-streamdev b/config/rootfiles/packages/vdr-streamdev new file mode 100644 index 000000000..3b05d026d --- /dev/null +++ b/config/rootfiles/packages/vdr-streamdev @@ -0,0 +1,8 @@ +etc/sysconfig/vdr-plugins.d/streamdev-server.conf +#etc/vdr/plugins +etc/vdr/plugins/streamdev-server +etc/vdr/plugins/streamdev-server/streamdevhosts.conf +#usr/lib/vdr +#usr/lib/vdr/bin +usr/lib/vdr/bin/externremux.sh +usr/lib/vdr/libvdr-streamdev-server.so.1.7.41 diff --git a/config/rootfiles/packages/vdr-vnsiserver3 b/config/rootfiles/packages/vdr-vnsiserver3 new file mode 100644 index 000000000..2e78a13e9 --- /dev/null +++ b/config/rootfiles/packages/vdr-vnsiserver3 @@ -0,0 +1,3 @@ +etc/vdr/plugins/vnsiserver +etc/vdr/plugins/vnsiserver/allowed_hosts.conf +usr/lib/vdr/libvdr-vnsiserver.so.1.7.41 diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch deleted file mode 100644 index 1485d7523..000000000 --- a/config/rootfiles/packages/vdr_epgsearch +++ /dev/null @@ -1,25 +0,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-quickepgsearch.so.1.6.0 -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-epgsearch.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-epgsearch.mo diff --git a/config/rootfiles/packages/vdr_softdevice b/config/rootfiles/packages/vdr_softdevice deleted file mode 100644 index de66a778d..000000000 --- a/config/rootfiles/packages/vdr_softdevice +++ /dev/null @@ -1,26 +0,0 @@ -opt/vdr/bin/runvdr-soft -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-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/vdr/plugins.d/conflictcheckonly.conf b/config/vdr/plugins.d/conflictcheckonly.conf new file mode 100644 index 000000000..d5146946d --- /dev/null +++ b/config/vdr/plugins.d/conflictcheckonly.conf @@ -0,0 +1,7 @@ +# Configuration snippet for vdr-conflictcheckonly -*- sh -*- +# +# Add command line options to pass to the conflictcheckonly plugin to +# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED. + +PLUGIN_ENABLED=false +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/epgsearch.conf b/config/vdr/plugins.d/epgsearch.conf new file mode 100644 index 000000000..3c731190f --- /dev/null +++ b/config/vdr/plugins.d/epgsearch.conf @@ -0,0 +1,6 @@ +# Configuration snippet for vdr-epgsearch -*- sh -*- +# +# Add command line options to pass to the epgsearch plugin to PLUGIN_OPTIONS, +# see the epgsearch(1) man page for information about available options. + +PLUGIN_OPTIONS="-l /var/log/vdr/epgsearch.log" diff --git a/config/vdr/plugins.d/epgsearchonly.conf b/config/vdr/plugins.d/epgsearchonly.conf new file mode 100644 index 000000000..9208556fb --- /dev/null +++ b/config/vdr/plugins.d/epgsearchonly.conf @@ -0,0 +1,7 @@ +# Configuration snippet for vdr-epgsearchonly -*- sh -*- +# +# Add command line options to pass to the epgsearchonly plugin to +# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED. + +PLUGIN_ENABLED=false +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/quickepgsearch.conf b/config/vdr/plugins.d/quickepgsearch.conf new file mode 100644 index 000000000..e30285061 --- /dev/null +++ b/config/vdr/plugins.d/quickepgsearch.conf @@ -0,0 +1,7 @@ +# Configuration snippet for vdr-quickepgsearch -*- sh -*- +# +# Add command line options to pass to the quickepgsearch plugin to +# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED. + +PLUGIN_ENABLED=false +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/streamdev-server.conf b/config/vdr/plugins.d/streamdev-server.conf new file mode 100644 index 000000000..52c11cfc3 --- /dev/null +++ b/config/vdr/plugins.d/streamdev-server.conf @@ -0,0 +1,5 @@ +# Configuration snippet for vdr-streamdev-server -*- sh -*- +# +# Add command line options to pass to the streamdev-server plugin to PLUGIN_OPTIONS. + +PLUGIN_OPTIONS="" diff --git a/lfs/vdr b/lfs/vdr index f881134dc..069b90ea8 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -34,14 +34,14 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr PAK_VER = 6 -DEPS = "freefont" +DEPS = "freefont vdr-streamdev" MAKE_OPTIONS = \ PREFIX=/usr \ BINDIR=/usr/bin \ CACHEDIR=/var/cache/vdr \ CONFDIR=/etc/vdr \ - INCDIR=/usr/include/vdr \ + INCDIR=/usr/include \ LIBDIR=/usr/lib/vdr \ LOCDIR=/usr/share/locale \ MANDIR=/usr/share/man \ diff --git a/lfs/vdr-epgsearch b/lfs/vdr-epgsearch new file mode 100644 index 000000000..b8543b3dd --- /dev/null +++ b/lfs/vdr-epgsearch @@ -0,0 +1,109 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2012 IPFire Team # +# # +# 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 = 1.0.1.beta3 +THISAPP = vdr-epgsearch-$(VER) +DL_FILE = $(THISAPP).tgz + +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/epgsearch-$(VER) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = vdr-epgsearch +PAK_VER = 1 + +DEPS = "vdr" + +VDR_VER = 1.7.41 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = f39e5ace38ea99f114425687057e4dbe + +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 axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch + + cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + LOCALEDIR=$$(pwd)/locale all + + cd $(DIR_APP) && install -m 755 libvdr-conflictcheckonly.so \ + /usr/lib/vdr/libvdr-conflictcheckonly.so.$(VDR_VER) + cd $(DIR_APP) && install -m 755 libvdr-epgsearchonly.so \ + /usr/lib/vdr/libvdr-epgsearchonly.so.$(VDR_VER) + cd $(DIR_APP) && install -m 755 libvdr-epgsearch.so \ + /usr/lib/vdr/libvdr-epgsearch.so.$(VDR_VER) + cd $(DIR_APP) && install -m 755 libvdr-quickepgsearch.so \ + /usr/lib/vdr/libvdr-quickepgsearch.so.$(VDR_VER) + + install -m 644 \ + $(DIR_SRC)/config/vdr/plugins.d/epgsearch.conf \ + $(DIR_SRC)/config/vdr/plugins.d/epgsearchonly.conf \ + $(DIR_SRC)/config/vdr/plugins.d/conflictcheckonly.conf \ + $(DIR_SRC)/config/vdr/plugins.d/quickepgsearch.conf \ + /etc/sysconfig/vdr-plugins.d + + -mkdir -pv /etc/vdr/plugins/epgsearch/conf.d + -mkdir -pv /var/lib/vdr/data/epgsearch + + cd $(DIR_APP) && install -m 755 createcats /usr/bin/createcats + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/vdr_softdevice b/lfs/vdr-streamdev similarity index 51% rename from lfs/vdr_softdevice rename to lfs/vdr-streamdev index c836e2e6d..6b0e52028 100644 --- a/lfs/vdr_softdevice +++ b/lfs/vdr-streamdev @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team # # # # 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 # @@ -24,29 +24,76 @@ include Config -VER = plugin +VER = 0.6.1 +GIT_VER = 10db11ac +THISAPP = vdr-streamdev-$(GIT_VER) +DL_FILE = $(THISAPP).tar.xz -THISAPP = vdr_softdevice-$(VER) +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -PROG = vdr_softdevice -PAK_VER = 5 +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = vdr-streamdev +PAK_VER = 1 -DEPS = "vdr ffmpeg sdl alsa dfb++" +DEPS = "vdr" + +VDR_VER = 1.7.41 ############################################################################### # Top-level Rules ############################################################################### +objects = $(DL_FILE) -install : +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -check : +$(DL_FILE)_MD5 = e5011fd1a4b0624b192911f37c6040e3 -download : +install : $(TARGET) -md5 : +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download : $(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) dist: - $(PAK) + @$(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 axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && sed -i 's@$(VDRDIR)/device.h@/usr/include/vdr/device.h@' Makefile + cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + LOCALEDIR=$$(pwd)/locale all + + -mkdir -pv /etc/vdr/plugins/streamdev-server /usr/lib/vdr/bin + cd $(DIR_APP) && install -m 755 server/libvdr-streamdev-server.so \ + /usr/lib/vdr/libvdr-streamdev-server.so.$(VDR_VER) + cd $(DIR_APP) && install -m 644 streamdev-server/streamdevhosts.conf \ + /etc/vdr/plugins/streamdev-server + cd $(DIR_APP) && install -m 755 streamdev-server/externremux.sh \ + /usr/lib/vdr/bin/externremux.sh + install -m 644 $(DIR_SRC)/config/vdr/plugins.d/streamdev-server.conf \ + /etc/sysconfig/vdr-plugins.d + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/vdr_epgsearch b/lfs/vdr-vnsiserver3 similarity index 57% rename from lfs/vdr_epgsearch rename to lfs/vdr-vnsiserver3 index ead59a152..da0e4a756 100644 --- a/lfs/vdr_epgsearch +++ b/lfs/vdr-vnsiserver3 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team # # # # 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 # @@ -24,29 +24,69 @@ include Config -VER = plugin +VER = 0.9.0 +THISAPP = vdr-vnsiserver3 +DL_FILE = $(THISAPP).tar.xz -THISAPP = vdr_epgsearch-$(VER) +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -PROG = vdr_epgsearch -PAK_VER = 5 +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = vdr-vnsiserver3 +PAK_VER = 1 DEPS = "vdr" +VDR_VER = 1.7.41 + ############################################################################### # Top-level Rules ############################################################################### +objects = $(DL_FILE) -install : +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -check : +$(DL_FILE)_MD5 = 159a36577ea50d9772fcf5a92ffd38b5 -download : +install : $(TARGET) -md5 : +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download : $(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) dist: - $(PAK) + @$(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 axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + LOCALEDIR=$$(pwd)/locale all + + -mkdir -pv /etc/vdr/plugins/vnsiserver + cd $(DIR_APP) && install -m 755 libvdr-vnsiserver.so \ + /usr/lib/vdr/libvdr-vnsiserver.so.$(VDR_VER) + cd $(DIR_APP) && install -m 644 vnsiserver/* /etc/vdr/plugins/vnsiserver + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 359542143..2cba3505b 100755 --- a/make.sh +++ b/make.sh @@ -664,6 +664,9 @@ buildipfire() { ipfiremake faad2 ipfiremake ffmpeg ipfiremake vdr + ipfiremake vdr-streamdev + ipfiremake vdr-vnsiserver3 + ipfiremake vdr-epgsearch ipfiremake w_scan ipfiremake icecast ipfiremake icegenerator diff --git a/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch b/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch new file mode 100644 index 000000000..d8319c0af --- /dev/null +++ b/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch @@ -0,0 +1,82 @@ +diff -up epgsearch-1.0.1.beta2/epgsearch.c~ epgsearch-1.0.1.beta2/epgsearch.c +--- epgsearch-1.0.1.beta2/epgsearch.c~ 2012-06-11 20:01:54.000000000 +0300 ++++ epgsearch-1.0.1.beta2/epgsearch.c 2012-06-12 22:20:38.740086339 +0300 +@@ -446,16 +446,16 @@ bool cPluginEpgsearch::Start(void) + LoadConfD(); + LoadUserVars(); + +- ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true); +- Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf")); +- SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf")); +- SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf")); +- RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data")); +- SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf")); +- NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf")); +- DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf")); +- TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf")); +- PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf")); ++ ChannelGroups.Load("/var/lib/vdr/data/epgsearch/epgsearchchangrps.conf", true); ++ Blacklists.Load("/var/lib/vdr/data/epgsearch/epgsearchblacklists.conf"); ++ SearchExts.Load("/var/lib/vdr/data/epgsearch/epgsearch.conf"); ++ SearchTemplates.Load("/var/lib/vdr/data/epgsearch/epgsearchtemplates.conf"); ++ RecsDone.Load("/var/lib/vdr/data/epgsearch/epgsearchdone.data"); ++ SwitchTimers.Load("/var/lib/vdr/data/epgsearch/epgsearchswitchtimers.conf"); ++ NoAnnounces.Load("/var/lib/vdr/data/epgsearch/noannounce.conf"); ++ DefTimerCheckModes.Load("/var/lib/vdr/data/epgsearch/deftimerchkmodes.conf"); ++ TimersDone.Load("/var/lib/vdr/data/epgsearch/timersdone.conf"); ++ PendingNotifications.Load("/var/lib/vdr/data/epgsearch/pendingnotifications.conf"); + + cSearchTimerThread::Init(this); + cSwitchTimerThread::Init(); +diff -up epgsearch-1.0.1.beta2/epgsearchcfg.c~ epgsearch-1.0.1.beta2/epgsearchcfg.c +--- epgsearch-1.0.1.beta2/epgsearchcfg.c~ 2012-06-11 19:43:52.000000000 +0300 ++++ epgsearch-1.0.1.beta2/epgsearchcfg.c 2012-06-12 22:20:39.169055465 +0300 +@@ -80,7 +80,7 @@ cEPGSearchConfig::cEPGSearchConfig(void) + strcpy(MailAuthUser, ""); + strcpy(MailAuthPass, ""); + strcpy(LastMailConflicts, ""); +- mailViaScript = 1; ++ mailViaScript = 0; + manualTimerCheckDefault = 0; + noAnnounceWhileReplay = 0; + TimerProgRepeat = 0; +diff -up epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ epgsearch-1.0.1.beta2/scripts/recordingdone.sh +--- epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ 2012-06-12 22:19:28.570878733 +0300 ++++ epgsearch-1.0.1.beta2/scripts/recordingdone.sh 2012-06-12 22:20:39.536029167 +0300 +@@ -60,10 +60,10 @@ CTIME_FROM_RECORDING=yes + SVDRPSEND=svdrpsend + + # Home of EPGsearch +-EPGSEARCH_HOME="/etc/vdr/plugins" ++EPGSEARCH_HOME="/var/lib/vdr/data/epgsearch" + + # Video root +-VIDEO_ROOT="/video" ++VIDEO_ROOT="/var/video" + + # do not edit below this line + #------------------------------------------------------------------------------ +diff -up epgsearch-1.0.1.beta2/scripts/recrep.sh~ epgsearch-1.0.1.beta2/scripts/recrep.sh +--- epgsearch-1.0.1.beta2/scripts/recrep.sh~ 2012-06-11 19:43:51.000000000 +0300 ++++ epgsearch-1.0.1.beta2/scripts/recrep.sh 2012-06-12 22:20:39.914002061 +0300 +@@ -15,7 +15,7 @@ + # adjust the following lines to your config + + # your plugins config dir +-PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch ++PLUGINCONFDIR=/etc/vdr/plugins/epgsearch + # path to svdrpsend + SVDRPSEND=svdrpsend + # the key used to call epgsearch +diff -up epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh +--- epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ 2012-06-11 19:43:51.000000000 +0300 ++++ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh 2012-06-12 22:20:40.723944345 +0300 +@@ -15,7 +15,7 @@ + # + + # Your timers.conf +-TIMERS="/video/timers.conf" ++TIMERS="/etc/vdr/timers.conf" + + # + From 1580ba11750e3c5885becfbbbbb427535b799eb6 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 23 Mar 2013 18:50:16 +0100 Subject: [PATCH 04/38] strip: Don't strip VDR binaries. --- lfs/strip | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lfs/strip b/lfs/strip index 30cb9b33b..d07ff43ee 100644 --- a/lfs/strip +++ b/lfs/strip @@ -46,5 +46,9 @@ md5 : ############################################################################### $(TARGET) : + # Don't strip VDR binaries, because they use a weird plugin system + # which does not work when unneeded symbols get stripped from + # /usr/sbin/vdr. STRIP="/tools/bin/strip" $(DIR_SRC)/src/stripper / \ - --exclude=/usr/src --exclude=/tools + --exclude=/usr/src --exclude=/tools \ + --exclude=/usr/sbin/vdr --exclude=/usr/lib/vdr From 37882beab7980b029ca777621157658956b6a0eb Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 24 Mar 2013 12:56:55 +0100 Subject: [PATCH 05/38] vdr: Include new configuration directory in backup. --- config/backup/includes/vdr | 1 + 1 file changed, 1 insertion(+) diff --git a/config/backup/includes/vdr b/config/backup/includes/vdr index d8d58a5d5..479c08df7 100644 --- a/config/backup/includes/vdr +++ b/config/backup/includes/vdr @@ -1 +1,2 @@ +/etc/vdr /opt/vdr/etc/ From 0e421e2723a5079ac39616e91abd07ddc05d427d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 24 Mar 2013 12:57:38 +0100 Subject: [PATCH 06/38] vdradmin: Update to 3.6.9. --- lfs/vdradmin | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lfs/vdradmin b/lfs/vdradmin index 3bd788f0e..c9187b49d 100644 --- a/lfs/vdradmin +++ b/lfs/vdradmin @@ -25,7 +25,7 @@ include Config -VER = 3.6.7 +VER = 3.6.9 THISAPP = vdradmin-am-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -35,7 +35,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdradmin PAK_VER = 4 -DEPS = "perl-gettext vdr" +DEPS = "perl-gettext vdr vdr-epgsearch" ############################################################################### # Top-level Rules @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8b1b2f8bbff26cbb47e79d5b55dbd3c1 +$(DL_FILE)_MD5 = d5cd89325f5a5dca5846a905b17d0bc2 install : $(TARGET) @@ -83,8 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./install-ipfire.sh install -v -m 644 $(DIR_SRC)/config/vdradmin/vdradmind.conf \ /etc/vdradmin/vdradmind.conf - mkdir /var/log/vdradmin - mkdir /var/run/vdradmin - mkdir /var/cache/vdradmin + mkdir -pv /var/log/vdradmin + mkdir -pv /var/run/vdradmin + mkdir -pv /var/cache/vdradmin @rm -rf $(DIR_APP) @$(POSTBUILD) From e16ed29cb0cf2fd29f396e55473e47528d38e0f7 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 24 Mar 2013 12:59:05 +0100 Subject: [PATCH 07/38] vdr-vnsiserver3: Add configuration file. --- config/vdr/plugins.d/vnsiserver.conf | 5 +++++ lfs/vdr-vnsiserver3 | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 config/vdr/plugins.d/vnsiserver.conf diff --git a/config/vdr/plugins.d/vnsiserver.conf b/config/vdr/plugins.d/vnsiserver.conf new file mode 100644 index 000000000..b69d4ca05 --- /dev/null +++ b/config/vdr/plugins.d/vnsiserver.conf @@ -0,0 +1,5 @@ +# Configuration snippet for vdr-vnsiserver -*- sh -*- +# +# Add command line options to pass to the vnsiserver plugin to PLUGIN_OPTIONS. + +PLUGIN_OPTIONS="" diff --git a/lfs/vdr-vnsiserver3 b/lfs/vdr-vnsiserver3 index da0e4a756..fd9d6ca1c 100644 --- a/lfs/vdr-vnsiserver3 +++ b/lfs/vdr-vnsiserver3 @@ -87,6 +87,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && install -m 755 libvdr-vnsiserver.so \ /usr/lib/vdr/libvdr-vnsiserver.so.$(VDR_VER) cd $(DIR_APP) && install -m 644 vnsiserver/* /etc/vdr/plugins/vnsiserver + install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver.conf \ + /etc/sysconfig/vdr-plugins.d @rm -rf $(DIR_APP) @$(POSTBUILD) From 90dc87b7de182ae1b82179a1fb1dfab38bf80bb9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 24 Mar 2013 13:00:22 +0100 Subject: [PATCH 08/38] vdr: Small adjustments. * Make links for config.h and device.h to easily build plugins outside the VDR source tree. * Add vdr configuration file. * Remove some unused stuff from runvdr script. --- config/rootfiles/packages/vdr | 5 +++++ config/vdr/runvdr | 41 +++++------------------------------ config/vdr/vdr.sysconfig | 39 +++++++++++++++++++++++++++++++++ lfs/vdr | 8 +++++++ 4 files changed, 57 insertions(+), 36 deletions(-) create mode 100644 config/vdr/vdr.sysconfig diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr index 3bc0aad64..4b6eaffe2 100644 --- a/config/rootfiles/packages/vdr +++ b/config/rootfiles/packages/vdr @@ -2,6 +2,7 @@ etc/rc.d/init.d/vdr etc/rc.d/rc0.d/K40vdr etc/rc.d/rc3.d/S60vdr etc/rc.d/rc6.d/K40vdr +etc/sysconfig/vdr #etc/sysconfig/vdr-plugins.d etc/vdr etc/vdr/channels.conf @@ -71,6 +72,10 @@ usr/bin/svdrpsend #usr/include/vdr/tools.h #usr/include/vdr/transfer.h #usr/include/vdr/videodir.h +#usr/lib/vdr +#usr/lib/vdr/Make.global +#usr/lib/vdr/config.h +#usr/lib/vdr/device.h usr/sbin/runvdr usr/sbin/vdr usr/share/vdr diff --git a/config/vdr/runvdr b/config/vdr/runvdr index 94b117d59..5dcfd6c39 100644 --- a/config/vdr/runvdr +++ b/config/vdr/runvdr @@ -65,45 +65,14 @@ reload_dvb() fi } -set_rtcwake() -{ - # Check timestamp set by shutdown script. - local nexttimer=$( cat /var/run/vdr/next-timer 2>/dev/null ) - rm -f /var/run/vdr/next-timer - - if [[ $nexttimer != +([0-9]) ]] ; then - # Next timer timestamp not set by shutdown script or bogus, - # try to get it via SVDRP. - nexttimer=$( svdrpsend NEXT abs 2>/dev/null | \ - sed -rne 's/^250[[:space:]]+[0-9]+[[:space:]]+([0-9]+).*/\1/p' ) - fi - - if [[ $nexttimer && $nexttimer -gt $( date +%s ) ]] ; then - [[ -f /etc/sysconfig/vdr ]] && . /etc/sysconfig/vdr - local when=$(( $nexttimer - ${WAKEUP_BEFORE_RECORDING:-10} * 60 )) - local hrwhen=$( date -d "1970-01-01 $when sec UTC" ) - log "Setting wakeup time for next recording: $hrwhen" - /usr/sbin/rtcwake -m no -t $when >/dev/null - fi -} - -if [[ $1 == --set-wakeup ]] ; then - # Just set RTC wakeup for next timer event. - set_rtcwake - exit $? -fi - rc= while true ; do - VDR_OPTIONS=() - if [[ $VDR_INIT ]] ; then - [[ -f /etc/sysconfig/vdr ]] && . /etc/sysconfig/vdr - [[ $DAEMON_COREFILE_LIMIT ]] && \ - ulimit -S -c $DAEMON_COREFILE_LIMIT &>/dev/null && \ - VDR_OPTIONS+=( --userdump ) && cd ${TMPDIR:-/tmp} - build_cmdline - fi + [[ -f /etc/sysconfig/vdr ]] && . /etc/sysconfig/vdr + [[ $DAEMON_COREFILE_LIMIT ]] && \ + ulimit -S -c $DAEMON_COREFILE_LIMIT &>/dev/null && \ + VDR_OPTIONS+=( --userdump ) && cd ${TMPDIR:-/tmp} + build_cmdline $VDR "$@" "${VDR_OPTIONS[@]}" rc=$? diff --git a/config/vdr/vdr.sysconfig b/config/vdr/vdr.sysconfig new file mode 100644 index 000000000..f4f78bb37 --- /dev/null +++ b/config/vdr/vdr.sysconfig @@ -0,0 +1,39 @@ +# System configuration for VDR -*- sh -*- + +# The "master" options. Some examples of options you may want to set +# here are -r, -t, and --rcu. See the vdr(1) man page for more info. +# +VDR_OPTIONS=(--vfat) + +# VDR_PLUGIN_ORDER is a space separated list of plugins that should be +# loaded in a specific order. This affects eg. the order the plugins' +# menu entries are displayed OSD menus by default. The plugins in this +# list don't need to be installed, but if they are, they will be loaded +# before other possibly installed plugins. Note that it is recommended +# to load output plugins before others so that all necessary features are +# present when needed by other plugins at startup/shutdown. +# +VDR_PLUGIN_ORDER=" +streamdev-server +epgsearch +vnsiserver +" + +# PATH where to find the internally used executables. +# +PATH="/usr/lib/vdr/bin:$PATH" + +# How many minutes before a recording should the VDR box wake up? +# Some CI/CAM combinations can take quite a long time to initialize, so +# we default to a pretty generous value here. +# +WAKEUP_BEFORE_RECORDING=10 + +# Try reloading DVB modules on unexpected exits? +# +#RELOAD_DVB=yes + +# For debugging: allow vdr to dump core. Note that depending on the operating +# environment, core dumps from setuid processes may be a security issue. +# +#DAEMON_COREFILE_LIMIT="unlimited" diff --git a/lfs/vdr b/lfs/vdr index 069b90ea8..24eac9b7d 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -116,8 +116,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Install configuration. mkdir -pv /etc/vdr mkdir -pv /etc/sysconfig/vdr-plugins.d + cd $(DIR_APP) && install -m 644 $(DIR_SRC)/config/vdr/vdr.sysconfig \ + /etc/sysconfig/vdr cd $(DIR_APP) && install -m 644 *.conf /etc/vdr + # Link development files. + mkdir -pv /usr/lib/vdr + cd $(DIR_APP) && cp -vf Make.global /usr/lib/vdr + ln -svf ../../include/vdr/config.h /usr/lib/vdr/config.h + ln -svf ../../include/vdr/device.h /usr/lib/vdr/device.h + # 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 From 60a4bfc125fb89a5ee679ee7d5a6249662ea5b82 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 24 Mar 2013 13:24:40 +0100 Subject: [PATCH 09/38] vdr: Update initscript. --- src/initscripts/init.d/vdr | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/initscripts/init.d/vdr b/src/initscripts/init.d/vdr index e42887fb8..759ad344d 100644 --- a/src/initscripts/init.d/vdr +++ b/src/initscripts/init.d/vdr @@ -18,23 +18,13 @@ case "${1}" in start) boot_mesg "Starting Video Disk Recorder..." - if [ "$(ps -A | grep runvdr)" != "" ]; then - boot_mesg "Error! Already running!" - echo_failure - exit 1; - fi - if [ ! -e /dev/dvb/adapter0/frontend0 ]; then - boot_mesg "Error! No DVB tuner found." - echo_failure - exit 0; - fi - loadproc screen -dmS vdr /opt/vdr/bin/runvdr + /usr/sbin/runvdr >/dev/null 2>&1 & + evaluate_retval ;; stop) boot_mesg "Stopping Video Disk Recorder..." - killall -s KILL -w runvdr - killproc /opt/vdr/bin/vdr + killproc /usr/sbin/vdr ;; restart) @@ -44,8 +34,8 @@ case "${1}" in ;; status) - statusproc /opt/vdr/bin/runvdr - statusproc /opt/vdr/bin/vdr + statusproc /usr/sbin/runvdr + statusproc /usr/sbin/vdr ;; *) From cf068ec48255c96cc5263c907143c7f6c0fbdcbb Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 24 Mar 2013 22:47:17 +0100 Subject: [PATCH 10/38] vdr-vnsiserver3: Change plugin. --- config/rootfiles/packages/vdr-vnsiserver3 | 3 ++- config/vdr/plugins.d/vnsiserver.conf | 5 ----- config/vdr/plugins.d/vnsiserver3.conf | 5 +++++ config/vdr/vdr.sysconfig | 2 +- lfs/vdr-vnsiserver3 | 17 +++++++++++------ 5 files changed, 19 insertions(+), 13 deletions(-) delete mode 100644 config/vdr/plugins.d/vnsiserver.conf create mode 100644 config/vdr/plugins.d/vnsiserver3.conf diff --git a/config/rootfiles/packages/vdr-vnsiserver3 b/config/rootfiles/packages/vdr-vnsiserver3 index 2e78a13e9..79187e0d7 100644 --- a/config/rootfiles/packages/vdr-vnsiserver3 +++ b/config/rootfiles/packages/vdr-vnsiserver3 @@ -1,3 +1,4 @@ +etc/sysconfig/vdr-plugins.d/vnsiserver3.conf etc/vdr/plugins/vnsiserver etc/vdr/plugins/vnsiserver/allowed_hosts.conf -usr/lib/vdr/libvdr-vnsiserver.so.1.7.41 +usr/lib/vdr/libvdr-vnsiserver3.so.1.7.41 diff --git a/config/vdr/plugins.d/vnsiserver.conf b/config/vdr/plugins.d/vnsiserver.conf deleted file mode 100644 index b69d4ca05..000000000 --- a/config/vdr/plugins.d/vnsiserver.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Configuration snippet for vdr-vnsiserver -*- sh -*- -# -# Add command line options to pass to the vnsiserver plugin to PLUGIN_OPTIONS. - -PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/vnsiserver3.conf b/config/vdr/plugins.d/vnsiserver3.conf new file mode 100644 index 000000000..7c9706d1c --- /dev/null +++ b/config/vdr/plugins.d/vnsiserver3.conf @@ -0,0 +1,5 @@ +# Configuration snippet for vdr-vnsiserver3 -*- sh -*- +# +# Add command line options to pass to the vnsiserver3 plugin to PLUGIN_OPTIONS. + +PLUGIN_OPTIONS="" diff --git a/config/vdr/vdr.sysconfig b/config/vdr/vdr.sysconfig index f4f78bb37..a1cebf10f 100644 --- a/config/vdr/vdr.sysconfig +++ b/config/vdr/vdr.sysconfig @@ -16,7 +16,7 @@ VDR_OPTIONS=(--vfat) VDR_PLUGIN_ORDER=" streamdev-server epgsearch -vnsiserver +vnsiserver3 " # PATH where to find the internally used executables. diff --git a/lfs/vdr-vnsiserver3 b/lfs/vdr-vnsiserver3 index fd9d6ca1c..a0e85e1bd 100644 --- a/lfs/vdr-vnsiserver3 +++ b/lfs/vdr-vnsiserver3 @@ -24,8 +24,8 @@ include Config -VER = 0.9.0 -THISAPP = vdr-vnsiserver3 +VER = cc03615 +THISAPP = vdr-vnsiserver3-$(VER) DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) @@ -38,6 +38,10 @@ DEPS = "vdr" VDR_VER = 1.7.41 +EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +CFLAGS += $(EXTRA_FLAGS) +CXXFLAGS += $(EXTRA_FLAGS) + ############################################################################### # Top-level Rules ############################################################################### @@ -46,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 159a36577ea50d9772fcf5a92ffd38b5 +$(DL_FILE)_MD5 = 5100b1cb1ee936f64b99a76c492fbc3f install : $(TARGET) @@ -81,13 +85,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ LOCALEDIR=$$(pwd)/locale all -mkdir -pv /etc/vdr/plugins/vnsiserver - cd $(DIR_APP) && install -m 755 libvdr-vnsiserver.so \ - /usr/lib/vdr/libvdr-vnsiserver.so.$(VDR_VER) + cd $(DIR_APP) && install -m 755 libvdr-vnsiserver3.so \ + /usr/lib/vdr/libvdr-vnsiserver3.so.$(VDR_VER) cd $(DIR_APP) && install -m 644 vnsiserver/* /etc/vdr/plugins/vnsiserver - install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver.conf \ + install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver3.conf \ /etc/sysconfig/vdr-plugins.d @rm -rf $(DIR_APP) From f6fdef38ca0a73caf56eadb246850c0214033973 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 24 Mar 2013 22:47:51 +0100 Subject: [PATCH 11/38] vdr-streamdev: Fix compilation. --- lfs/vdr-streamdev | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lfs/vdr-streamdev b/lfs/vdr-streamdev index 6b0e52028..a6fa219d8 100644 --- a/lfs/vdr-streamdev +++ b/lfs/vdr-streamdev @@ -39,6 +39,10 @@ DEPS = "vdr" VDR_VER = 1.7.41 +EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +CFLAGS += $(EXTRA_FLAGS) +CXXFLAGS += $(EXTRA_FLAGS) + ############################################################################### # Top-level Rules ############################################################################### @@ -83,6 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && sed -i 's@$(VDRDIR)/device.h@/usr/include/vdr/device.h@' Makefile cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ LOCALEDIR=$$(pwd)/locale all -mkdir -pv /etc/vdr/plugins/streamdev-server /usr/lib/vdr/bin From 19d61ef8f4595948c2b7f59e3ffea1e91fc4e1eb Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 24 Mar 2013 22:48:33 +0100 Subject: [PATCH 12/38] Add /usr/bin/locale to the distribution. This is needed by vdradmin. --- config/rootfiles/common/armv5tel/glibc | 2 +- config/rootfiles/common/i586/glibc | 2 +- config/rootfiles/core/68/filelists/files | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc index 42ae490ce..28103897c 100644 --- a/config/rootfiles/common/armv5tel/glibc +++ b/config/rootfiles/common/armv5tel/glibc @@ -52,7 +52,7 @@ sbin/ldconfig #usr/bin/getent #usr/bin/iconv usr/bin/ldd -#usr/bin/locale +usr/bin/locale #usr/bin/localedef #usr/bin/mtrace #usr/bin/pcprofiledump diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc index ca62948a3..d17d7dadd 100644 --- a/config/rootfiles/common/i586/glibc +++ b/config/rootfiles/common/i586/glibc @@ -53,7 +53,7 @@ sbin/ldconfig #usr/bin/iconv usr/bin/ldd #usr/bin/lddlibc4 -#usr/bin/locale +usr/bin/locale #usr/bin/localedef #usr/bin/mtrace #usr/bin/pcprofiledump diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files index 10ccc2c7c..83b7a5fbd 100644 --- a/config/rootfiles/core/68/filelists/files +++ b/config/rootfiles/core/68/filelists/files @@ -5,6 +5,7 @@ srv/web/ipfire/html/themes/ipfire/include/style.css srv/web/ipfire/html/themes/ipfire/include/functions.pl srv/web/ipfire/html/themes/maniac/include/style.css srv/web/ipfire/html/include/jquery-1.9.1.min.js +usr/bin/locale var/ipfire/backup/include var/ipfire/header.pl var/ipfire/general-functions.pl From 5386d69ca03900fbd0218509b04874dd44592cd1 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 27 Mar 2013 13:04:32 +0100 Subject: [PATCH 13/38] vdradmin: Update configuration for new versions of VDR. --- src/paks/vdradmin/install.sh | 27 +++++++++++++++++++++++++ src/paks/vdradmin/uninstall.sh | 27 +++++++++++++++++++++++++ src/paks/vdradmin/update.sh | 36 ++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 src/paks/vdradmin/install.sh create mode 100644 src/paks/vdradmin/uninstall.sh create mode 100644 src/paks/vdradmin/update.sh diff --git a/src/paks/vdradmin/install.sh b/src/paks/vdradmin/install.sh new file mode 100644 index 000000000..31c5fecae --- /dev/null +++ b/src/paks/vdradmin/install.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} +start_service --background ${NAME} diff --git a/src/paks/vdradmin/uninstall.sh b/src/paks/vdradmin/uninstall.sh new file mode 100644 index 000000000..a7b8a5370 --- /dev/null +++ b/src/paks/vdradmin/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +remove_files diff --git a/src/paks/vdradmin/update.sh b/src/paks/vdradmin/update.sh new file mode 100644 index 000000000..f83cdf3ba --- /dev/null +++ b/src/paks/vdradmin/update.sh @@ -0,0 +1,36 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +./uninstall.sh +./install.sh + +# Update configuration options for new versions of VDR. +stop_service ${NAME} + +sed -i /etc/vdradmin/vdradmind.conf \ + -e "s/^LANG = .*/LANG = en_US.utf8/g" \ + -e "s/^PORT = .*/PORT = 6419/g" + +start_service ${NAME} From b8013a57adfbf8e9977e38c425e8bd0cdcfca047 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 27 Mar 2013 13:50:16 +0100 Subject: [PATCH 14/38] vdr: Add /var/video if it does not exist, yet. --- src/paks/vdr/install.sh | 32 ++++++++++++++++++++++++++++++++ src/paks/vdr/uninstall.sh | 27 +++++++++++++++++++++++++++ src/paks/vdr/update.sh | 26 ++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 src/paks/vdr/install.sh create mode 100644 src/paks/vdr/uninstall.sh create mode 100644 src/paks/vdr/update.sh diff --git a/src/paks/vdr/install.sh b/src/paks/vdr/install.sh new file mode 100644 index 000000000..a02357d97 --- /dev/null +++ b/src/paks/vdr/install.sh @@ -0,0 +1,32 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} +start_service --background ${NAME} + +# Create video directory if it does not exist, yet. +if [ ! -e "/var/video" ]; then + mkdir -p /var/video +fi diff --git a/src/paks/vdr/uninstall.sh b/src/paks/vdr/uninstall.sh new file mode 100644 index 000000000..a7b8a5370 --- /dev/null +++ b/src/paks/vdr/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +remove_files diff --git a/src/paks/vdr/update.sh b/src/paks/vdr/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/vdr/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh From 9d9479b5c15ffb88bbc229150df60deb4c34eaf9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 27 Mar 2013 13:53:15 +0100 Subject: [PATCH 15/38] vdradmin: Update configuration. --- config/vdradmin/vdradmind.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/vdradmin/vdradmind.conf b/config/vdradmin/vdradmind.conf index 022efe797..226b9cc27 100644 --- a/config/vdradmin/vdradmind.conf +++ b/config/vdradmin/vdradmind.conf @@ -31,7 +31,7 @@ ES_SORTBY = pattern GUEST_ACCOUNT = 0 GUI_POPUP_HEIGHT = 250 GUI_POPUP_WIDTH = 500 -LANG = +LANG = en_US.utf8 LOCAL_NET = 0.0.0.0/32 LOGFILE = vdradmind.log LOGGING = 0 @@ -83,6 +83,6 @@ USERNAME = vdradmin USERNAME_GUEST = guest VDRCONFDIR = /opt/vdr/etc VDR_HOST = localhost -VDR_PORT = 2001 +VDR_PORT = 6419 VIDEODIR = /var/video ZEITRAHMEN = 1 From 8832801c08263f3442eb1b2902b129ee687c33ec Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 27 Mar 2013 13:53:38 +0100 Subject: [PATCH 16/38] vdradmin: Oops. Wrong variable name. --- src/paks/vdradmin/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paks/vdradmin/update.sh b/src/paks/vdradmin/update.sh index f83cdf3ba..ec21a577d 100644 --- a/src/paks/vdradmin/update.sh +++ b/src/paks/vdradmin/update.sh @@ -31,6 +31,6 @@ stop_service ${NAME} sed -i /etc/vdradmin/vdradmind.conf \ -e "s/^LANG = .*/LANG = en_US.utf8/g" \ - -e "s/^PORT = .*/PORT = 6419/g" + -e "s/^VDR_PORT = .*/VDR_PORT = 6419/g" start_service ${NAME} From 6641e7a1f0007c998c8301a7f74a9790ad3909f7 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 27 Mar 2013 13:57:37 +0100 Subject: [PATCH 17/38] vdr-streamdev: Reuse svdrphosts.conf. --- lfs/vdr-streamdev | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lfs/vdr-streamdev b/lfs/vdr-streamdev index a6fa219d8..281b531fc 100644 --- a/lfs/vdr-streamdev +++ b/lfs/vdr-streamdev @@ -93,8 +93,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /etc/vdr/plugins/streamdev-server /usr/lib/vdr/bin cd $(DIR_APP) && install -m 755 server/libvdr-streamdev-server.so \ /usr/lib/vdr/libvdr-streamdev-server.so.$(VDR_VER) - cd $(DIR_APP) && install -m 644 streamdev-server/streamdevhosts.conf \ - /etc/vdr/plugins/streamdev-server + ln -svf ../../svdrphosts.conf /etc/vdr/plugins/streamdev-server cd $(DIR_APP) && install -m 755 streamdev-server/externremux.sh \ /usr/lib/vdr/bin/externremux.sh install -m 644 $(DIR_SRC)/config/vdr/plugins.d/streamdev-server.conf \ From c99048fd983627e5a63e3fbe73da5233d3bbb9fe Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 27 Mar 2013 13:58:35 +0100 Subject: [PATCH 18/38] vdr-vnsiserver3: Reuse svdrphosts.conf as well. --- lfs/vdr-vnsiserver3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/vdr-vnsiserver3 b/lfs/vdr-vnsiserver3 index a0e85e1bd..ecbad8631 100644 --- a/lfs/vdr-vnsiserver3 +++ b/lfs/vdr-vnsiserver3 @@ -91,7 +91,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /etc/vdr/plugins/vnsiserver cd $(DIR_APP) && install -m 755 libvdr-vnsiserver3.so \ /usr/lib/vdr/libvdr-vnsiserver3.so.$(VDR_VER) - cd $(DIR_APP) && install -m 644 vnsiserver/* /etc/vdr/plugins/vnsiserver + ln -svf ../../svdrphosts.conf /etc/vdr/plugins/vnsiserver3/allowed_hosts.conf install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver3.conf \ /etc/sysconfig/vdr-plugins.d From 48069b782eb549586b53db03f67ee0bf41c24096 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 27 Mar 2013 14:02:25 +0100 Subject: [PATCH 19/38] vdr-vnsiserver: Update rootfile. --- config/rootfiles/packages/vdr-vnsiserver3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/packages/vdr-vnsiserver3 b/config/rootfiles/packages/vdr-vnsiserver3 index 79187e0d7..db54e72c3 100644 --- a/config/rootfiles/packages/vdr-vnsiserver3 +++ b/config/rootfiles/packages/vdr-vnsiserver3 @@ -1,4 +1,4 @@ etc/sysconfig/vdr-plugins.d/vnsiserver3.conf -etc/vdr/plugins/vnsiserver -etc/vdr/plugins/vnsiserver/allowed_hosts.conf +etc/vdr/plugins/vnsiserver3 +etc/vdr/plugins/vnsiserver3/allowed_hosts.conf usr/lib/vdr/libvdr-vnsiserver3.so.1.7.41 From 3ca08d602292f6183bda999df4d62aef86b7e1be Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 27 Mar 2013 14:57:03 +0100 Subject: [PATCH 20/38] vdradmin: Change VDR configuration directory. --- config/vdradmin/install-ipfire.sh | 2 +- config/vdradmin/vdradmind.conf | 2 +- src/paks/vdradmin/update.sh | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/vdradmin/install-ipfire.sh b/config/vdradmin/install-ipfire.sh index 8eceaac18..9a6655b7b 100755 --- a/config/vdradmin/install-ipfire.sh +++ b/config/vdradmin/install-ipfire.sh @@ -18,7 +18,7 @@ CACHEDIR=${CACHEDIR:-$DESTDIR/var/cache/vdradmin} PIDFILE=${PIDFILE:-$DESTDIR/var/run/vdradmind.pid} VIDEODIR=${VIDEODIR:-/var/video} EPGIMAGES=${EPGIMAGES:-$VIDEODIR/epgimages} -VDRCONF=${VDRCONF:-/opt/vdr/etc} +VDRCONF=${VDRCONF:-/etc/vdr} function usage() { diff --git a/config/vdradmin/vdradmind.conf b/config/vdradmin/vdradmind.conf index 226b9cc27..a3b2d485a 100644 --- a/config/vdradmin/vdradmind.conf +++ b/config/vdradmin/vdradmind.conf @@ -81,7 +81,7 @@ TV_MIMETYPE = video/x-mpegurl TV_SIZE = half USERNAME = vdradmin USERNAME_GUEST = guest -VDRCONFDIR = /opt/vdr/etc +VDRCONFDIR = /etc/vdr VDR_HOST = localhost VDR_PORT = 6419 VIDEODIR = /var/video diff --git a/src/paks/vdradmin/update.sh b/src/paks/vdradmin/update.sh index ec21a577d..72d318544 100644 --- a/src/paks/vdradmin/update.sh +++ b/src/paks/vdradmin/update.sh @@ -30,7 +30,8 @@ stop_service ${NAME} sed -i /etc/vdradmin/vdradmind.conf \ - -e "s/^LANG = .*/LANG = en_US.utf8/g" \ - -e "s/^VDR_PORT = .*/VDR_PORT = 6419/g" + -e "s@^LANG = .*@LANG = en_US.utf8@g" \ + -e "s@^VDR_PORT = .*@VDR_PORT = 6419@g" \ + -e "s@^VDRCONFDIR = .*@VDRCONFDIR = /etc/vdr@g" start_service ${NAME} From 9b75c7cc65e4afddfd5a0d9ec780b2b8d7d8562a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 29 Mar 2013 11:49:40 +0000 Subject: [PATCH 21/38] vdr-vnsiserver: Fix wrong directory creation. --- lfs/vdr-vnsiserver3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/vdr-vnsiserver3 b/lfs/vdr-vnsiserver3 index ecbad8631..cfcf1e185 100644 --- a/lfs/vdr-vnsiserver3 +++ b/lfs/vdr-vnsiserver3 @@ -88,7 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ LOCALEDIR=$$(pwd)/locale all - -mkdir -pv /etc/vdr/plugins/vnsiserver + -mkdir -pv /etc/vdr/plugins/vnsiserver3 cd $(DIR_APP) && install -m 755 libvdr-vnsiserver3.so \ /usr/lib/vdr/libvdr-vnsiserver3.so.$(VDR_VER) ln -svf ../../svdrphosts.conf /etc/vdr/plugins/vnsiserver3/allowed_hosts.conf From 12b8b77430dff255252c06414cdb6cf1c6d4f6c1 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 3 Apr 2013 19:54:15 +0200 Subject: [PATCH 22/38] vdr: Update to 2.0.0. --- config/rootfiles/packages/vdr-epgsearch | 8 ++++---- config/rootfiles/packages/vdr-streamdev | 2 +- config/rootfiles/packages/vdr-vnsiserver3 | 2 +- lfs/vdr | 4 ++-- lfs/vdr-epgsearch | 2 +- lfs/vdr-streamdev | 2 +- lfs/vdr-vnsiserver3 | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/rootfiles/packages/vdr-epgsearch b/config/rootfiles/packages/vdr-epgsearch index d09bf4b97..193d79f9c 100644 --- a/config/rootfiles/packages/vdr-epgsearch +++ b/config/rootfiles/packages/vdr-epgsearch @@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf etc/vdr/plugins/epgsearch etc/vdr/plugins/epgsearch/conf.d usr/bin/createcats -usr/lib/vdr/libvdr-conflictcheckonly.so.1.7.41 -usr/lib/vdr/libvdr-epgsearch.so.1.7.41 -usr/lib/vdr/libvdr-epgsearchonly.so.1.7.41 -usr/lib/vdr/libvdr-quickepgsearch.so.1.7.41 +usr/lib/vdr/libvdr-conflictcheckonly.so.2.0.0 +usr/lib/vdr/libvdr-epgsearch.so.2.0.0 +usr/lib/vdr/libvdr-epgsearchonly.so.2.0.0 +usr/lib/vdr/libvdr-quickepgsearch.so.2.0.0 #var/lib/vdr #var/lib/vdr/data var/lib/vdr/data/epgsearch diff --git a/config/rootfiles/packages/vdr-streamdev b/config/rootfiles/packages/vdr-streamdev index 3b05d026d..458e7d810 100644 --- a/config/rootfiles/packages/vdr-streamdev +++ b/config/rootfiles/packages/vdr-streamdev @@ -5,4 +5,4 @@ etc/vdr/plugins/streamdev-server/streamdevhosts.conf #usr/lib/vdr #usr/lib/vdr/bin usr/lib/vdr/bin/externremux.sh -usr/lib/vdr/libvdr-streamdev-server.so.1.7.41 +usr/lib/vdr/libvdr-streamdev-server.so.2.0.0 diff --git a/config/rootfiles/packages/vdr-vnsiserver3 b/config/rootfiles/packages/vdr-vnsiserver3 index db54e72c3..4eee28233 100644 --- a/config/rootfiles/packages/vdr-vnsiserver3 +++ b/config/rootfiles/packages/vdr-vnsiserver3 @@ -1,4 +1,4 @@ etc/sysconfig/vdr-plugins.d/vnsiserver3.conf etc/vdr/plugins/vnsiserver3 etc/vdr/plugins/vnsiserver3/allowed_hosts.conf -usr/lib/vdr/libvdr-vnsiserver3.so.1.7.41 +usr/lib/vdr/libvdr-vnsiserver3.so.2.0.0 diff --git a/lfs/vdr b/lfs/vdr index 24eac9b7d..3147961cc 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -24,7 +24,7 @@ include Config -VER = 1.7.41 +VER = 2.0.0 THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -60,7 +60,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c7928bff45fa1c0e6dadf2c0a5adf94b +$(DL_FILE)_MD5 = fd7f481b996e03fae3c00e80b6b0d301 install : $(TARGET) diff --git a/lfs/vdr-epgsearch b/lfs/vdr-epgsearch index b8543b3dd..b20dfff79 100644 --- a/lfs/vdr-epgsearch +++ b/lfs/vdr-epgsearch @@ -36,7 +36,7 @@ PAK_VER = 1 DEPS = "vdr" -VDR_VER = 1.7.41 +VDR_VER = 2.0.0 ############################################################################### # Top-level Rules diff --git a/lfs/vdr-streamdev b/lfs/vdr-streamdev index 281b531fc..934e8cf91 100644 --- a/lfs/vdr-streamdev +++ b/lfs/vdr-streamdev @@ -37,7 +37,7 @@ PAK_VER = 1 DEPS = "vdr" -VDR_VER = 1.7.41 +VDR_VER = 2.0.0 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) diff --git a/lfs/vdr-vnsiserver3 b/lfs/vdr-vnsiserver3 index cfcf1e185..02e804210 100644 --- a/lfs/vdr-vnsiserver3 +++ b/lfs/vdr-vnsiserver3 @@ -36,7 +36,7 @@ PAK_VER = 1 DEPS = "vdr" -VDR_VER = 1.7.41 +VDR_VER = 2.0.0 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) From 2cec0cefc084bcd5c98dcf16cbd5219e4a5b7af9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 11 Apr 2013 16:45:49 +0200 Subject: [PATCH 23/38] vdr: Auto-allow access from GREEN subnet. --- src/paks/vdr/install.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/paks/vdr/install.sh b/src/paks/vdr/install.sh index a02357d97..c9b2a7351 100644 --- a/src/paks/vdr/install.sh +++ b/src/paks/vdr/install.sh @@ -24,6 +24,16 @@ . /opt/pakfire/lib/functions.sh extract_files restore_backup ${NAME} + +# Automatically add the GREEN network to svdrphosts.conf +( + eval $(readhash /var/ipfire/ethernet/settings) + + if [ -n "${GREEN_NETADDRESS}" ] && [ -n "${GREEN_BROADCAST}" ]; then + echo "${GREEN_NETADDRESS}/${GREEN_BROADCAST}" >> /etc/vdr/svdrphosts.conf + fi +) || : + start_service --background ${NAME} # Create video directory if it does not exist, yet. From c232d1b59a1882211479dea12a39bc066d6b1c5e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 12 Apr 2013 12:05:39 +0200 Subject: [PATCH 24/38] vdr: Remove dependency to freefont. --- lfs/vdr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/vdr b/lfs/vdr index 3147961cc..552f09625 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr PAK_VER = 6 -DEPS = "freefont vdr-streamdev" +DEPS = "vdr-streamdev" MAKE_OPTIONS = \ PREFIX=/usr \ From fc0ecdda316ebda14177049a9b384c5c43bccae3 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 12 Apr 2013 16:17:13 +0200 Subject: [PATCH 25/38] vdr-streamdev: Fix configuration file name. --- lfs/vdr-streamdev | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lfs/vdr-streamdev b/lfs/vdr-streamdev index 934e8cf91..d37cde29a 100644 --- a/lfs/vdr-streamdev +++ b/lfs/vdr-streamdev @@ -93,7 +93,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /etc/vdr/plugins/streamdev-server /usr/lib/vdr/bin cd $(DIR_APP) && install -m 755 server/libvdr-streamdev-server.so \ /usr/lib/vdr/libvdr-streamdev-server.so.$(VDR_VER) - ln -svf ../../svdrphosts.conf /etc/vdr/plugins/streamdev-server + ln -svf ../../svdrphosts.conf \ + /etc/vdr/plugins/streamdev-server/streamdevhosts.conf cd $(DIR_APP) && install -m 755 streamdev-server/externremux.sh \ /usr/lib/vdr/bin/externremux.sh install -m 644 $(DIR_SRC)/config/vdr/plugins.d/streamdev-server.conf \ From 22f94778487e86b3244c7f65af500598db4656f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Weism=C3=BCller?= Date: Wed, 17 Apr 2013 13:13:34 +0200 Subject: [PATCH 26/38] The script w_scan_start now generates a channel.conf which is compatible to vdr >1.7 --- config/w_scan/w_scan_start | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start index 0f624ac68..324d7f9dd 100755 --- a/config/w_scan/w_scan_start +++ b/config/w_scan/w_scan_start @@ -105,17 +105,17 @@ clear rm -rf /tmp/channels.conf if [[ "$W_SCAN_TYPE" == *DVB-T* ]]; then echo ":->W-SCAN DVB-T $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f t -c $W_SCAN_COUNTRY -C UTF-8 >>/tmp/channels.conf + $WSCAN -f t -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf fi if [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then echo ":->W-SCAN DVB-C $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f c -c $W_SCAN_COUNTRY -C UTF-8 >>/tmp/channels.conf + $WSCAN -f c -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf fi if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then for SATELLITE in $W_SCAN_SATELLITE; do echo ":->W-SCAN DVB-S $SATELLITE $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f s -s $SATELLITE -C UTF-8 >>/tmp/channels.conf + $WSCAN -f s -s $SATELLITE -C UTF-8 -o 7 >>/tmp/channels.conf done fi From 55afc9854f7b70ee31aca3753892736b9fce8991 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 18 Apr 2013 14:04:03 +0200 Subject: [PATCH 27/38] vdr: Update to 2.0.1. --- config/rootfiles/packages/vdr-epgsearch | 8 ++++---- config/rootfiles/packages/vdr-streamdev | 2 +- config/rootfiles/packages/vdr-vnsiserver3 | 2 +- lfs/vdr | 4 ++-- lfs/vdr-epgsearch | 2 +- lfs/vdr-streamdev | 2 +- lfs/vdr-vnsiserver3 | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/rootfiles/packages/vdr-epgsearch b/config/rootfiles/packages/vdr-epgsearch index 193d79f9c..33ad71b11 100644 --- a/config/rootfiles/packages/vdr-epgsearch +++ b/config/rootfiles/packages/vdr-epgsearch @@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf etc/vdr/plugins/epgsearch etc/vdr/plugins/epgsearch/conf.d usr/bin/createcats -usr/lib/vdr/libvdr-conflictcheckonly.so.2.0.0 -usr/lib/vdr/libvdr-epgsearch.so.2.0.0 -usr/lib/vdr/libvdr-epgsearchonly.so.2.0.0 -usr/lib/vdr/libvdr-quickepgsearch.so.2.0.0 +usr/lib/vdr/libvdr-conflictcheckonly.so.2.0.1 +usr/lib/vdr/libvdr-epgsearch.so.2.0.1 +usr/lib/vdr/libvdr-epgsearchonly.so.2.0.1 +usr/lib/vdr/libvdr-quickepgsearch.so.2.0.1 #var/lib/vdr #var/lib/vdr/data var/lib/vdr/data/epgsearch diff --git a/config/rootfiles/packages/vdr-streamdev b/config/rootfiles/packages/vdr-streamdev index 458e7d810..91ed7b115 100644 --- a/config/rootfiles/packages/vdr-streamdev +++ b/config/rootfiles/packages/vdr-streamdev @@ -5,4 +5,4 @@ etc/vdr/plugins/streamdev-server/streamdevhosts.conf #usr/lib/vdr #usr/lib/vdr/bin usr/lib/vdr/bin/externremux.sh -usr/lib/vdr/libvdr-streamdev-server.so.2.0.0 +usr/lib/vdr/libvdr-streamdev-server.so.2.0.1 diff --git a/config/rootfiles/packages/vdr-vnsiserver3 b/config/rootfiles/packages/vdr-vnsiserver3 index 4eee28233..89012453c 100644 --- a/config/rootfiles/packages/vdr-vnsiserver3 +++ b/config/rootfiles/packages/vdr-vnsiserver3 @@ -1,4 +1,4 @@ etc/sysconfig/vdr-plugins.d/vnsiserver3.conf etc/vdr/plugins/vnsiserver3 etc/vdr/plugins/vnsiserver3/allowed_hosts.conf -usr/lib/vdr/libvdr-vnsiserver3.so.2.0.0 +usr/lib/vdr/libvdr-vnsiserver3.so.2.0.1 diff --git a/lfs/vdr b/lfs/vdr index 552f09625..adabb6711 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -24,7 +24,7 @@ include Config -VER = 2.0.0 +VER = 2.0.1 THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -60,7 +60,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fd7f481b996e03fae3c00e80b6b0d301 +$(DL_FILE)_MD5 = e1b7a76c57c96300829dccd39eb20e7d install : $(TARGET) diff --git a/lfs/vdr-epgsearch b/lfs/vdr-epgsearch index b20dfff79..4d147fae8 100644 --- a/lfs/vdr-epgsearch +++ b/lfs/vdr-epgsearch @@ -36,7 +36,7 @@ PAK_VER = 1 DEPS = "vdr" -VDR_VER = 2.0.0 +VDR_VER = 2.0.1 ############################################################################### # Top-level Rules diff --git a/lfs/vdr-streamdev b/lfs/vdr-streamdev index d37cde29a..ace90eb34 100644 --- a/lfs/vdr-streamdev +++ b/lfs/vdr-streamdev @@ -37,7 +37,7 @@ PAK_VER = 1 DEPS = "vdr" -VDR_VER = 2.0.0 +VDR_VER = 2.0.1 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) diff --git a/lfs/vdr-vnsiserver3 b/lfs/vdr-vnsiserver3 index 02e804210..8ba223dc1 100644 --- a/lfs/vdr-vnsiserver3 +++ b/lfs/vdr-vnsiserver3 @@ -36,7 +36,7 @@ PAK_VER = 1 DEPS = "vdr" -VDR_VER = 2.0.0 +VDR_VER = 2.0.1 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) From 9709b039880baf9731f8270665db01ee704cee45 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 18 Apr 2013 14:23:42 +0200 Subject: [PATCH 28/38] vdr: Fix path to readhash. --- src/paks/vdr/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paks/vdr/install.sh b/src/paks/vdr/install.sh index c9b2a7351..ebcd50ff6 100644 --- a/src/paks/vdr/install.sh +++ b/src/paks/vdr/install.sh @@ -27,7 +27,7 @@ restore_backup ${NAME} # Automatically add the GREEN network to svdrphosts.conf ( - eval $(readhash /var/ipfire/ethernet/settings) + eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) if [ -n "${GREEN_NETADDRESS}" ] && [ -n "${GREEN_BROADCAST}" ]; then echo "${GREEN_NETADDRESS}/${GREEN_BROADCAST}" >> /etc/vdr/svdrphosts.conf From 08434343ee20012f5c22f7fadc65181ad035b386 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 20 Apr 2013 22:11:45 +0200 Subject: [PATCH 29/38] vdr: change vdrplugin version back to 2.0.0. --- config/rootfiles/packages/vdr-epgsearch | 8 ++++---- config/rootfiles/packages/vdr-streamdev | 2 +- config/rootfiles/packages/vdr-vnsiserver3 | 2 +- lfs/vdr | 5 +++-- lfs/vdr-epgsearch | 12 ++++++------ lfs/vdr-streamdev | 6 +++--- lfs/vdr-vnsiserver3 | 6 +++--- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/config/rootfiles/packages/vdr-epgsearch b/config/rootfiles/packages/vdr-epgsearch index 33ad71b11..193d79f9c 100644 --- a/config/rootfiles/packages/vdr-epgsearch +++ b/config/rootfiles/packages/vdr-epgsearch @@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf etc/vdr/plugins/epgsearch etc/vdr/plugins/epgsearch/conf.d usr/bin/createcats -usr/lib/vdr/libvdr-conflictcheckonly.so.2.0.1 -usr/lib/vdr/libvdr-epgsearch.so.2.0.1 -usr/lib/vdr/libvdr-epgsearchonly.so.2.0.1 -usr/lib/vdr/libvdr-quickepgsearch.so.2.0.1 +usr/lib/vdr/libvdr-conflictcheckonly.so.2.0.0 +usr/lib/vdr/libvdr-epgsearch.so.2.0.0 +usr/lib/vdr/libvdr-epgsearchonly.so.2.0.0 +usr/lib/vdr/libvdr-quickepgsearch.so.2.0.0 #var/lib/vdr #var/lib/vdr/data var/lib/vdr/data/epgsearch diff --git a/config/rootfiles/packages/vdr-streamdev b/config/rootfiles/packages/vdr-streamdev index 91ed7b115..458e7d810 100644 --- a/config/rootfiles/packages/vdr-streamdev +++ b/config/rootfiles/packages/vdr-streamdev @@ -5,4 +5,4 @@ etc/vdr/plugins/streamdev-server/streamdevhosts.conf #usr/lib/vdr #usr/lib/vdr/bin usr/lib/vdr/bin/externremux.sh -usr/lib/vdr/libvdr-streamdev-server.so.2.0.1 +usr/lib/vdr/libvdr-streamdev-server.so.2.0.0 diff --git a/config/rootfiles/packages/vdr-vnsiserver3 b/config/rootfiles/packages/vdr-vnsiserver3 index 89012453c..4eee28233 100644 --- a/config/rootfiles/packages/vdr-vnsiserver3 +++ b/config/rootfiles/packages/vdr-vnsiserver3 @@ -1,4 +1,4 @@ etc/sysconfig/vdr-plugins.d/vnsiserver3.conf etc/vdr/plugins/vnsiserver3 etc/vdr/plugins/vnsiserver3/allowed_hosts.conf -usr/lib/vdr/libvdr-vnsiserver3.so.2.0.1 +usr/lib/vdr/libvdr-vnsiserver3.so.2.0.0 diff --git a/lfs/vdr b/lfs/vdr index adabb6711..60f649736 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # +# Copyright (C) 2007-2013 IPFire Team # # # # 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 # @@ -25,6 +25,7 @@ include Config VER = 2.0.1 +VDRPLUGVER = 2.0.0 THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -109,7 +110,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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)/" \ + sed -e "s/VDR_PLUGIN_VERSION/$(VDRPLUGVER)/" \ < $(DIR_SRC)/config/vdr/runvdr > /usr/sbin/runvdr chmod 755 /usr/sbin/runvdr diff --git a/lfs/vdr-epgsearch b/lfs/vdr-epgsearch index 4d147fae8..d1f3a44f2 100644 --- a/lfs/vdr-epgsearch +++ b/lfs/vdr-epgsearch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # +# Copyright (C) 2007-2013 IPFire Team # # # # 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 # @@ -36,7 +36,7 @@ PAK_VER = 1 DEPS = "vdr" -VDR_VER = 2.0.1 +VDRPLUGVER = 2.0.0 ############################################################################### # Top-level Rules @@ -85,13 +85,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) LOCALEDIR=$$(pwd)/locale all cd $(DIR_APP) && install -m 755 libvdr-conflictcheckonly.so \ - /usr/lib/vdr/libvdr-conflictcheckonly.so.$(VDR_VER) + /usr/lib/vdr/libvdr-conflictcheckonly.so.$(VDRPLUGVER) cd $(DIR_APP) && install -m 755 libvdr-epgsearchonly.so \ - /usr/lib/vdr/libvdr-epgsearchonly.so.$(VDR_VER) + /usr/lib/vdr/libvdr-epgsearchonly.so.$(VDRPLUGVER) cd $(DIR_APP) && install -m 755 libvdr-epgsearch.so \ - /usr/lib/vdr/libvdr-epgsearch.so.$(VDR_VER) + /usr/lib/vdr/libvdr-epgsearch.so.$(VDRPLUGVER) cd $(DIR_APP) && install -m 755 libvdr-quickepgsearch.so \ - /usr/lib/vdr/libvdr-quickepgsearch.so.$(VDR_VER) + /usr/lib/vdr/libvdr-quickepgsearch.so.$(VDRPLUGVER) install -m 644 \ $(DIR_SRC)/config/vdr/plugins.d/epgsearch.conf \ diff --git a/lfs/vdr-streamdev b/lfs/vdr-streamdev index ace90eb34..c5b7f992f 100644 --- a/lfs/vdr-streamdev +++ b/lfs/vdr-streamdev @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # +# Copyright (C) 2007-2013 IPFire Team # # # # 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 # @@ -37,7 +37,7 @@ PAK_VER = 1 DEPS = "vdr" -VDR_VER = 2.0.1 +VDRPLUGVER = 2.0.0 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) @@ -92,7 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /etc/vdr/plugins/streamdev-server /usr/lib/vdr/bin cd $(DIR_APP) && install -m 755 server/libvdr-streamdev-server.so \ - /usr/lib/vdr/libvdr-streamdev-server.so.$(VDR_VER) + /usr/lib/vdr/libvdr-streamdev-server.so.$(VDRPLUGVER) ln -svf ../../svdrphosts.conf \ /etc/vdr/plugins/streamdev-server/streamdevhosts.conf cd $(DIR_APP) && install -m 755 streamdev-server/externremux.sh \ diff --git a/lfs/vdr-vnsiserver3 b/lfs/vdr-vnsiserver3 index 8ba223dc1..59f43036d 100644 --- a/lfs/vdr-vnsiserver3 +++ b/lfs/vdr-vnsiserver3 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # +# Copyright (C) 2007-2013 IPFire Team # # # # 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 # @@ -36,7 +36,7 @@ PAK_VER = 1 DEPS = "vdr" -VDR_VER = 2.0.1 +VDRPLUGVER = 2.0.0 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) @@ -90,7 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /etc/vdr/plugins/vnsiserver3 cd $(DIR_APP) && install -m 755 libvdr-vnsiserver3.so \ - /usr/lib/vdr/libvdr-vnsiserver3.so.$(VDR_VER) + /usr/lib/vdr/libvdr-vnsiserver3.so.$(VDRPLUGVER) ln -svf ../../svdrphosts.conf /etc/vdr/plugins/vnsiserver3/allowed_hosts.conf install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver3.conf \ /etc/sysconfig/vdr-plugins.d From d2a94495fb8fe62ace4a86756a73106701c7c24f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 20 Apr 2013 22:18:22 +0200 Subject: [PATCH 30/38] w_scan: change path to channels.conf for vdr 2.x. --- config/w_scan/w_scan_start | 11 ++++++----- lfs/w_scan | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start index 324d7f9dd..91e1a46f6 100755 --- a/config/w_scan/w_scan_start +++ b/config/w_scan/w_scan_start @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # +# Copyright (C) 2007-2013 IPFire Team # # # # 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 # @@ -19,7 +19,8 @@ # # ############################################################################### ############################################################################### -# w_scan_start for IPFire v 1.00 - 2012-11-15 Arne Fitzenreiter - inital vers.# +# w_scan_start for IPFire v 1.01 - 2013-04-20 Arne Fitzenreiter - path vdr 2 # +# - 2012-11-15 Arne Fitzenreiter - inital vers.# ############################################################################### err_msg () @@ -127,9 +128,9 @@ echo Results saved to w_scan-$(date +%Y%m%d%H%M).channels.conf if [ -e /opt/pakfire/db/installed/meta-vdr ]; then yes_no "Install new channels-conf for VDR." # Backup old channels conf... - cp -f /opt/vdr/etc/channels.conf \ - /opt/vdr/etc/channels.conf.backup$(date +%Y%m%d%H%M) - cp -f /tmp/channels.conf /opt/vdr/etc/ + cp -f /etc/vdr/channels.conf \ + /etc/vdr/channels.conf.backup$(date +%Y%m%d%H%M) + cp -f /tmp/channels.conf /etc/vdr/ yes_no "Should i start the VDR?" clear /etc/init.d/vdr start diff --git a/lfs/w_scan b/lfs/w_scan index 7df4b42d8..a18a08a02 100644 --- a/lfs/w_scan +++ b/lfs/w_scan @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = w_scan -PAK_VER = 3 +PAK_VER = 4 DEPS = "" From 514da48192e1e06449b9551a19a58211cf6eeecc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 23 Apr 2013 18:20:45 +0200 Subject: [PATCH 31/38] vdr_epgsearch: update to 1.0.1beta5. --- lfs/vdr-epgsearch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/vdr-epgsearch b/lfs/vdr-epgsearch index d1f3a44f2..d77f45702 100644 --- a/lfs/vdr-epgsearch +++ b/lfs/vdr-epgsearch @@ -24,7 +24,7 @@ include Config -VER = 1.0.1.beta3 +VER = 1.0.1.beta5 THISAPP = vdr-epgsearch-$(VER) DL_FILE = $(THISAPP).tgz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f39e5ace38ea99f114425687057e4dbe +$(DL_FILE)_MD5 = 6e63cc29df02f48fabf6e12e1e71b2fc install : $(TARGET) From 58ccbbd4f276050f7f2b5930725eae4cf5957887 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 23 Apr 2013 21:25:36 +0200 Subject: [PATCH 32/38] vdr: fix packages names for updating from 1.6 to 2.x. --- config/rootfiles/packages/{vdr-epgsearch => vdr_epgsearch} | 0 config/rootfiles/packages/{vdr-streamdev => vdr_streamdev} | 0 .../rootfiles/packages/{vdr-vnsiserver3 => vdr_vnsiserver3} | 0 lfs/vdr | 2 +- lfs/{vdr-epgsearch => vdr_epgsearch} | 4 ++-- lfs/{vdr-streamdev => vdr_streamdev} | 2 +- lfs/{vdr-vnsiserver3 => vdr_vnsiserver3} | 2 +- lfs/vdradmin | 6 +++--- make.sh | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) rename config/rootfiles/packages/{vdr-epgsearch => vdr_epgsearch} (100%) rename config/rootfiles/packages/{vdr-streamdev => vdr_streamdev} (100%) rename config/rootfiles/packages/{vdr-vnsiserver3 => vdr_vnsiserver3} (100%) rename lfs/{vdr-epgsearch => vdr_epgsearch} (98%) rename lfs/{vdr-streamdev => vdr_streamdev} (99%) rename lfs/{vdr-vnsiserver3 => vdr_vnsiserver3} (99%) diff --git a/config/rootfiles/packages/vdr-epgsearch b/config/rootfiles/packages/vdr_epgsearch similarity index 100% rename from config/rootfiles/packages/vdr-epgsearch rename to config/rootfiles/packages/vdr_epgsearch diff --git a/config/rootfiles/packages/vdr-streamdev b/config/rootfiles/packages/vdr_streamdev similarity index 100% rename from config/rootfiles/packages/vdr-streamdev rename to config/rootfiles/packages/vdr_streamdev diff --git a/config/rootfiles/packages/vdr-vnsiserver3 b/config/rootfiles/packages/vdr_vnsiserver3 similarity index 100% rename from config/rootfiles/packages/vdr-vnsiserver3 rename to config/rootfiles/packages/vdr_vnsiserver3 diff --git a/lfs/vdr b/lfs/vdr index 60f649736..0dd2c0f46 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -35,7 +35,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr PAK_VER = 6 -DEPS = "vdr-streamdev" +DEPS = "vdr_streamdev" MAKE_OPTIONS = \ PREFIX=/usr \ diff --git a/lfs/vdr-epgsearch b/lfs/vdr_epgsearch similarity index 98% rename from lfs/vdr-epgsearch rename to lfs/vdr_epgsearch index d77f45702..dfda864d8 100644 --- a/lfs/vdr-epgsearch +++ b/lfs/vdr_epgsearch @@ -31,8 +31,8 @@ DL_FILE = $(THISAPP).tgz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/epgsearch-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = vdr-epgsearch -PAK_VER = 1 +PROG = vdr_epgsearch +PAK_VER = 6 DEPS = "vdr" diff --git a/lfs/vdr-streamdev b/lfs/vdr_streamdev similarity index 99% rename from lfs/vdr-streamdev rename to lfs/vdr_streamdev index c5b7f992f..31aa6553b 100644 --- a/lfs/vdr-streamdev +++ b/lfs/vdr_streamdev @@ -32,7 +32,7 @@ DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = vdr-streamdev +PROG = vdr_streamdev PAK_VER = 1 DEPS = "vdr" diff --git a/lfs/vdr-vnsiserver3 b/lfs/vdr_vnsiserver3 similarity index 99% rename from lfs/vdr-vnsiserver3 rename to lfs/vdr_vnsiserver3 index 59f43036d..73ee5e9c0 100644 --- a/lfs/vdr-vnsiserver3 +++ b/lfs/vdr_vnsiserver3 @@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = vdr-vnsiserver3 +PROG = vdr_vnsiserver3 PAK_VER = 1 DEPS = "vdr" diff --git a/lfs/vdradmin b/lfs/vdradmin index c9187b49d..b38ecca4d 100644 --- a/lfs/vdradmin +++ b/lfs/vdradmin @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 IPFire Team # # # # 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 # @@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdradmin -PAK_VER = 4 +PAK_VER = 5 -DEPS = "perl-gettext vdr vdr-epgsearch" +DEPS = "perl-gettext vdr vdr_epgsearch" ############################################################################### # Top-level Rules diff --git a/make.sh b/make.sh index 2cba3505b..d52b0e1b5 100755 --- a/make.sh +++ b/make.sh @@ -664,9 +664,9 @@ buildipfire() { ipfiremake faad2 ipfiremake ffmpeg ipfiremake vdr - ipfiremake vdr-streamdev - ipfiremake vdr-vnsiserver3 - ipfiremake vdr-epgsearch + ipfiremake vdr_streamdev + ipfiremake vdr_vnsiserver3 + ipfiremake vdr_epgsearch ipfiremake w_scan ipfiremake icecast ipfiremake icegenerator From ab76260b918bd4caa8eb774a4e124e2d3ea203ef Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 29 Apr 2013 14:27:38 +0200 Subject: [PATCH 33/38] vdr_streamdev: fix recordings urls. --- lfs/vdr_streamdev | 2 ++ src/patches/vdr-streamdev_recordings-64.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 src/patches/vdr-streamdev_recordings-64.patch diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev index 31aa6553b..59dbd04eb 100644 --- a/lfs/vdr_streamdev +++ b/lfs/vdr_streamdev @@ -85,6 +85,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-streamdev_recordings-64.patch + cd $(DIR_APP) && sed -i 's@$(VDRDIR)/device.h@/usr/include/vdr/device.h@' Makefile cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ diff --git a/src/patches/vdr-streamdev_recordings-64.patch b/src/patches/vdr-streamdev_recordings-64.patch new file mode 100644 index 000000000..00baf89f3 --- /dev/null +++ b/src/patches/vdr-streamdev_recordings-64.patch @@ -0,0 +1,12 @@ +diff -Naur vdr-streamdev-10db11ac.org/server/menuHTTP.c vdr-streamdev-10db11ac/server/menuHTTP.c +--- vdr-streamdev-10db11ac.org/server/menuHTTP.c 2013-02-18 12:43:02.000000000 +0100 ++++ vdr-streamdev-10db11ac/server/menuHTTP.c 2013-04-29 13:34:11.818857417 +0200 +@@ -28,7 +28,7 @@ + { + struct stat st; + if (stat(current->FileName(), &st) == 0) +- return cString::sprintf("%lu:%lu.rec", st.st_dev, st.st_ino); ++ return cString::sprintf("%lu:%lu.rec", (unsigned long) st.st_dev, (unsigned long) st.st_ino); + return ""; + } + From f5fc6d319e0450155dec20c2516cbf02021ee345 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 29 Apr 2013 17:05:05 +0200 Subject: [PATCH 34/38] vdr_streamdev: use full 64-bit from stat for recordings. --- src/patches/vdr-streamdev_recordings-64.patch | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/patches/vdr-streamdev_recordings-64.patch b/src/patches/vdr-streamdev_recordings-64.patch index 00baf89f3..2dc5250b4 100644 --- a/src/patches/vdr-streamdev_recordings-64.patch +++ b/src/patches/vdr-streamdev_recordings-64.patch @@ -1,12 +1,29 @@ +diff -Naur vdr-streamdev-10db11ac.org/server/connectionHTTP.c vdr-streamdev-10db11ac/server/connectionHTTP.c +--- vdr-streamdev-10db11ac.org/server/connectionHTTP.c 2013-02-18 12:43:02.000000000 +0100 ++++ vdr-streamdev-10db11ac/server/connectionHTTP.c 2013-04-29 15:16:40.049168127 +0200 +@@ -455,11 +455,11 @@ + return NULL; + + char *p = NULL; +- unsigned long l = strtoul(FileBase, &p, 0); ++ unsigned long long l = strtoull(FileBase, &p, 0); + if (p != FileBase && l > 0L) { + if (*p == ':') { + // get recording by dev:inode +- unsigned long inode = strtoul(p + 1, &p, 0); ++ unsigned long long inode = strtoull(p + 1, &p, 0); + if (*p == 0 && inode > 0) { + struct stat st; + cThreadLock RecordingsLock(&Recordings); diff -Naur vdr-streamdev-10db11ac.org/server/menuHTTP.c vdr-streamdev-10db11ac/server/menuHTTP.c --- vdr-streamdev-10db11ac.org/server/menuHTTP.c 2013-02-18 12:43:02.000000000 +0100 -+++ vdr-streamdev-10db11ac/server/menuHTTP.c 2013-04-29 13:34:11.818857417 +0200 ++++ vdr-streamdev-10db11ac/server/menuHTTP.c 2013-04-29 15:15:30.352502787 +0200 @@ -28,7 +28,7 @@ { struct stat st; if (stat(current->FileName(), &st) == 0) - return cString::sprintf("%lu:%lu.rec", st.st_dev, st.st_ino); -+ return cString::sprintf("%lu:%lu.rec", (unsigned long) st.st_dev, (unsigned long) st.st_ino); ++ return cString::sprintf("%llu:%llu.rec", (unsigned long long) st.st_dev, (unsigned long long) st.st_ino); return ""; } From e200ab58cc9a8e2c756c504de0e7403d195fe0c2 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 30 Apr 2013 11:53:04 +0200 Subject: [PATCH 35/38] w_scan: add atsc support. --- config/w_scan/w_scan_start | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start index 91e1a46f6..05d9a78d0 100755 --- a/config/w_scan/w_scan_start +++ b/config/w_scan/w_scan_start @@ -19,7 +19,8 @@ # # ############################################################################### ############################################################################### -# w_scan_start for IPFire v 1.01 - 2013-04-20 Arne Fitzenreiter - path vdr 2 # +# w_scan_start for IPFire v 1.02 - 2013-04-30 Arne Fitzenreiter - add atsc # +# - 2013-04-20 Arne Fitzenreiter - path vdr 2 # # - 2012-11-15 Arne Fitzenreiter - inital vers.# ############################################################################### @@ -65,17 +66,19 @@ if [ "$(ps -A | grep " runvdr$")" != "" ] ;then /etc/init.d/vdr stop fi -# Select DVB type -whiptail --checklist "\nSelect DVB type" 12 40 3 \ +# Select system type +whiptail --checklist "\nSelect system type" 12 40 5 \ DVB-T "Terrestrial" yes \ - DVB-C "Cable" no \ - DVB-S "Satellite" no \ + DVB-C "Cable" no \ + DVB-S "Satellite" no \ + ATSC-T "Terrestrial" no \ + ATSC-C "Cable" no \ 2>/tmp/w_scan_type chk_cancel W_SCAN_TYPE=$(cat /tmp/w_scan_type) rm /tmp/w_scan_type -if [[ "$W_SCAN_TYPE" == *DVB-T* ]] || [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then +if [[ "$W_SCAN_TYPE" == *ATSC* ]] || [[ "$W_SCAN_TYPE" == *DVB-T* ]] || [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then # Generate and run separate country menubox and default germany echo '#!/bin/bash' > /tmp/w_scan_countryselect.sh echo 'whiptail --radiolist "\nSelect country" 19 70 10 \' >> /tmp/w_scan_countryselect.sh @@ -119,6 +122,14 @@ if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then $WSCAN -f s -s $SATELLITE -C UTF-8 -o 7 >>/tmp/channels.conf done fi +if [[ "$W_SCAN_TYPE" == *ATSC-T* ]]; then + echo ":->W-SCAN ATSC-T $(date +%Y%m%d%H%M)" >>/tmp/channels.conf + $WSCAN -f a -A 1 -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf +fi +if [[ "$W_SCAN_TYPE" == *ATSC-C* ]]; then + echo ":->W-SCAN ATSC-C $(date +%Y%m%d%H%M)" >>/tmp/channels.conf + $WSCAN -f a -A 2 -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf +fi # Save result to current dir. cp /tmp/channels.conf w_scan-$(date +%Y%m%d%H%M).channels.conf From 8e4c5bff4261fc2de5ae261bebc3e53f62122718 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 30 Apr 2013 12:02:19 +0200 Subject: [PATCH 36/38] vdr: Convert netmask to CIDR notation on install. --- src/paks/vdr/install.sh | 77 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/src/paks/vdr/install.sh b/src/paks/vdr/install.sh index ebcd50ff6..3e92d3275 100644 --- a/src/paks/vdr/install.sh +++ b/src/paks/vdr/install.sh @@ -29,8 +29,81 @@ restore_backup ${NAME} ( eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) - if [ -n "${GREEN_NETADDRESS}" ] && [ -n "${GREEN_BROADCAST}" ]; then - echo "${GREEN_NETADDRESS}/${GREEN_BROADCAST}" >> /etc/vdr/svdrphosts.conf + GREEN_PREFIX= + case "${GREEN_NETMASK}" in + 255.255.255.252) + GREEN_PREFIX=30 + ;; + 255.255.255.248) + GREEN_PREFIX=29 + ;; + 255.255.255.240) + GREEN_PREFIX=28 + ;; + 255.255.255.224) + GREEN_PREFIX=27 + ;; + 255.255.255.192) + GREEN_PREFIX=26 + ;; + 255.255.255.128) + GREEN_PREFIX=25 + ;; + 255.255.255.0) + GREEN_PREFIX=24 + ;; + 255.255.254.0) + GREEN_PREFIX=23 + ;; + 255.255.252.0) + GREEN_PREFIX=22 + ;; + 255.255.248.0) + GREEN_PREFIX=21 + ;; + 255.255.240.0) + GREEN_PREFIX=20 + ;; + 255.255.224.0) + GREEN_PREFIX=19 + ;; + 255.255.192.0) + GREEN_PREIFX=18 + ;; + 255.255.128.0) + GREEN_PREFIX=17 + ;; + 255.255.0.0) + GREEN_PREFIX=16 + ;; + 255.254.0.0) + GREEN_PREFIX=15 + ;; + 255.252.0.0) + GREEN_PREFIX=14 + ;; + 255.248.0.0) + GREEN_PREFIX=13 + ;; + 255.240.0.0) + GREEN_PREFIX=12 + ;; + 255.224.0.0) + GREEN_PREFIX=11 + ;; + 255.192.0.0) + GREEN_PREFIX=10 + ;; + 255.128.0.0) + GREEN_PREFIX=9 + ;; + 255.0.0.0) + GREEN_PREFIX=8 + ;; + esac + + if [ -n "${GREEN_NETADDRESS}" ] && [ -n "${GREEN_PREFIX}" ]; then + echo "${GREEN_NETADDRESS}/${GREEN_PREFIX}" >> /etc/vdr/svdrphosts.conf fi ) || : From 311f1c634c1f902c92776afb9ef54c4d0c1623cb Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 30 Apr 2013 12:07:02 +0200 Subject: [PATCH 37/38] vdr: Migrate old configuration files. --- src/paks/vdr/update.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/paks/vdr/update.sh b/src/paks/vdr/update.sh index 89c40d0d7..2e116083f 100644 --- a/src/paks/vdr/update.sh +++ b/src/paks/vdr/update.sh @@ -24,3 +24,13 @@ . /opt/pakfire/lib/functions.sh ./uninstall.sh ./install.sh + +OLD_DIR="/opt/vdr/etc" +NEW_DIR="/etc/vdr" + +for conf in ${OLD_DIR}/*.conf; do + [ -f "${conf}" ] && continue + + conf="$(basename ${conf})" + mv -b "${OLD_DIR}/${conf}" "${NEW_DIR}/${conf}" +done From a9959ef3ea42e0874734c5ecb6e3b563a8b5091e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 30 Apr 2013 12:07:35 +0200 Subject: [PATCH 38/38] vdr: Remove old configuration directory from backup. --- config/backup/includes/vdr | 1 - 1 file changed, 1 deletion(-) diff --git a/config/backup/includes/vdr b/config/backup/includes/vdr index 479c08df7..38bd82a44 100644 --- a/config/backup/includes/vdr +++ b/config/backup/includes/vdr @@ -1,2 +1 @@ /etc/vdr -/opt/vdr/etc/