Merge branch 'vdr-next' into next

Conflicts:
	config/rootfiles/core/68/filelists/files

diff --git a/config/backup/includes/vdr b/config/backup/includes/vdr
index d8d58a5d5b984d8345486a8fa8ccd2c990fe4c11..38bd82a4426c722b9f2aae3019cf2a3f01e70de1 100644 (file)
--- a/config/backup/includes/vdr
+++ b/config/backup/includes/vdr
@@ -1 +1 @@
-/opt/vdr/etc/
+/etc/vdr

diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr
index eee440e061c218fe76604708f792d3ed8874779f..4b6eaffe2e8ebb174ae8b86c4940b40ea93304f7 100644 (file)
--- a/config/rootfiles/packages/vdr
+++ b/config/rootfiles/packages/vdr
@@ -1,264 +1,84 @@
-#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
+#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/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
+var/cache/vdr
 var/ipfire/backup/addons/includes/vdr
+#var/video

diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch
index 1485d75239c4a526510e3cd969915fd7307ed28b..193d79f9c8f3454b01f5fd2ec87211cb1a2a2ab1 100644 (file)
--- a/config/rootfiles/packages/vdr_epgsearch
+++ b/config/rootfiles/packages/vdr_epgsearch
@@ -1,25 +1,14 @@
-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
+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.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_softdevice b/config/rootfiles/packages/vdr_softdevice
deleted file mode 100644 (file)
index de66a77..0000000
--- 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/rootfiles/packages/vdr_streamdev b/config/rootfiles/packages/vdr_streamdev
new file mode 100644 (file)
index 0000000..458e7d8
--- /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.2.0.0

diff --git a/config/rootfiles/packages/vdr_vnsiserver3 b/config/rootfiles/packages/vdr_vnsiserver3
new file mode 100644 (file)
index 0000000..4eee282
--- /dev/null
+++ b/config/rootfiles/packages/vdr_vnsiserver3
@@ -0,0 +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

