[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.27-1_etobi1
etobi
git at e-tobi.net
Sat Mar 31 11:28:00 UTC 2012
The following commit has been merged in the e-tobi branch:
commit db0fdc128c3a1660810765b75428eb14b31b229b
Author: etobi <git at e-tobi.net>
Date: Sun Mar 11 19:36:44 2012 +0100
Dropped opt-39_noepg.patch (not required anymore)
diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 168fa49..3877674 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -15,7 +15,6 @@ debian/patches/opt-38_disableDoubleEpgEntrys.patch:c637b1551cb497a5d63d963849198
debian/patches/99_ncursesw-include.patch:9bafeb768f7921015a5bab5e47786950
debian/patches/82_valgrind.patch:60ad50e72eabb0861d096d1002fddca7
debian/patches/opt-22-x_edit_marks.patch:9d4f8fbfd9f841a809f8d9f4eebd01a4
-debian/patches/opt-39_noepg.patch:b34500f98b62172bb6b08a6217048fef
debian/patches/12_osdbase-maxitems.patch:f6fc7c5a100f8e891280195b3e1d69ba
debian/patches/opt-50_graphtft-liemikuutio.patch:a5a3ead7091ddd35fab0b6925ffefcab
debian/patches/opt-45_yaepg.patch:8e9c35a5b9224381cfc8936f0de2fe48
diff --git a/debian/changelog b/debian/changelog
index 6b24c81..f5526d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ vdr (1.7.26-1~ctvdr1) unstable; urgency=low
* Install scr.conf (Satellite Channel Routing) to /etc/vdr/ (Closes: #660729)
* Updated debianize-vdrplugin to use the debhelper V7 format
* Upgraded opt-20_liemikuutio.dpatch to version 1.34
+ * Dropped opt-39_noepg.patch (not required anymore)
-- Tobias Grimm <etobi at debian.org> Sun, 19 Feb 2012 17:21:08 +0100
diff --git a/debian/patches/opt-39_noepg.patch b/debian/patches/opt-39_noepg.patch
deleted file mode 100644
index cb6f1ca..0000000
--- a/debian/patches/opt-39_noepg.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-Description: The patch allows to disable normal epg update for specified channels.
- This is useful if you get epg data of the channels from external sources.
-Author:
-Origin: http://winni.vdr-developer.org/noepgmenu/downloads/beta
-
-Index: vdr/config.c
-===================================================================
---- vdr.orig/config.c 2012-01-15 21:21:18.000000000 +0100
-+++ vdr/config.c 2012-01-15 21:21:23.000000000 +0100
-@@ -391,6 +391,8 @@
- SetSystemTime = 0;
- TimeSource = 0;
- TimeTransponder = 0;
-+ noEPGMode=0;
-+ noEPGList=strdup("");
- MarginStart = 2;
- MarginStop = 10;
- AudioLanguages[0] = -1;
-@@ -473,11 +475,18 @@
- EmergencyExit = 1;
- }
-
-+cSetup::~cSetup()
-+{
-+ free(noEPGList);
-+}
-+
- cSetup& cSetup::operator= (const cSetup &s)
- {
- memcpy(&__BeginData__, &s.__BeginData__, (char *)&s.__EndData__ - (char *)&s.__BeginData__);
- InitialChannel = s.InitialChannel;
- DeviceBondings = s.DeviceBondings;
-+ free(noEPGList);
-+ noEPGList = strdup(s.noEPGList);
- return *this;
- }
-
-@@ -594,6 +603,11 @@
- else if (!strcasecmp(Name, "SetSystemTime")) SetSystemTime = atoi(Value);
- else if (!strcasecmp(Name, "TimeSource")) TimeSource = cSource::FromString(Value);
- else if (!strcasecmp(Name, "TimeTransponder")) TimeTransponder = atoi(Value);
-+ else if (!strcasecmp(Name, "noEPGMode")) noEPGMode = atoi(Value);
-+ else if (!strcasecmp(Name, "noEPGList")) {
-+ free(noEPGList);
-+ noEPGList=strdup(Value ? Value : "");
-+ }
- else if (!strcasecmp(Name, "MarginStart")) MarginStart = atoi(Value);
- else if (!strcasecmp(Name, "MarginStop")) MarginStop = atoi(Value);
- else if (!strcasecmp(Name, "AudioLanguages")) return ParseLanguages(Value, AudioLanguages);
-@@ -700,6 +714,8 @@
- Store("SetSystemTime", SetSystemTime);
- Store("TimeSource", cSource::ToString(TimeSource));
- Store("TimeTransponder", TimeTransponder);
-+ Store("noEPGMode", noEPGMode);
-+ Store("noEPGList", noEPGList);
- Store("MarginStart", MarginStart);
- Store("MarginStop", MarginStop);
- StoreLanguages("AudioLanguages", AudioLanguages);
-Index: vdr/config.h
-===================================================================
---- vdr.orig/config.h 2012-01-15 21:21:18.000000000 +0100
-+++ vdr/config.h 2012-01-15 21:21:23.000000000 +0100
-@@ -255,6 +255,7 @@
- int SetSystemTime;
- int TimeSource;
- int TimeTransponder;
-+ int noEPGMode;
- int MarginStart, MarginStop;
- int AudioLanguages[I18N_MAX_LANGUAGES + 1];
- int DisplaySubtitles;
-@@ -325,7 +326,9 @@
- int __EndData__;
- cString InitialChannel;
- cString DeviceBondings;
-+ char *noEPGList; // pointer not to be flat-copied
- cSetup(void);
-+ ~cSetup();
- cSetup& operator= (const cSetup &s);
- bool Load(const char *FileName);
- bool Save(void);
-Index: vdr/eit.c
-===================================================================
---- vdr.orig/eit.c 2012-01-15 21:21:18.000000000 +0100
-+++ vdr/eit.c 2012-01-15 21:21:23.000000000 +0100
-@@ -24,8 +24,28 @@
- class cEIT : public SI::EIT {
- public:
- cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bool OnlyRunningStatus = false);
-+
-+private:
-+ bool allowedEPG(tChannelID kanalID);
- };
-
-+bool cEIT::allowedEPG(tChannelID kanalID) {
-+ bool rc;
-+
-+ if (Setup.noEPGMode == 1) {
-+ rc=false;
-+ if (strstr(::Setup.noEPGList,kanalID.ToString())!=NULL)
-+ rc=true;
-+ }
-+ else {
-+ rc=true;
-+ if (strstr(::Setup.noEPGList,kanalID.ToString())!=NULL)
-+ rc=false;
-+ }
-+
-+ return rc;
-+}
-+
- cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bool OnlyRunningStatus)
- :SI::EIT(Data, false)
- {
-@@ -37,6 +57,12 @@
- if (!channel)
- return; // only collect data for known channels
-
-+ // only use epg from channels not blocked by noEPG-patch
-+ tChannelID kanalID;
-+ kanalID=channel->GetChannelID();
-+ if (!allowedEPG(kanalID))
-+ return;
-+
- cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channel, true);
-
- bool Empty = true;
-Index: vdr/menu.c
-===================================================================
---- vdr.orig/menu.c 2012-01-15 21:21:18.000000000 +0100
-+++ vdr/menu.c 2012-01-15 21:21:23.000000000 +0100
-@@ -2831,6 +2831,7 @@
-
- class cMenuSetupEPG : public cMenuSetupBase {
- private:
-+ const char *noEPGModes[2];
- int originalNumLanguages;
- int numLanguages;
- void Setup(void);
-@@ -2853,6 +2854,9 @@
- {
- int current = Current();
-
-+ noEPGModes[0]=tr("Blacklist");
-+ noEPGModes[1]=tr("Whitelist");
-+
- Clear();
-
- Add(new cMenuEditIntItem( tr("Setup.EPG$EPG scan timeout (h)"), &data.EPGScanTimeout));
-@@ -2861,6 +2865,7 @@
- Add(new cMenuEditBoolItem(tr("Setup.EPG$Set system time"), &data.SetSystemTime));
- if (data.SetSystemTime)
- Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TimeTransponder, &data.TimeSource));
-+ Add(new cMenuEditStraItem(tr("Setup.EPG$Mode noEPG-Patch"), &data.noEPGMode, 2, noEPGModes));
- // TRANSLATORS: note the plural!
- Add(new cMenuEditIntItem( tr("Setup.EPG$Preferred languages"), &numLanguages, 0, I18nLanguages()->Size()));
- for (int i = 0; i < numLanguages; i++)
diff --git a/debian/patches/series b/debian/patches/series
index e01a895..5416dbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,9 +39,6 @@ opt-37-x_menuorg.patch
# Patch that suppresses double EPG entries.
opt-38_disableDoubleEpgEntrys.patch
-# Patch to disable normal epg update for specified channels.
-opt-39_noepg.patch
-
# Patch to show an info, if it is possible to record an event in the timer-info.
opt-41-x_timer-info.patch
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list