From abfa46c064965cc1abfd63d516a89972008d6831 Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Wed, 17 Jun 2009 15:15:38 +0300 Subject: [PATCH] Updated patches. --- ...tch => vdr-1.7.8-disable_ca_updates.patch} | 6 +- patches/vdr-1.7.8-disable_eitscan.patch | 12 ++++ ...aram.patch => vdr-1.7.8-pluginparam.patch} | 62 +++++++++---------- 3 files changed, 46 insertions(+), 34 deletions(-) rename patches/{vdr-1.7.7-disable_ca_updates.patch => vdr-1.7.8-disable_ca_updates.patch} (66%) create mode 100644 patches/vdr-1.7.8-disable_eitscan.patch rename patches/{vdr-1.7.7-pluginparam.patch => vdr-1.7.8-pluginparam.patch} (84%) diff --git a/patches/vdr-1.7.7-disable_ca_updates.patch b/patches/vdr-1.7.8-disable_ca_updates.patch similarity index 66% rename from patches/vdr-1.7.7-disable_ca_updates.patch rename to patches/vdr-1.7.8-disable_ca_updates.patch index 7a0350d..ce078e2 100644 --- a/patches/vdr-1.7.7-disable_ca_updates.patch +++ b/patches/vdr-1.7.8-disable_ca_updates.patch @@ -1,6 +1,6 @@ -diff -Nru vdr-1.7.7-vanilla/pat.c vdr-1.7.7-disable_ca_updates/pat.c ---- vdr-1.7.7-vanilla/pat.c 2008-07-06 17:01:32.000000000 +0300 -+++ vdr-1.7.7-disable_ca_updates/pat.c 2009-05-22 10:57:58.000000000 +0300 +diff -Nru vdr-1.7.8-vanilla/pat.c vdr-1.7.8-disable_ca_updates/pat.c +--- vdr-1.7.8-vanilla/pat.c 2009-06-15 17:31:45.000000000 +0300 ++++ vdr-1.7.8-disable_ca_updates/pat.c 2009-06-17 15:09:13.000000000 +0300 @@ -444,6 +444,7 @@ } if (Setup.UpdateChannels >= 2) { diff --git a/patches/vdr-1.7.8-disable_eitscan.patch b/patches/vdr-1.7.8-disable_eitscan.patch new file mode 100644 index 0000000..b5c3f2a --- /dev/null +++ b/patches/vdr-1.7.8-disable_eitscan.patch @@ -0,0 +1,12 @@ +diff -Nru vdr-1.7.8-vanilla/eitscan.c vdr-1.7.8-disable_eitscan/eitscan.c +--- vdr-1.7.8-vanilla/eitscan.c 2009-06-15 17:31:45.000000000 +0300 ++++ vdr-1.7.8-disable_eitscan/eitscan.c 2009-06-17 10:52:17.000000000 +0300 +@@ -146,7 +146,7 @@ + if (Device) { + for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) { + const cChannel *Channel = ScanData->GetChannel(); +- if (Channel) { ++ if (Channel && !Channel->IsPlug()) { + if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) { + if (Device->ProvidesTransponder(Channel)) { + if (!Device->Receiving()) { diff --git a/patches/vdr-1.7.7-pluginparam.patch b/patches/vdr-1.7.8-pluginparam.patch similarity index 84% rename from patches/vdr-1.7.7-pluginparam.patch rename to patches/vdr-1.7.8-pluginparam.patch index c1d76fa..baab03c 100644 --- a/patches/vdr-1.7.7-pluginparam.patch +++ b/patches/vdr-1.7.8-pluginparam.patch @@ -1,6 +1,6 @@ -diff -Nru vdr-1.7.7-vanilla/channels.c vdr-1.7.7-pluginparam/channels.c ---- vdr-1.7.7-vanilla/channels.c 2009-04-25 16:57:32.000000000 +0300 -+++ vdr-1.7.7-pluginparam/channels.c 2009-05-22 10:57:39.000000000 +0300 +diff -Nru vdr-1.7.8-vanilla/channels.c vdr-1.7.8-pluginparam/channels.c +--- vdr-1.7.8-vanilla/channels.c 2009-06-15 17:31:45.000000000 +0300 ++++ vdr-1.7.8-pluginparam/channels.c 2009-06-17 15:07:55.000000000 +0300 @@ -188,6 +188,7 @@ shortName = strdup(""); provider = strdup(""); @@ -122,9 +122,9 @@ diff -Nru vdr-1.7.7-vanilla/channels.c vdr-1.7.7-pluginparam/channels.c free(parambuf); free(sourcebuf); -diff -Nru vdr-1.7.7-vanilla/channels.h vdr-1.7.7-pluginparam/channels.h ---- vdr-1.7.7-vanilla/channels.h 2008-11-22 15:35:52.000000000 +0200 -+++ vdr-1.7.7-pluginparam/channels.h 2009-05-22 10:57:39.000000000 +0300 +diff -Nru vdr-1.7.8-vanilla/channels.h vdr-1.7.8-pluginparam/channels.h +--- vdr-1.7.8-vanilla/channels.h 2009-06-15 17:31:45.000000000 +0300 ++++ vdr-1.7.8-pluginparam/channels.h 2009-06-17 15:07:55.000000000 +0300 @@ -116,6 +116,7 @@ char *shortName; char *provider; @@ -164,21 +164,21 @@ diff -Nru vdr-1.7.7-vanilla/channels.h vdr-1.7.7-pluginparam/channels.h void SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid); void SetCaIds(const int *CaIds); // list must be zero-terminated void SetCaDescriptors(int Level); -diff -Nru vdr-1.7.7-vanilla/config.h vdr-1.7.7-pluginparam/config.h ---- vdr-1.7.7-vanilla/config.h 2009-05-03 16:15:35.000000000 +0300 -+++ vdr-1.7.7-pluginparam/config.h 2009-05-22 10:57:39.000000000 +0300 +diff -Nru vdr-1.7.8-vanilla/config.h vdr-1.7.8-pluginparam/config.h +--- vdr-1.7.8-vanilla/config.h 2009-06-15 17:31:45.000000000 +0300 ++++ vdr-1.7.8-pluginparam/config.h 2009-06-17 15:07:55.000000000 +0300 @@ -30,6 +30,8 @@ - #define APIVERSION "1.7.7" - #define APIVERSNUM 10707 // Version * 10000 + Major * 100 + Minor + #define APIVERSION "1.7.8" + #define APIVERSNUM 10708 // Version * 10000 + Major * 100 + Minor +#define PLUGINPARAMPATCHVERSNUM 1 + // When loading plugins, VDR searches them by their APIVERSION, which // may be smaller than VDRVERSION in case there have been no changes to // VDR header files since the last APIVERSION. This allows compiled -diff -Nru vdr-1.7.7-vanilla/menu.c vdr-1.7.7-pluginparam/menu.c ---- vdr-1.7.7-vanilla/menu.c 2009-05-03 16:30:13.000000000 +0300 -+++ vdr-1.7.7-pluginparam/menu.c 2009-05-22 10:57:39.000000000 +0300 +diff -Nru vdr-1.7.8-vanilla/menu.c vdr-1.7.8-pluginparam/menu.c +--- vdr-1.7.8-vanilla/menu.c 2009-06-15 17:31:45.000000000 +0300 ++++ vdr-1.7.8-pluginparam/menu.c 2009-06-17 15:07:55.000000000 +0300 @@ -190,6 +190,7 @@ cChannel *channel; cChannel data; @@ -211,29 +211,29 @@ diff -Nru vdr-1.7.7-vanilla/menu.c vdr-1.7.7-pluginparam/menu.c if (channel) { *channel = data; isyslog("edited channel %d %s", channel->Number(), *data.ToText()); -diff -Nru vdr-1.7.7-vanilla/po/fi_FI.po vdr-1.7.7-pluginparam/po/fi_FI.po ---- vdr-1.7.7-vanilla/po/fi_FI.po 2009-05-03 17:15:20.000000000 +0300 -+++ vdr-1.7.7-pluginparam/po/fi_FI.po 2009-05-22 10:57:39.000000000 +0300 -@@ -1010,3 +1010,6 @@ +diff -Nru vdr-1.7.8-vanilla/po/fi_FI.po vdr-1.7.8-pluginparam/po/fi_FI.po +--- vdr-1.7.8-vanilla/po/fi_FI.po 2009-06-15 17:31:45.000000000 +0300 ++++ vdr-1.7.8-pluginparam/po/fi_FI.po 2009-06-17 15:07:55.000000000 +0300 +@@ -1025,3 +1025,6 @@ #, c-format msgid "VDR will shut down in %s minutes" msgstr "VDR sammuu %s minuutin kuluttua" + +msgid "Parameters" +msgstr "Parametrit" -diff -Nru vdr-1.7.7-vanilla/po/fr_FR.po vdr-1.7.7-pluginparam/po/fr_FR.po ---- vdr-1.7.7-vanilla/po/fr_FR.po 2009-05-03 17:15:20.000000000 +0300 -+++ vdr-1.7.7-pluginparam/po/fr_FR.po 2009-05-22 10:57:39.000000000 +0300 -@@ -1013,3 +1013,6 @@ +diff -Nru vdr-1.7.8-vanilla/po/fr_FR.po vdr-1.7.8-pluginparam/po/fr_FR.po +--- vdr-1.7.8-vanilla/po/fr_FR.po 2009-06-15 17:31:45.000000000 +0300 ++++ vdr-1.7.8-pluginparam/po/fr_FR.po 2009-06-17 15:07:55.000000000 +0300 +@@ -1028,3 +1028,6 @@ #, c-format msgid "VDR will shut down in %s minutes" msgstr "VDR s'arrêtera dans %s minutes" + +msgid "Parameters" +msgstr "Paramètres" -diff -Nru vdr-1.7.7-vanilla/sources.c vdr-1.7.7-pluginparam/sources.c ---- vdr-1.7.7-vanilla/sources.c 2008-02-10 16:07:26.000000000 +0200 -+++ vdr-1.7.7-pluginparam/sources.c 2009-05-22 10:57:39.000000000 +0300 +diff -Nru vdr-1.7.8-vanilla/sources.c vdr-1.7.8-pluginparam/sources.c +--- vdr-1.7.8-vanilla/sources.c 2009-06-15 17:31:45.000000000 +0300 ++++ vdr-1.7.8-pluginparam/sources.c 2009-06-17 15:07:55.000000000 +0300 @@ -37,6 +37,7 @@ char buffer[16]; char *q = buffer; @@ -250,9 +250,9 @@ diff -Nru vdr-1.7.7-vanilla/sources.c vdr-1.7.7-pluginparam/sources.c case 'C': type = stCable; break; case 'S': type = stSat; break; case 'T': type = stTerr; break; -diff -Nru vdr-1.7.7-vanilla/sources.conf vdr-1.7.7-pluginparam/sources.conf ---- vdr-1.7.7-vanilla/sources.conf 2008-08-16 13:02:27.000000000 +0300 -+++ vdr-1.7.7-pluginparam/sources.conf 2009-05-22 10:57:39.000000000 +0300 +diff -Nru vdr-1.7.8-vanilla/sources.conf vdr-1.7.8-pluginparam/sources.conf +--- vdr-1.7.8-vanilla/sources.conf 2009-06-15 17:31:45.000000000 +0300 ++++ vdr-1.7.8-pluginparam/sources.conf 2009-06-17 15:07:55.000000000 +0300 @@ -194,3 +194,7 @@ # Terrestrial @@ -261,9 +261,9 @@ diff -Nru vdr-1.7.7-vanilla/sources.conf vdr-1.7.7-pluginparam/sources.conf +# Plugin + +P Plugin -diff -Nru vdr-1.7.7-vanilla/sources.h vdr-1.7.7-pluginparam/sources.h ---- vdr-1.7.7-vanilla/sources.h 2005-05-14 12:30:41.000000000 +0300 -+++ vdr-1.7.7-pluginparam/sources.h 2009-05-22 10:57:39.000000000 +0300 +diff -Nru vdr-1.7.8-vanilla/sources.h vdr-1.7.8-pluginparam/sources.h +--- vdr-1.7.8-vanilla/sources.h 2009-06-15 17:31:45.000000000 +0300 ++++ vdr-1.7.8-pluginparam/sources.h 2009-06-17 15:07:55.000000000 +0300 @@ -16,10 +16,11 @@ public: enum eSourceType {