[SCM] vdr-plugin-infosatepg packaging repository branch, master, updated. debian/0.0.11-6-3-g26bf560
etobi
git at e-tobi.net
Wed Apr 4 20:24:07 UTC 2012
The following commit has been merged in the master branch:
commit 26bf5602eae5e62b42b765d27ef4c5c83c0c9d90
Author: etobi <git at e-tobi.net>
Date: Sun Apr 1 11:37:23 2012 +0200
Added vdr-1.7.27.patch
diff --git a/debian/changelog b/debian/changelog
index ef69d24..3da9873 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ vdr-plugin-infosatepg (0.0.11-7) unstable; urgency=low
* Build-depend on vdr-dev (>= 1.7.26)
* Standards-Version: 3.9.3
+ * Added vdr-1.7.27.patch
-- Tobias Grimm <etobi at debian.org> Sun, 25 Mar 2012 12:19:42 +0200
diff --git a/debian/patches/missing_ctype_h b/debian/patches/missing_ctype_h.patch
similarity index 100%
rename from debian/patches/missing_ctype_h
rename to debian/patches/missing_ctype_h.patch
diff --git a/debian/patches/series b/debian/patches/series
index 7874ee1..0a2036d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-missing_ctype_h
+missing_ctype_h.patch
+vdr-1.7.27.patch
diff --git a/debian/patches/vdr-1.7.27.patch b/debian/patches/vdr-1.7.27.patch
new file mode 100644
index 0000000..71940a7
--- /dev/null
+++ b/debian/patches/vdr-1.7.27.patch
@@ -0,0 +1,45 @@
+Index: vdr-plugin-infosatepg/infosatepg.cpp
+===================================================================
+--- vdr-plugin-infosatepg.orig/infosatepg.cpp 2012-04-01 11:35:43.000000000 +0200
++++ vdr-plugin-infosatepg/infosatepg.cpp 2012-04-01 11:42:22.000000000 +0200
+@@ -190,7 +190,7 @@
+ if (dev)
+ {
+ if (!dev->ProvidesTransponder(chan)) continue; // device cannot provide transponder -> skip
+- if (EITScanner.UsesDevice(dev)) continue; // EITScanner is updating EPG -> skip
++ if (EITScanner.Active()) continue; // EITScanner is updating EPG -> skip
+ if (dev->Receiving()) continue; // device is recording -> skip
+ if (dev->IsPrimaryDevice()) continue; // device is primary -> skip
+ if (cDevice::ActualDevice()->CardIndex()==i) continue; // device is live viewing -> skip
+Index: vdr-plugin-infosatepg/status.cpp
+===================================================================
+--- vdr-plugin-infosatepg.orig/status.cpp 2012-04-01 11:35:43.000000000 +0200
++++ vdr-plugin-infosatepg/status.cpp 2012-04-01 11:42:22.000000000 +0200
+@@ -21,7 +21,11 @@
+ if (myFilter) delete myFilter;
+ }
+
++#if APIVERSNUM >= 10726
++void cStatusInfosatepg::ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView)
++#else
+ void cStatusInfosatepg::ChannelSwitch(const cDevice *Device, int ChannelNumber)
++#endif
+ {
+ if (!ChannelNumber) return;
+ if (!Device) return; // just to be safe
+Index: vdr-plugin-infosatepg/status.h
+===================================================================
+--- vdr-plugin-infosatepg.orig/status.h 2012-04-01 11:35:43.000000000 +0200
++++ vdr-plugin-infosatepg/status.h 2012-04-01 11:42:29.000000000 +0200
+@@ -20,7 +20,11 @@
+ cDevice *myFilterDevice;
+ cGlobalInfosatepg *global;
+ protected:
++#if APIVERSNUM >= 10726
++ virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView);
++#else
+ virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
++#endif
+ public:
+ cStatusInfosatepg(cGlobalInfosatepg *Global);
+ virtual ~cStatusInfosatepg(void);
--
vdr-plugin-infosatepg packaging repository
More information about the pkg-vdr-dvb-changes
mailing list