add vdr streamdev-plugin

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1290 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr
index 601f3b4435abad20119734d799f5acfb42a539b9..83eedd553afcc213ffbf3f5ff3c8631760cd03a7 100644 (file)
--- a/config/rootfiles/packages/vdr
+++ b/config/rootfiles/packages/vdr
@@ -7,122 +7,95 @@ opt/vdr/PLUGINS/lib/libvdr-pictures.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-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/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/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-hello.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-hello.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-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.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/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-hello.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-hello.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-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.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/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-hello.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-hello.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-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.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/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-hello.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-hello.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-hello.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-hello.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-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.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/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-hello.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-hello.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/usr
+#opt/vdr/usr/local
+#opt/vdr/usr/local/bin
+opt/vdr/bin/runvdr
+opt/vdr/bin/svdrpsend.pl
+opt/vdr/bin/vdr
 #opt/vdr/share
 #opt/vdr/share/man
 #opt/vdr/share/man/man1
-#opt/vdr/share/man/man1/vdr.1.gz
+opt/vdr/share/man/man1/vdr.1.gz
 #opt/vdr/share/man/man5
-#opt/vdr/share/man/man5/vdr.5.gz
+opt/vdr/share/man/man5/vdr.5.gz
 #opt/vdr/video
-opt/vdr/video/channels.conf
-opt/vdr/video/diseqc.conf
-opt/vdr/video/keymacros.conf
-opt/vdr/video/sources.conf
-opt/vdr/video/svdrphosts.conf
+etc/rc.d/init.d/vdr

diff --git a/config/vdr/plugins/streamdevhosts.conf b/config/vdr/plugins/streamdevhosts.conf
new file mode 100644 (file)
index 0000000..86c1290
--- /dev/null
+++ b/config/vdr/plugins/streamdevhosts.conf
@@ -0,0 +1,2 @@
+10.0.0.0/8
+192.168.0.0/16

diff --git a/config/vdr/setup.conf b/config/vdr/setup.conf
new file mode 100644 (file)
index 0000000..a14aff9
--- /dev/null
+++ b/config/vdr/setup.conf
@@ -0,0 +1,86 @@
+AntiAlias = 1
+AudioLanguages = 
+ChannelEntryTimeout = 1000
+ChannelInfoPos = 0
+ChannelInfoTime = 5
+CurrentChannel = 907
+CurrentDolby = 0
+CurrentVolume = 255
+DefaultLifetime = 99
+DefaultPriority = 50
+DiSEqC = 0
+DisplaySubtitles = 0
+EmergencyExit = 1
+EPGBugfixLevel = 3
+EPGLanguages = 
+EPGLinger = 0
+EPGScanTimeout = 5
+FontFix = Courier:Bold
+FontFixSize = 20
+FontOsd = Sans Serif:Bold
+FontOsdSize = 22
+FontSml = Sans Serif
+FontSmlSize = 18
+InitialChannel = 0
+InitialVolume = -1
+InstantRecordTime = 180
+LnbFrequHi = 10600
+LnbFrequLo = 9750
+LnbSLOF = 11700
+MarginStart = 2
+MarginStop = 10
+MarkInstantRecord = 1
+MaxVideoFileSize = 2000
+MenuKeyCloses = 0
+MenuScrollPage = 1
+MenuScrollWrap = 0
+MinEventTimeout = 30
+MinUserInactivity = 300
+MultiSpeedMode = 0
+NameInstantRecord = TITLE EPISODE
+NextWakeupTime = 0
+OSDHeight = 486
+OSDLanguage = en_US
+OSDLeft = 54
+OSDMessageTime = 1
+OSDSkin = sttng
+OSDTheme = default
+OSDTop = 45
+OSDWidth = 624
+PauseLifetime = 1
+PausePriority = 10
+PrimaryDVB = 1
+PrimaryLimit = 0
+RecordingDirs = 1
+ResumeID = 0
+SetSystemTime = 0
+ShowInfoOnChSwitch = 1
+ShowReplayMode = 0
+SplitEditedFiles = 0
+SubtitleBgTransparency = 0
+SubtitleFgTransparency = 0
+SubtitleLanguages = 
+SubtitleOffset = 0
+SVDRPTimeout = 300
+TimeoutRequChInfo = 1
+TimeSource = 0
+TimeTransponder = 0
+UpdateChannels = 5
+UseDolbyDigital = 1
+UseSmallFont = 1
+UseSubtitle = 1
+UseVps = 0
+VideoDisplayFormat = 1
+VideoFormat = 0
+VpsMargin = 120
+ZapTimeout = 3
+streamdev-server.AllowSuspend = 1
+streamdev-server.HTTPBindIP = 0.0.0.0
+streamdev-server.HTTPServerPort = 3000
+streamdev-server.HTTPStreamType = 2
+streamdev-server.MaxClients = 5
+streamdev-server.ServerPort = 2004
+streamdev-server.StartHTTPServer = 1
+streamdev-server.StartServer = 1
+streamdev-server.SuspendMode = 1
+streamdev-server.VTPBindIP = 0.0.0.0

