diff options
| author | root <root@elwms02.(none)> | 2010-04-06 16:13:08 +0200 |
|---|---|---|
| committer | root <root@elwms02.(none)> | 2010-04-06 16:13:08 +0200 |
| commit | 0e7005fcc7483c01aa102fbea358c5ac65a48d62 (patch) | |
| tree | 11517ce0d3d2977c6732b3aa583b0008083e0bd3 /plugins/pvrinput | |
| download | x-vdr-0e7005fcc7483c01aa102fbea358c5ac65a48d62.tar.gz x-vdr-0e7005fcc7483c01aa102fbea358c5ac65a48d62.tar.bz2 | |
hello world
Diffstat (limited to 'plugins/pvrinput')
| -rw-r--r-- | plugins/pvrinput/_plugin.sh | 52 | ||||
| -rw-r--r-- | plugins/pvrinput/patches/p1/pvrinput-2008-12-24_p1.diff | 30 | ||||
| -rw-r--r-- | plugins/pvrinput/patches/pvrinput-2008-12-24_p0.diff | 60 | ||||
| -rw-r--r-- | plugins/pvrinput/plugin.sh | 53 |
4 files changed, 195 insertions, 0 deletions
diff --git a/plugins/pvrinput/_plugin.sh b/plugins/pvrinput/_plugin.sh new file mode 100644 index 0000000..02266c5 --- /dev/null +++ b/plugins/pvrinput/_plugin.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +# x-vdr (Installations-Skript fuer einen VDR mit Debian als Basis) +# von Marc Wernecke - www.zulu-entertainment.de +# 01.01.2007 +# +# vdr-pvrinput + +# defaults +source ./../../x-vdr.conf +source ./../../setup.conf +source ./../../functions + +WEB="http://home.arcor.de/andreas.regel/files/pvrinput/vdr-pvrinput-0.1.1.tgz" +VERSION="pvrinput-0.1.1" +LINK="pvrinput" + +VAR=`basename $WEB` +DIR=`pwd` + +# plugin entfernen +function clean_plugin() { + cd $SOURCEDIR/VDR/PLUGINS/src + rm -rf $LINK* + rm -f $VDRLIBDIR/libvdr-$LINK* + log "cleaning $LINK" +} + +# plugin installieren +function install_plugin() { + download_plugin + extract_plugin + cd $SOURCEDIR/VDR/PLUGINS/src + rm -f $LINK + ln -vfs $VERSION $LINK + patch_plugin + + ## plugin specials - start ## + + ## plugin specials - ende ## +} + +# plugin commands +if [ $# \> 0 ]; then + cmd=$1 + cmd_plugin +else + install_plugin + log "install-plugin fuer $VERSION ist fertig" +fi + +exit 0 diff --git a/plugins/pvrinput/patches/p1/pvrinput-2008-12-24_p1.diff b/plugins/pvrinput/patches/p1/pvrinput-2008-12-24_p1.diff new file mode 100644 index 0000000..2244179 --- /dev/null +++ b/plugins/pvrinput/patches/p1/pvrinput-2008-12-24_p1.diff @@ -0,0 +1,30 @@ +diff -ur pvrinput-2008-10-04/example/channels.conf_newsyntax.example pvrinput-2008-12-24/example/channels.conf_newsyntax.example +--- pvrinput-2008-10-04/example/channels.conf_newsyntax.example 2008-06-01 19:10:12.000000000 +0200 ++++ pvrinput-2008-12-24/example/channels.conf_newsyntax.example 2008-12-24 15:21:31.000000000 +0100 +@@ -33,7 +33,9 @@ + S26:343250:PVRINPUT|TV:P:0:301:300:305:0:5492:0:0:0 + S27:351250:PVRINPUT|TV:P:0:301:300:305:0:5620:0:0:0 + S28:359250:PVRINPUT|TV:P:0:301:300:305:0:5748:0:0:0 +-S30:343250:PVRINPUT|TV:P:0:301:300:305:0:6004:0:0:0 ++S29:367250:PVRINPUT|TV:P:0:301:300:305:0:5876:0:0:0 ++S30:375250:PVRINPUT|TV:P:0:301:300:305:0:6004:0:0:0 ++S35:359250:PVRINPUT|TV:P:0:301:300:305:0:6644:0:0:0 + k21:471250:PVRINPUT|TV:P:0:301:300:305:0:7540:0:0:0 + k22:479250:PVRINPUT|TV:P:0:301:300:305:0:7668:0:0:0 + k23:487250:PVRINPUT|TV:P:0:301:300:305:0:7796:0:0:0 +Nur in pvrinput-2008-12-24/example: channels.conf_newsyntax.example~. +diff -ur pvrinput-2008-10-04/example/channels.conf_oldsyntax.example pvrinput-2008-12-24/example/channels.conf_oldsyntax.example +--- pvrinput-2008-10-04/example/channels.conf_oldsyntax.example 2008-06-01 19:10:00.000000000 +0200 ++++ pvrinput-2008-12-24/example/channels.conf_oldsyntax.example 2008-12-24 15:15:51.000000000 +0100 +@@ -33,7 +33,9 @@ + S26:343250:C0:C:0:301:300:305:A1:5492:0:0:0 + S27:351250:C0:C:0:301:300:305:A1:5620:0:0:0 + S28:359250:C0:C:0:301:300:305:A1:5748:0:0:0 +-S30:343250:C0:C:0:301:300:305:A1:6004:0:0:0 ++S29:367250:C0:C:0:301:300:305:A1:5876:0:0:0 ++S30:375250:C0:C:0:301:300:305:A1:6004:0:0:0 ++S35:415250:C0:C:0:301:300:305:A1:6644:0:0:0 + k21:471250:C0:C:0:301:300:305:A1:7540:0:0:0 + k22:479250:C0:C:0:301:300:305:A1:7668:0:0:0 + k23:487250:C0:C:0:301:300:305:A1:7796:0:0:0 +Nur in pvrinput-2008-12-24/example: channels.conf_oldsyntax.example~. diff --git a/plugins/pvrinput/patches/pvrinput-2008-12-24_p0.diff b/plugins/pvrinput/patches/pvrinput-2008-12-24_p0.diff new file mode 100644 index 0000000..b2538d7 --- /dev/null +++ b/plugins/pvrinput/patches/pvrinput-2008-12-24_p0.diff @@ -0,0 +1,60 @@ +diff -ur pvrinput-2008-10-04/HISTORY pvrinput-2008-12-24/HISTORY +--- pvrinput-2008-10-04/HISTORY 2008-10-04 12:13:45.000000000 +0200 ++++ pvrinput-2008-12-24/HISTORY 2008-12-24 15:23:45.000000000 +0100 +@@ -1,6 +1,19 @@ + VDR Plugin 'pvrinput' Revision History + --------------------------------- + ++2008-12-24 (Dr. Seltsam) ++- The previous fix in cPluginPvrInput::MainMenuAction must depend on ++ PLUGINPARAMPATCHVERSNUM. Oherwise it does not compile with a vdr version ++ that is not patched with the pluginparam-patch ++- fix frequency of S30 in channels.conf examples, add S29 and S35 ++ ++2008-10-26 (Dr. Seltsam) ++- fix usage of PvrMenuMain on channels with iptv-syntax ++- fix permission of directories ++- remove executable flag from patches and conf files ++- fix Makefile ++ ++ + 2008-10-03 (Dr. Seltsam) + - add possibility to force the plugin to use only a certain card by using the + new value PvrSetup.UseOnlyCard. (see README) +Nur in pvrinput-2008-12-24: HISTORY~. +diff -ur pvrinput-2008-10-04/Makefile pvrinput-2008-12-24/Makefile +--- pvrinput-2008-10-04/Makefile 2008-08-24 20:00:46.000000000 +0200 ++++ pvrinput-2008-12-24/Makefile 2008-10-12 19:29:22.000000000 +0200 +@@ -131,9 +131,6 @@ + + dist: clean + @-rm -rf $(TMPDIR)/$(ARCHIVE) +- @chmod -x * +- @chmod -x po/* +- @chmod +x po2i18n.pl + @mkdir $(TMPDIR)/$(ARCHIVE) + @cp -a * $(TMPDIR)/$(ARCHIVE) + @tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE) +diff -ur pvrinput-2008-10-04/plugin.c pvrinput-2008-12-24/plugin.c +--- pvrinput-2008-10-04/plugin.c 2008-10-04 11:28:46.000000000 +0200 ++++ pvrinput-2008-12-24/plugin.c 2008-12-24 14:49:44.000000000 +0100 +@@ -1,6 +1,6 @@ + #include "common.h" + +-static const char *VERSION = "2008-10-04"; ++static const char *VERSION = "2008-12-24"; + static const char *DESCRIPTION = tr("Setup.pvrinput$use Hauppauge PVR as input device"); + static const char *MAINMENUENTRY = tr("Setup.pvrinput$PVR picture settings"); + +@@ -66,7 +66,11 @@ + cOsdObject * cPluginPvrInput::MainMenuAction(void) { + cChannel * channel = Channels.GetByNumber(cDevice::CurrentChannel()); + if (channel && ++#ifdef PLUGINPARAMPATCHVERSNUM ++ ((channel->IsCable() && channel->Ca() == kPvrCa) || channel->IsPlug()) ) ++#else + (channel->IsCable() && channel->Ca() == kPvrCa)) ++#endif + return new cPvrMenuMain(); + Skins.Message(mtError, tr("Setup.pvrinput$Not on an analogue channel!"), 2); + return NULL; diff --git a/plugins/pvrinput/plugin.sh b/plugins/pvrinput/plugin.sh new file mode 100644 index 0000000..b8553cb --- /dev/null +++ b/plugins/pvrinput/plugin.sh @@ -0,0 +1,53 @@ +#!/bin/sh + +# x-vdr (Installations-Skript fuer einen VDR mit Debian als Basis) +# von Marc Wernecke - www.zulu-entertainment.de +# 15.02.2009 +# +# vdr-pvrinput + +# defaults +source ./../../x-vdr.conf +source ./../../setup.conf +source ./../../functions + +WEB="http://drseltsam.device.name/vdr/pvr/src/pvrinput/vdr-pvrinput-2008-10-04.tgz" +VERSION="pvrinput-2008-10-04" +LINK="pvrinput" + +VAR=`basename $WEB` +DIR=`pwd` + +# plugin entfernen +function clean_plugin() { + cd $SOURCEDIR/VDR/PLUGINS/src + rm -rf $LINK* + rm -f $VDRLIBDIR/libvdr-$LINK* + log "cleaning $LINK" +} + +# plugin installieren +function install_plugin() { + download_plugin + extract_plugin + cd $SOURCEDIR/VDR/PLUGINS/src + rm -f $LINK + ln -vfs $VERSION $LINK + patch_plugin + patch_p1_plugin + + ## plugin specials - start ## + + ## plugin specials - ende ## +} + +# plugin commands +if [ $# \> 0 ]; then + cmd=$1 + cmd_plugin +else + install_plugin + log "install-plugin fuer $VERSION ist fertig" +fi + +exit 0 |