diff --git a/config/vdr/bin/runvdr b/config/vdr/bin/runvdr
deleted file mode 100755 (executable)
index f17b70c..0000000
--- 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 (executable)
index 6f187eb..0000000
--- 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/config/vdr/plugins.d/conflictcheckonly.conf b/config/vdr/plugins.d/conflictcheckonly.conf
new file mode 100644 (file)
index 0000000..d514694
--- /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 (file)
index 0000000..3c73119
--- /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 (file)
index 0000000..9208556
--- /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 (file)
index 0000000..e302850
--- /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 (file)
index 0000000..52c11cf
--- /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/config/vdr/plugins.d/vnsiserver3.conf b/config/vdr/plugins.d/vnsiserver3.conf
new file mode 100644 (file)
index 0000000..7c9706d
--- /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/runvdr b/config/vdr/runvdr
new file mode 100644 (file)
index 0000000..5dcfd6c
--- /dev/null
+++ b/config/vdr/runvdr
@@ -0,0 +1,94 @@
+#!/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
+}
+
+rc=
+while true ; do
+    VDR_OPTIONS=()
+    [[ -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=$?
+
+    # 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

diff --git a/config/vdr/vdr.sysconfig b/config/vdr/vdr.sysconfig
new file mode 100644 (file)
index 0000000..a1cebf1
--- /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
+vnsiserver3
+"
+
+# 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/config/vdradmin/install-ipfire.sh b/config/vdradmin/install-ipfire.sh
index 8eceaac1869f791c635d0751ebfbd38b538d2948..9a6655b7b7a2d1b6749af17fb6d5bd50d0679a0b 100755 (executable)
--- 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 022efe7978da93458ca850531c19ea92bec02a6a..a3b2d485a9c68e4a4fd6643f74c5b1419b0212d9 100644 (file)
--- 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
@@ -81,8 +81,8 @@ 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 = 2001
+VDR_PORT = 6419
 VIDEODIR = /var/video
 ZEITRAHMEN = 1

diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start
index 0f624ac68e8d1b45ce663114b1c0f40ad930c9a5..05d9a78d0387b244f8663b151d6e576684c1f6f7 100755 (executable)
--- 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  <info@ipfire.org>                     #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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,9 @@
 #                                                                             #
 ###############################################################################
 ###############################################################################
-# w_scan_start for IPFire v 1.00 - 2012-11-15 Arne Fitzenreiter - inital vers.#
+# 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.#
 ###############################################################################
 
 err_msg ()
@@ -64,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
@@ -105,19 +109,27 @@ 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
+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
@@ -127,9 +139,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/strip b/lfs/strip
index 30cb9b33b47703ce3a4a1dfce25baba267f3af19..d07ff43ee04ae02b29c116bf8628588061402fa3 100644 (file)
--- 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

diff --git a/lfs/vdr b/lfs/vdr
index 46ea5d3f90b45994bde0fa9e6e9b60805c85926d..0dd2c0f4628ab3960e895a583e00d7213fbbf570 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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,39 +24,44 @@
 
 include Config
 
-VER        = 1.6.0
+VER        = 2.0.1
+VDRPLUGVER = 2.0.0
 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
-
-DEPS       = "freefont"
+PAK_VER    = 6
+
+DEPS       = "vdr_streamdev"
+
+MAKE_OPTIONS = \
+       PREFIX=/usr \
+       BINDIR=/usr/bin \
+       CACHEDIR=/var/cache/vdr \
+       CONFDIR=/etc/vdr \
+       INCDIR=/usr/include \
+       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  = e1b7a76c57c96300829dccd39eb20e7d
 
 install : $(TARGET)
 
@@ -90,42 +95,44 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 
-       # Install obsolete V4L1 videodev header.
-       cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h
-
-       # Accept also DVB_API_VERSION 5
-       cd $(DIR_APP) && sed -i -e "s|DVB_API_VERSION != 3|& \&\& DVB_API_VERSION != 5|g" dvbdevice.h
-       
-       cd $(DIR_APP)/PLUGINS/src && tar zxf $(DIR_DL)/$(DL_FILE1)
-       cd $(DIR_APP)/PLUGINS/src && ln -s streamdev-0.3.3-20080325-http streamdev
-       cd $(DIR_APP)/PLUGINS/src && tar zxf $(DIR_DL)/$(DL_FILE2)
-       cd $(DIR_APP)/PLUGINS/src && ln -s softdevice-0.5.0 softdevice
-       cd $(DIR_APP)/PLUGINS/src/softdevice && ./configure
-       cd $(DIR_APP)/PLUGINS/src && tar jxf $(DIR_DL)/$(DL_FILE3)
-       cd $(DIR_APP)/PLUGINS/src && ln -s vidix-1.0.0 vidix
-       cd $(DIR_APP)/PLUGINS/src/vidix && ./configure
-       cd $(DIR_APP)/PLUGINS/src && tar xvf $(DIR_DL)/$(DL_FILE4)
-       cd $(DIR_APP)/PLUGINS/src && ln -s epgsearch-0.9.24 epgsearch
-       cd $(DIR_APP) && patch -Np1 -i PLUGINS/src/epgsearch/patches/MainMenuHooks-v1_0.patch 
-       cd $(DIR_APP)/PLUGINS/src/epgsearch && sed -i '/include/a #include <langinfo.h>/' \
-               epgsearch.c
-       cd $(DIR_APP)/PLUGINS/src/epgsearch && patch -Np1 < $(DIR_SRC)/src/patches/vdr-plugin-epgsearch-gcc44.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-1.6.0-gcc44-fixes.patch
-       cd $(DIR_APP) && make VIDEODIR=/var/video plugins $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_APP) && make DFB_SUPPORT=1  FB_SUPPORT=1  VIDIX_SUPPORT=1  $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_APP) && make PREFIX=. DESTDIR=/opt/vdr/ install
-       -mkdir -p /opt/vdr/etc
-       cd $(DIR_APP) && install *.conf /opt/vdr/etc/
-       cp -Rvf $(DIR_SRC)/config/vdr /opt
+       # Compile main package.
+       cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir
+
+       # Compile bundled plugins.
+       #cd $(DIR_APP) && for plugin in ...; do \
+       #       make $(MAKETUNING) -C PLUGINS/src/$$plugin VDRDIR=$(DIR_APP) \
+       #               CFLAGS="$(CFLAGS) -I$(DIR_APP)/include" \
+       #               CXXFLAGS="$(CXXFLAGS) -I$(DIR_APP)/include" \
+       #               PLGCFG=$(DIR_APP)/plugins.mk all || exit 1; \
+       #done
+
+       # Install main package.
+       cd $(DIR_APP) && make install-bin install-dirs install-includes $(MAKE_OPTIONS)
+       mv -v /usr/bin/vdr /usr/sbin/vdr
+
+       sed -e "s/VDR_PLUGIN_VERSION/$(VDRPLUGVER)/" \
+               < $(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 $(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
        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)

diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch
index ead59a1524916bd404795892c1e801560ec0bfcb..dfda864d829c15ef9b2a40e3e7a4b72a0d175bee 100644 (file)
--- a/lfs/vdr_epgsearch
+++ b/lfs/vdr_epgsearch
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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,86 @@
 
 include Config
 
-VER        = plugin
+VER        = 1.0.1.beta5
+THISAPP    = vdr-epgsearch-$(VER)
+DL_FILE    = $(THISAPP).tgz
 
-THISAPP    = vdr_epgsearch-$(VER)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/epgsearch-$(VER)
+TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_epgsearch
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = "vdr"
 
+VDRPLUGVER = 2.0.0
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
+objects = $(DL_FILE)
+
+$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5  = 6e63cc29df02f48fabf6e12e1e71b2fc
 
-install : 
+install : $(TARGET)
 
-check : 
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
-download :
+download : $(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 :
+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) && 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.$(VDRPLUGVER)
+       cd $(DIR_APP) && install -m 755 libvdr-epgsearchonly.so \
+               /usr/lib/vdr/libvdr-epgsearchonly.so.$(VDRPLUGVER)
+       cd $(DIR_APP) && install -m 755 libvdr-epgsearch.so \
+               /usr/lib/vdr/libvdr-epgsearch.so.$(VDRPLUGVER)
+       cd $(DIR_APP) && install -m 755 libvdr-quickepgsearch.so \
+               /usr/lib/vdr/libvdr-quickepgsearch.so.$(VDRPLUGVER)
+
+       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_streamdev b/lfs/vdr_streamdev
new file mode 100644 (file)
index 0000000..59dbd04
--- /dev/null
+++ b/lfs/vdr_streamdev
@@ -0,0 +1,106 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.6.1
+GIT_VER    = 10db11ac
+THISAPP    = vdr-streamdev-$(GIT_VER)
+DL_FILE    = $(THISAPP).tar.xz
+
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = vdr_streamdev
+PAK_VER    = 1
+
+DEPS       = "vdr"
+
+VDRPLUGVER = 2.0.0
+
+EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS    += $(EXTRA_FLAGS)
+CXXFLAGS  += $(EXTRA_FLAGS)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5  = e5011fd1a4b0624b192911f37c6040e3
+
+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 -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)" \
+               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.$(VDRPLUGVER)
+       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 \
+               /etc/sysconfig/vdr-plugins.d
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/vdr_softdevice b/lfs/vdr_vnsiserver3
similarity index 52%
rename from lfs/vdr_softdevice
rename to lfs/vdr_vnsiserver3
index c836e2e6dd3a02a06cb82fa58639029f53247446..73ee5e9c04453c5f21dc761a75e6b8c3450b8499 100644 (file)
--- a/lfs/vdr_softdevice
+++ b/lfs/vdr_vnsiserver3
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        = cc03615
+THISAPP    = vdr-vnsiserver3-$(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_vnsiserver3
+PAK_VER    = 1
 
-DEPS       = "vdr ffmpeg sdl alsa dfb++"
+DEPS       = "vdr"
+
+VDRPLUGVER = 2.0.0
+
+EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS    += $(EXTRA_FLAGS)
+CXXFLAGS  += $(EXTRA_FLAGS)
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
+objects = $(DL_FILE)
+
+$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5  = 5100b1cb1ee936f64b99a76c492fbc3f
 
-install : 
+install : $(TARGET)
 
-check : 
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
-download :
+download : $(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 :
+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 \
+               CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+               LOCALEDIR=$$(pwd)/locale all
+
+       -mkdir -pv /etc/vdr/plugins/vnsiserver3
+       cd $(DIR_APP) && install -m 755 libvdr-vnsiserver3.so \
+               /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
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/vdradmin b/lfs/vdradmin
index 3bd788f0e2a2a4b31e597e03f286383d0ea3d91a..b38ecca4d1e89d42784abe24701e282dce93b610 100644 (file)
--- 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  <info@ipfire.org>                     #
 #                                                                             #
 # 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,7 +25,7 @@
 
 include Config
 
-VER        = 3.6.7
+VER        = 3.6.9
 
 THISAPP    = vdradmin-am-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -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"
+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)

diff --git a/lfs/w_scan b/lfs/w_scan
index 7df4b42d85e867d5c8fe5deaf5cf5501ea22b0a3..a18a08a02c26e57db8534ecda72134887c992310 100644 (file)
--- 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       = ""
 

diff --git a/make.sh b/make.sh
index c6211adcd657bced27733357bdc348dc6ae866eb..8a2d4f8c84a3efb2fac5b69254445233ffd2e926 100755 (executable)
--- 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/initscripts/init.d/vdr b/src/initscripts/init.d/vdr
index e42887fb8392feceb5a1beaff56abc322dca8b4e..759ad344d8b54c98edf210106a07eca7af5962fb 100644 (file)
--- 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
                ;;
 
        *)