diff --git a/config/vdr/svdrphosts.conf b/config/vdr/svdrphosts.conf
new file mode 100644 (file)
index 0000000..1bd0874
--- /dev/null
+++ b/config/vdr/svdrphosts.conf
@@ -0,0 +1,12 @@
+#
+# svdrphosts    This file describes a number of host addresses that
+#               are allowed to connect to the SVDRP port of the Video
+#               Disk Recorder (VDR) running on this system.
+# Syntax:
+#
+# IP-Address[/Netmask]
+#
+
+127.0.0.1             # always accept localhost
+192.168.0.0/16        # any host on private addresses
+10.0.0.0/8            # any host on private addresses

diff --git a/lfs/vdr b/lfs/vdr
index ef31db1a62413b6d9cb9c9a289d16394b97c09de..e3f9d85375f1813d59c558db8a5b684f3531f120 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -25,9 +25,10 @@
 include Config
 
 VER        = 1.6.0
-
 THISAPP    = vdr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE1   = vdr-streamdev-20080325-http-0_4.tgz
+
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,17 +41,19 @@ DEPS       = "freefont fontconfig"
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(DL_FILE1) $(DL_FILE2) $(DL_FILE3)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE1) = $(DL_FROM)/$(DL_FILE1)
 
 $(DL_FILE)_MD5 = 76f4ebe6525a35e33313d27a3f8e80c0
+$(DL_FILE1)_MD5 = 874026c643601692077c42ee7a70b720
 
 install : $(TARGET)
 
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
+download : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
@@ -77,8 +80,13 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make VIDEODIR=/opt/vdr/video $(MAKETUNING)
+       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) && make VIDEODIR=/var/video plugins $(MAKETUNING)
+       cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING)
        cd $(DIR_APP) && make PREFIX=. DESTDIR=/opt/vdr/ install
-       cd $(DIR_APP) && install *.conf /opt/vdr/video/
+       -mkdir -p /var/video/plugins/ 
+       cd $(DIR_APP) && install *.conf /var/video/
+       cp -fr $(DIR_SRC)/config/vdr/* /var/video/
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/initscripts/init.d/vdr b/src/initscripts/init.d/vdr
new file mode 100644 (file)
index 0000000..8f2e28b
--- /dev/null
+++ b/src/initscripts/init.d/vdr
@@ -0,0 +1,46 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/vdr
+#
+# Description : This is a script that starts vdr as deamon
+#
+# Authors     : Arne Fitzenreiter (arne@ipfire.org)
+#
+# Version     : 01.00
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+       start)
+               boot_mesg "Starting Video Disk Recorder..."
+               cd /opt/vdr
+               loadproc screen -dmS vdr /opt/vdr/bin/vdr -Pstreamdev-server
+               ;;
+               
+       stop)
+               boot_mesg "Stopping Video Disk Recorder..."
+               killproc /opt/vdr/bin/vdr
+               ;;
+
+       restart)
+               ${0} stop
+               sleep 1
+               ${0} start
+               ;;
+
+       status)
+               statusproc /opt/vdr/bin/vdr
+               ;;
+
+       *)
+               echo "Usage: ${0} {start|stop|restart|status}"
+               exit 1
+               ;;
+esac
+
+# End $rc_base/init.d/vdr