diff --git a/patches/vdr-1.5.17-pluginparam.patch b/patches/vdr-1.6.0-pluginparam.patch similarity index 83% rename from patches/vdr-1.5.17-pluginparam.patch rename to patches/vdr-1.6.0-pluginparam.patch index 66767cb..583aa20 100644 --- a/patches/vdr-1.5.17-pluginparam.patch +++ b/patches/vdr-1.6.0-pluginparam.patch @@ -1,6 +1,6 @@ -diff -Nru vdr-1.5.17-vanilla/channels.c vdr-1.5.17-pluginparam/channels.c ---- vdr-1.5.17-vanilla/channels.c 2008-03-02 19:09:57.000000000 +0200 -+++ vdr-1.5.17-pluginparam/channels.c 2008-03-02 19:14:56.000000000 +0200 +diff -Nru vdr-1.6.0-vanilla/channels.c vdr-1.6.0-pluginparam/channels.c +--- vdr-1.6.0-vanilla/channels.c 2008-03-27 21:43:25.000000000 +0200 ++++ vdr-1.6.0-pluginparam/channels.c 2008-03-27 22:06:47.000000000 +0200 @@ -166,6 +166,7 @@ shortName = strdup(""); provider = strdup(""); @@ -122,9 +122,9 @@ diff -Nru vdr-1.5.17-vanilla/channels.c vdr-1.5.17-pluginparam/channels.c free(parambuf); free(sourcebuf); -diff -Nru vdr-1.5.17-vanilla/channels.h vdr-1.5.17-pluginparam/channels.h ---- vdr-1.5.17-vanilla/channels.h 2008-03-02 19:09:57.000000000 +0200 -+++ vdr-1.5.17-pluginparam/channels.h 2008-03-02 19:14:56.000000000 +0200 +diff -Nru vdr-1.6.0-vanilla/channels.h vdr-1.6.0-pluginparam/channels.h +--- vdr-1.6.0-vanilla/channels.h 2008-03-27 21:43:25.000000000 +0200 ++++ vdr-1.6.0-pluginparam/channels.h 2008-03-27 22:06:47.000000000 +0200 @@ -114,6 +114,7 @@ char *shortName; char *provider; @@ -164,21 +164,21 @@ diff -Nru vdr-1.5.17-vanilla/channels.h vdr-1.5.17-pluginparam/channels.h void SetPids(int Vpid, int Ppid, 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.5.17-vanilla/config.h vdr-1.5.17-pluginparam/config.h ---- vdr-1.5.17-vanilla/config.h 2008-03-02 19:09:57.000000000 +0200 -+++ vdr-1.5.17-pluginparam/config.h 2008-03-02 19:14:56.000000000 +0200 +diff -Nru vdr-1.6.0-vanilla/config.h vdr-1.6.0-pluginparam/config.h +--- vdr-1.6.0-vanilla/config.h 2008-03-27 21:43:25.000000000 +0200 ++++ vdr-1.6.0-pluginparam/config.h 2008-03-27 22:06:47.000000000 +0200 @@ -30,6 +30,8 @@ - #define APIVERSION "1.5.15" - #define APIVERSNUM 10515 // Version * 10000 + Major * 100 + Minor + #define APIVERSION "1.6.0" + #define APIVERSNUM 10600 // 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.5.17-vanilla/menu.c vdr-1.5.17-pluginparam/menu.c ---- vdr-1.5.17-vanilla/menu.c 2008-03-02 19:09:57.000000000 +0200 -+++ vdr-1.5.17-pluginparam/menu.c 2008-03-02 19:14:56.000000000 +0200 +diff -Nru vdr-1.6.0-vanilla/menu.c vdr-1.6.0-pluginparam/menu.c +--- vdr-1.6.0-vanilla/menu.c 2008-03-27 21:43:25.000000000 +0200 ++++ vdr-1.6.0-pluginparam/menu.c 2008-03-27 22:06:47.000000000 +0200 @@ -253,6 +253,7 @@ cChannel *channel; cChannel data; @@ -211,9 +211,9 @@ diff -Nru vdr-1.5.17-vanilla/menu.c vdr-1.5.17-pluginparam/menu.c if (channel) { *channel = data; isyslog("edited channel %d %s", channel->Number(), *data.ToText()); -diff -Nru vdr-1.5.17-vanilla/po/fi_FI.po vdr-1.5.17-pluginparam/po/fi_FI.po ---- vdr-1.5.17-vanilla/po/fi_FI.po 2008-03-02 19:09:57.000000000 +0200 -+++ vdr-1.5.17-pluginparam/po/fi_FI.po 2008-03-02 19:14:56.000000000 +0200 +diff -Nru vdr-1.6.0-vanilla/po/fi_FI.po vdr-1.6.0-pluginparam/po/fi_FI.po +--- vdr-1.6.0-vanilla/po/fi_FI.po 2008-03-27 21:43:25.000000000 +0200 ++++ vdr-1.6.0-pluginparam/po/fi_FI.po 2008-03-27 22:06:47.000000000 +0200 @@ -1001,3 +1001,6 @@ #, c-format msgid "VDR will shut down in %s minutes" @@ -221,9 +221,9 @@ diff -Nru vdr-1.5.17-vanilla/po/fi_FI.po vdr-1.5.17-pluginparam/po/fi_FI.po + +msgid "Parameters" +msgstr "Parametrit" -diff -Nru vdr-1.5.17-vanilla/po/fr_FR.po vdr-1.5.17-pluginparam/po/fr_FR.po ---- vdr-1.5.17-vanilla/po/fr_FR.po 2008-03-02 19:09:57.000000000 +0200 -+++ vdr-1.5.17-pluginparam/po/fr_FR.po 2008-03-02 19:14:56.000000000 +0200 +diff -Nru vdr-1.6.0-vanilla/po/fr_FR.po vdr-1.6.0-pluginparam/po/fr_FR.po +--- vdr-1.6.0-vanilla/po/fr_FR.po 2008-03-27 21:43:25.000000000 +0200 ++++ vdr-1.6.0-pluginparam/po/fr_FR.po 2008-03-27 22:06:47.000000000 +0200 @@ -1004,3 +1004,6 @@ #, c-format msgid "VDR will shut down in %s minutes" @@ -231,9 +231,9 @@ diff -Nru vdr-1.5.17-vanilla/po/fr_FR.po vdr-1.5.17-pluginparam/po/fr_FR.po + +msgid "Parameters" +msgstr "Paramètres" -diff -Nru vdr-1.5.17-vanilla/sources.c vdr-1.5.17-pluginparam/sources.c ---- vdr-1.5.17-vanilla/sources.c 2008-03-02 19:09:57.000000000 +0200 -+++ vdr-1.5.17-pluginparam/sources.c 2008-03-02 19:14:56.000000000 +0200 +diff -Nru vdr-1.6.0-vanilla/sources.c vdr-1.6.0-pluginparam/sources.c +--- vdr-1.6.0-vanilla/sources.c 2008-03-27 21:43:25.000000000 +0200 ++++ vdr-1.6.0-pluginparam/sources.c 2008-03-27 22:06:47.000000000 +0200 @@ -37,6 +37,7 @@ char buffer[16]; char *q = buffer; @@ -250,9 +250,9 @@ diff -Nru vdr-1.5.17-vanilla/sources.c vdr-1.5.17-pluginparam/sources.c case 'C': type = stCable; break; case 'S': type = stSat; break; case 'T': type = stTerr; break; -diff -Nru vdr-1.5.17-vanilla/sources.conf vdr-1.5.17-pluginparam/sources.conf ---- vdr-1.5.17-vanilla/sources.conf 2008-03-02 19:09:57.000000000 +0200 -+++ vdr-1.5.17-pluginparam/sources.conf 2008-03-02 19:14:56.000000000 +0200 +diff -Nru vdr-1.6.0-vanilla/sources.conf vdr-1.6.0-pluginparam/sources.conf +--- vdr-1.6.0-vanilla/sources.conf 2008-03-27 21:43:25.000000000 +0200 ++++ vdr-1.6.0-pluginparam/sources.conf 2008-03-27 22:06:47.000000000 +0200 @@ -188,3 +188,7 @@ # Terrestrial @@ -261,9 +261,9 @@ diff -Nru vdr-1.5.17-vanilla/sources.conf vdr-1.5.17-pluginparam/sources.conf +# Plugin + +P Plugin -diff -Nru vdr-1.5.17-vanilla/sources.h vdr-1.5.17-pluginparam/sources.h ---- vdr-1.5.17-vanilla/sources.h 2008-03-02 19:09:57.000000000 +0200 -+++ vdr-1.5.17-pluginparam/sources.h 2008-03-02 19:14:56.000000000 +0200 +diff -Nru vdr-1.6.0-vanilla/sources.h vdr-1.6.0-pluginparam/sources.h +--- vdr-1.6.0-vanilla/sources.h 2008-03-27 21:43:25.000000000 +0200 ++++ vdr-1.6.0-pluginparam/sources.h 2008-03-27 22:06:47.000000000 +0200 @@ -16,10 +16,11 @@ public: enum eSourceType {