diff --git a/src/paks/vdr/install.sh b/src/paks/vdr/install.sh
new file mode 100644 (file)
index 0000000..3e92d32
--- /dev/null
+++ b/src/paks/vdr/install.sh
@@ -0,0 +1,115 @@
+#!/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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+restore_backup ${NAME}
+
+# Automatically add the GREEN network to svdrphosts.conf
+(
+       eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
+
+       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
+) || :
+
+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 (file)
index 0000000..a7b8a53
--- /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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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 (file)
index 0000000..2e11608
--- /dev/null
+++ b/src/paks/vdr/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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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

diff --git a/src/paks/vdradmin/install.sh b/src/paks/vdradmin/install.sh
new file mode 100644 (file)
index 0000000..31c5fec
--- /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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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 (file)
index 0000000..a7b8a53
--- /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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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 (file)
index 0000000..72d3185
--- /dev/null
+++ b/src/paks/vdradmin/update.sh
@@ -0,0 +1,37 @@
+#!/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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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@^VDR_PORT = .*@VDR_PORT = 6419@g" \
+       -e "s@^VDRCONFDIR = .*@VDRCONFDIR = /etc/vdr@g"
+
+start_service ${NAME}

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 (file)
index 0000000..d8319c0
--- /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 @@
+ #<Configuration>
+ 
+ # Your timers.conf
+-TIMERS="/video/timers.conf"
++TIMERS="/etc/vdr/timers.conf"
+ 
+ #</Configuration>
+ 

diff --git a/src/patches/vdr-streamdev_recordings-64.patch b/src/patches/vdr-streamdev_recordings-64.patch
new file mode 100644 (file)
index 0000000..2dc5250
--- /dev/null
+++ b/src/patches/vdr-streamdev_recordings-64.patch
@@ -0,0 +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 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("%llu:%llu.rec", (unsigned long long) st.st_dev, (unsigned long long) st.st_ino);
+       return "";
+ }
+