[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.23-1_ctvdr1-7-g02dc270
etobi
git at e-tobi.net
Mon Jan 30 23:43:29 UTC 2012
The following commit has been merged in the e-tobi branch:
commit a1ba2fe1477f4f0a53144f515bda702874fe4daf
Author: etobi <git at e-tobi.net>
Date: Sun Jan 15 21:48:17 2012 +0100
Dropped opt-44_rotor.patch
diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index d33c591..6d19907 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -15,9 +15,8 @@ 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/opt-44_rotor.patch:dfece0f496d456b7003c0709c5ca7f01
debian/patches/12_osdbase-maxitems.patch:f6fc7c5a100f8e891280195b3e1d69ba
debian/patches/opt-50_graphtft-liemikuutio.patch:a5a3ead7091ddd35fab0b6925ffefcab
-debian/patches/opt-45_yaepg.patch:e8b772b5a17269778f6fc6c4bea5ef79
+debian/patches/opt-45_yaepg.patch:8e9c35a5b9224381cfc8936f0de2fe48
debian/patches/06_default_svdrp_port_0.patch:4835f681f185991262a3160146f43f2f
debian/patches/81_Make_config.patch:76dc4a78d1da16e3e524e41587d0c90d
diff --git a/debian/changelog b/debian/changelog
index 485cc9d..55d8f8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
vdr (1.7.23-1~ctvdr1) unstable; urgency=low
* New upstream release
- * Updated opt-44_rotor.patch
+ * Dropped opt-44_rotor.patch
-- Tobias Grimm <etobi at debian.org> Sun, 15 Jan 2012 20:50:20 +0100
diff --git a/debian/patches/opt-44_rotor.patch b/debian/patches/opt-44_rotor.patch
deleted file mode 100644
index 4c5ea2d..0000000
--- a/debian/patches/opt-44_rotor.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-Description: This patch is needed for the rotor plugin.
-Author: Thomas Bergwinkl <Bergwinkl.Thomas at vr-web.de>
-Origin: extracted from the rotor plugin 0.1.4-vdr1.5
-
-Index: vdr/device.h
-===================================================================
---- vdr.orig/device.h 2012-01-15 21:12:41.000000000 +0100
-+++ vdr/device.h 2012-01-15 21:14:13.000000000 +0100
-@@ -24,6 +24,8 @@
- #include "spu.h"
- #include "thread.h"
- #include "tools.h"
-+#include <asm/types.h>
-+#include <linux/dvb/frontend.h>
-
- #define MAXDEVICES 16 // the maximum number of devices in the system
- #define MAXPIDHANDLES 64 // the maximum number of different PIDs per device
-@@ -324,6 +326,7 @@
- virtual bool HasProgramme(void);
- ///< Returns true if the device is currently showing any programme to
- ///< the user, either through replaying or live.
-+ virtual bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd) {return false;}
-
- // PID handle facilities
-
-Index: vdr/dvbdevice.c
-===================================================================
---- vdr.orig/dvbdevice.c 2012-01-15 21:07:03.000000000 +0100
-+++ vdr/dvbdevice.c 2012-01-15 21:15:44.000000000 +0100
-@@ -285,6 +285,7 @@
- private:
- static cMutex bondMutex;
- enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
-+ bool SendDiseqc;
- const cDvbDevice *device;
- int fd_frontend;
- int adapter, frontend;
-@@ -300,6 +301,7 @@
- cMutex mutex;
- cCondVar locked;
- cCondVar newSet;
-+ dvb_diseqc_master_cmd diseqc_cmd;
- cDvbTuner *bondedTuner;
- bool bondedMaster;
- bool bondedMasterFailed;
-@@ -325,12 +327,14 @@
- bool Locked(int TimeoutMs = 0);
- int GetSignalStrength(void) const;
- int GetSignalQuality(void) const;
-+ bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd);
- };
-
- cMutex cDvbTuner::bondMutex;
-
- cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend)
- {
-+ SendDiseqc=false;
- device = Device;
- fd_frontend = Fd_Frontend;
- adapter = Adapter;
-@@ -644,6 +648,18 @@
- return -1;
- }
-
-+bool cDvbTuner::SendDiseqcCmd(dvb_diseqc_master_cmd cmd)
-+{
-+ cMutexLock MutexLock(&mutex);
-+ if ((frontendType != SYS_DVBS && frontendType != SYS_DVBS2) || SendDiseqc)
-+ return false;
-+ diseqc_cmd=cmd;
-+ SendDiseqc=true;
-+ newSet.Broadcast();
-+ return true;
-+}
-+
-+
- static unsigned int FrequencyToHz(unsigned int f)
- {
- while (f && f < 1000000)
-@@ -857,6 +873,10 @@
- if (GetFrontendStatus(NewStatus))
- Status = NewStatus;
- cMutexLock MutexLock(&mutex);
-+ if (SendDiseqc) {
-+ CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &diseqc_cmd));
-+ SendDiseqc=false;
-+ }
- switch (tunerStatus) {
- case tsIdle:
- break;
-@@ -1509,6 +1529,11 @@
- return dvbTuner ? dvbTuner->Locked(TimeoutMs) : false;
- }
-
-+bool cDvbDevice::SendDiseqcCmd(dvb_diseqc_master_cmd cmd)
-+{
-+ return dvbTuner->SendDiseqcCmd(cmd);
-+}
-+
- void cDvbDevice::SetTransferModeForDolbyDigital(int Mode)
- {
- setTransferModeForDolbyDigital = Mode;
-Index: vdr/dvbdevice.h
-===================================================================
---- vdr.orig/dvbdevice.h 2012-01-15 21:07:03.000000000 +0100
-+++ vdr/dvbdevice.h 2012-01-15 21:14:13.000000000 +0100
-@@ -190,6 +190,7 @@
- virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
- public:
- virtual bool HasLock(int TimeoutMs = 0);
-+ virtual bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd);
-
- // PID handle facilities
-
diff --git a/debian/patches/opt-45_yaepg.patch b/debian/patches/opt-45_yaepg.patch
index 7f15da2..921417d 100644
--- a/debian/patches/opt-45_yaepg.patch
+++ b/debian/patches/opt-45_yaepg.patch
@@ -4,8 +4,8 @@ Origin: http://www.hoochvdr.info/yaepg/vdr-1.3.19-core-yaepg.diff
Index: vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c
===================================================================
---- vdr.orig/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2011-12-10 21:50:59.000000000 +0100
-+++ vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2011-12-11 02:29:56.000000000 +0100
+--- vdr.orig/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2012-01-15 21:47:17.000000000 +0100
++++ vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2012-01-15 21:47:22.000000000 +0100
@@ -77,6 +77,10 @@
Cmd(OSD_SetWindow, 0, i + 1);
Cmd(OSD_Close);
@@ -42,9 +42,9 @@ Index: vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c
}
Index: vdr/device.h
===================================================================
---- vdr.orig/device.h 2011-12-11 02:29:53.000000000 +0100
-+++ vdr/device.h 2011-12-11 02:29:56.000000000 +0100
-@@ -293,12 +293,12 @@
+--- vdr.orig/device.h 2012-01-15 21:47:17.000000000 +0100
++++ vdr/device.h 2012-01-15 21:47:22.000000000 +0100
+@@ -291,12 +291,12 @@
///< Direction (only the sign of Direction is evaluated, positive values
///< switch to higher channel numbers).
private:
@@ -61,8 +61,8 @@ Index: vdr/device.h
static void SetCurrentChannel(const cChannel *Channel) { currentChannel = Channel ? Channel->Number() : 0; }
Index: vdr/osd.c
===================================================================
---- vdr.orig/osd.c 2011-12-10 21:50:59.000000000 +0100
-+++ vdr/osd.c 2011-12-11 02:29:56.000000000 +0100
+--- vdr.orig/osd.c 2012-01-15 21:47:17.000000000 +0100
++++ vdr/osd.c 2012-01-15 21:47:22.000000000 +0100
@@ -1622,6 +1622,7 @@
}
}
@@ -73,8 +73,8 @@ Index: vdr/osd.c
cOsd::~cOsd()
Index: vdr/osd.h
===================================================================
---- vdr.orig/osd.h 2011-12-10 21:59:26.000000000 +0100
-+++ vdr/osd.h 2011-12-11 02:29:56.000000000 +0100
+--- vdr.orig/osd.h 2012-01-15 21:47:17.000000000 +0100
++++ vdr/osd.h 2012-01-15 21:47:22.000000000 +0100
@@ -921,6 +921,7 @@
///< MyOsdDrawPixmap(Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y(), pm->Data(), w, h, h * d);
///< delete pm;
diff --git a/debian/patches/series b/debian/patches/series
index 1533d98..5ab2c93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -51,9 +51,6 @@ opt-42-x_MainMenuHooks.patch
# (Requires opt-41-x_timer-info !)
opt-43-x_recordshowfree.patch
-# Patch needed for the rotor plugin.
-opt-44_rotor.patch
-
# Patch needed for the yaepg plugin.
opt-45_yaepg.patch
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list