[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.21-1_ctvdr3-19-g0495185
etobi
git at e-tobi.net
Mon Dec 12 21:27:25 UTC 2011
The following commit has been merged in the e-tobi branch:
commit a4e46d07b41ec61c51be5a62025e1fa45e693122
Author: etobi <git at e-tobi.net>
Date: Sat Dec 10 22:31:17 2011 +0100
Updated opt-39_noepg.dpatch and opt-44_rotor.dpatch
diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 8c6f78e..28c06de 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -1,8 +1,24 @@
-debian/patches/81_Make_config.dpatch:da281b9af48273bcbd19f3052ee993fd
+debian/patches/opt-43-x_recordshowfree.dpatch:66152f345b03259d28e89135cda42310
debian/patches/12_osdbase-maxitems.dpatch:e45d1b62f7d66c3e5d279e3561034107
debian/patches/11_sortrecordings.dpatch:9ed4cd1e144ee59dab34d4df4aa9af51
-debian/patches/04_newplugin.dpatch:e99f8d21734a19b3eb93d9e3f11b680a
+debian/patches/opt-50_graphtft.dpatch:f77f3d81b37e89c448dbb15c9e4f475d
debian/patches/16_channels.conf.terr-fix.dpatch:72595733d0b46aa4093a640708d19226
debian/patches/06_default_svdrp_port_0.dpatch:653e14e8ab093c456f9bbd8faa5e1ff7
-debian/patches/99_ncursesw-include.dpatch:90810d58108ff8d9afd768fec67be904
debian/patches/82_valgrind.dpatch:503ddba49c243fff798a36a1c12bb5ae
+debian/patches/opt-42-x_MainMenuHooks.dpatch:1c4c782b5c88c4f0408890a5f50b217b
+debian/patches/opt-44_rotor.dpatch:43c8707dac3db0702183c91d0e22874a
+debian/patches/opt-20_liemikuutio.dpatch:b1d074dc381527e29db4a5ad48c8fa07
+debian/patches/opt-21_internal-cam-devices.dpatch:7bbaad57abb1ae2995b85d9f1a1fd23f
+debian/patches/opt-41-x_timer-info.dpatch:04511ae02243eb1bab94f3f45b59e574
+debian/patches/opt-24_jumpplay.dpatch:f23cbe88f71917a25683b6f6c255fb2c
+debian/patches/opt-50_graphtft-liemikuutio.dpatch:f82320b9c64e17d06b5d0dbbddf50e8f
+debian/patches/opt-31-x_reelchannelscan.dpatch:f8c06ac51888248f68badcab8533c2be
+debian/patches/81_Make_config.dpatch:da281b9af48273bcbd19f3052ee993fd
+debian/patches/opt-37-x_menuorg.dpatch:9fb02cc8bd848add50b3866b6f476644
+debian/patches/opt-45_yaepg.dpatch:77fdabd83bdf4187d7040faaf1c758c7
+debian/patches/opt-27_ttxtsubs.dpatch:7b3188bebdbf83806320876c0884dd9b
+debian/patches/99_ncursesw-include.dpatch:90810d58108ff8d9afd768fec67be904
+debian/patches/opt-39_noepg.dpatch:677a1bae33d44a7501b0ccbc48005e14
+debian/patches/04_newplugin.dpatch:e99f8d21734a19b3eb93d9e3f11b680a
+debian/patches/opt-38_disableDoubleEpgEntrys.dpatch:7a09fa581f95613497b718b5c4a4a875
+debian/patches/opt-22-x_edit_marks.dpatch:9d604944f17114e3ac830aa80eff73ed
diff --git a/debian/.vdr-patches.multipatch b/debian/.vdr-patches.multipatch
index a808c3a..28c06de 100644
--- a/debian/.vdr-patches.multipatch
+++ b/debian/.vdr-patches.multipatch
@@ -6,8 +6,7 @@ debian/patches/16_channels.conf.terr-fix.dpatch:72595733d0b46aa4093a640708d19226
debian/patches/06_default_svdrp_port_0.dpatch:653e14e8ab093c456f9bbd8faa5e1ff7
debian/patches/82_valgrind.dpatch:503ddba49c243fff798a36a1c12bb5ae
debian/patches/opt-42-x_MainMenuHooks.dpatch:1c4c782b5c88c4f0408890a5f50b217b
-debian/patches/opt-44_rotor.dpatch:2dd7870c8fe357700ee962f68a1594c2
-debian/patches/99_dvbc-unitymedia-fix.dpatch:2c29f190fc8cb91204cba0f715863170
+debian/patches/opt-44_rotor.dpatch:43c8707dac3db0702183c91d0e22874a
debian/patches/opt-20_liemikuutio.dpatch:b1d074dc381527e29db4a5ad48c8fa07
debian/patches/opt-21_internal-cam-devices.dpatch:7bbaad57abb1ae2995b85d9f1a1fd23f
debian/patches/opt-41-x_timer-info.dpatch:04511ae02243eb1bab94f3f45b59e574
@@ -19,7 +18,7 @@ debian/patches/opt-37-x_menuorg.dpatch:9fb02cc8bd848add50b3866b6f476644
debian/patches/opt-45_yaepg.dpatch:77fdabd83bdf4187d7040faaf1c758c7
debian/patches/opt-27_ttxtsubs.dpatch:7b3188bebdbf83806320876c0884dd9b
debian/patches/99_ncursesw-include.dpatch:90810d58108ff8d9afd768fec67be904
-debian/patches/opt-39_noepg.dpatch:9f154a51a570bce2189056ea85b5ad91
+debian/patches/opt-39_noepg.dpatch:677a1bae33d44a7501b0ccbc48005e14
debian/patches/04_newplugin.dpatch:e99f8d21734a19b3eb93d9e3f11b680a
debian/patches/opt-38_disableDoubleEpgEntrys.dpatch:7a09fa581f95613497b718b5c4a4a875
debian/patches/opt-22-x_edit_marks.dpatch:9d604944f17114e3ac830aa80eff73ed
diff --git a/debian/changelog b/debian/changelog
index 8d98251..1a7e637 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ vdr (1.7.22-1~ctvdr1) unstable; urgency=low
* Dropped 99_dvbc-unitiymedia-fix.dpatch - fixed upstream
* Dropped multipatch patches - these are available in the etobi-branch
of the Git repository
+ * Updated opt-39_noepg.dpatch and opt-44_rotor.dpatch
-- Tobias Grimm <etobi at debian.org> Sat, 10 Dec 2011 21:51:31 +0100
diff --git a/debian/patches/00list b/debian/patches/00list
index 267f7f3..407327b 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -8,3 +8,61 @@
82_valgrind
99_ncursesw-include
+
+# Patch collection (replaces enAIO).
+opt-20_liemikuutio
+
+# Allows to tune to non-FTA channels provided by internal devices,
+# like streamdev
+opt-21_internal-cam-devices
+
+# Easy editing of cutting marks
+# (Requires opt-20_liemikuutio!)
+opt-22-x_edit_marks
+
+# The Jump patch allows automatic jumping over cutting marks.
+opt-24_jumpplay
+
+# Patch needed for the ttxtsubs plugin.
+opt-27_ttxtsubs
+
+# Speed up zapping channels.
+# opt-29_syncearly
+
+# Makes VDR aware of the reelchannelscan plugin
+opt-31-x_reelchannelscan
+
+# Patch that shows if there is a valid setup value left or right with < and >.
+# opt-35_setup-show-valid
+
+# Patch needed for the menuorg plugin.
+opt-37-x_menuorg
+
+# Patch that suppresses double EPG entries.
+opt-38_disableDoubleEpgEntrys
+
+# Patch to disable normal epg update for specified channels.
+opt-39_noepg
+
+# Patch to show an info, if it is possible to record an event in the timer-info.
+opt-41-x_timer-info
+
+# Patch to allow plugins to replace the VDR mainmenus
+opt-42-x_MainMenuHooks
+
+# Shows remaining recording capacity in recordings menu.
+# (Requires opt-41-x_timer-info !)
+opt-43-x_recordshowfree
+
+# Patch needed for the rotor plugin.
+opt-44_rotor
+
+# Patch needed for the yaepg plugin.
+opt-45_yaepg
+
+# Patch required for the GraphTFT plugin
+opt-50_graphtft
+opt-50_graphtft-liemikuutio
+
+# Setup for AC3 transfer, QAM_256, disable primary tuner
+# opt-53_dvbsetup
diff --git a/debian/patches/opt-39_noepg.dpatch b/debian/patches/opt-39_noepg.dpatch
index 9ab4afc..c8b242c 100644
--- a/debian/patches/opt-39_noepg.dpatch
+++ b/debian/patches/opt-39_noepg.dpatch
@@ -12,9 +12,9 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/config.c vdr/config.c
---- vdr~/config.c 2011-08-19 23:01:19.000000000 +0200
-+++ vdr/config.c 2011-08-19 23:03:55.000000000 +0200
-@@ -329,6 +329,8 @@
+--- vdr~/config.c 2011-12-10 22:22:38.000000000 +0100
++++ vdr/config.c 2011-12-10 22:25:38.000000000 +0100
+@@ -392,6 +392,8 @@
SetSystemTime = 0;
TimeSource = 0;
TimeTransponder = 0;
@@ -23,8 +23,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
MarginStart = 2;
MarginStop = 10;
AudioLanguages[0] = -1;
-@@ -414,10 +416,17 @@
- MenuCmdPosition = 0;
+@@ -473,11 +475,18 @@
+ EmergencyExit = 1;
}
+cSetup::~cSetup()
@@ -36,12 +36,13 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
{
memcpy(&__BeginData__, &s.__BeginData__, (char *)&s.__EndData__ - (char *)&s.__BeginData__);
InitialChannel = s.InitialChannel;
+ DeviceBondings = s.DeviceBondings;
+ free(noEPGList);
+ noEPGList = strdup(s.noEPGList);
return *this;
}
-@@ -534,6 +543,11 @@
+@@ -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);
@@ -53,7 +54,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
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);
-@@ -643,6 +657,8 @@
+@@ -699,6 +713,8 @@
Store("SetSystemTime", SetSystemTime);
Store("TimeSource", cSource::ToString(TimeSource));
Store("TimeTransponder", TimeTransponder);
@@ -63,9 +64,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
Store("MarginStop", MarginStop);
StoreLanguages("AudioLanguages", AudioLanguages);
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/config.h vdr/config.h
---- vdr~/config.h 2011-08-19 23:01:19.000000000 +0200
-+++ vdr/config.h 2011-08-19 23:02:39.000000000 +0200
-@@ -236,6 +236,7 @@
+--- vdr~/config.h 2011-12-10 22:22:38.000000000 +0100
++++ vdr/config.h 2011-12-10 22:24:42.000000000 +0100
+@@ -255,6 +255,7 @@
int SetSystemTime;
int TimeSource;
int TimeTransponder;
@@ -73,10 +74,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
int MarginStart, MarginStop;
int AudioLanguages[I18N_MAX_LANGUAGES + 1];
int DisplaySubtitles;
-@@ -305,7 +306,9 @@
- int ShowRecDate, ShowRecTime, ShowRecLength, ShowProgressBar, MenuCmdPosition;
+@@ -324,7 +325,9 @@
int __EndData__;
cString InitialChannel;
+ cString DeviceBondings;
+ char *noEPGList; // pointer not to be flat-copied
cSetup(void);
+ ~cSetup();
@@ -84,8 +85,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
bool Load(const char *FileName);
bool Save(void);
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/eit.c vdr/eit.c
---- vdr~/eit.c 2011-08-19 23:01:19.000000000 +0200
-+++ vdr/eit.c 2011-08-19 23:01:20.000000000 +0200
+--- vdr~/eit.c 2011-12-10 22:22:38.000000000 +0100
++++ vdr/eit.c 2011-12-10 22:22:38.000000000 +0100
@@ -24,8 +24,28 @@
class cEIT : public SI::EIT {
public:
@@ -129,9 +130,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
bool Empty = true;
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/menu.c vdr/menu.c
---- vdr~/menu.c 2011-08-19 23:01:19.000000000 +0200
-+++ vdr/menu.c 2011-08-19 23:01:20.000000000 +0200
-@@ -2851,6 +2851,7 @@
+--- vdr~/menu.c 2011-12-10 22:22:38.000000000 +0100
++++ vdr/menu.c 2011-12-10 22:22:38.000000000 +0100
+@@ -2810,6 +2810,7 @@
class cMenuSetupEPG : public cMenuSetupBase {
private:
@@ -139,7 +140,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
int originalNumLanguages;
int numLanguages;
void Setup(void);
-@@ -2873,6 +2874,9 @@
+@@ -2832,6 +2833,9 @@
{
int current = Current();
@@ -149,7 +150,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
Clear();
Add(new cMenuEditIntItem( tr("Setup.EPG$EPG scan timeout (h)"), &data.EPGScanTimeout));
-@@ -2882,6 +2886,7 @@
+@@ -2840,6 +2844,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));
diff --git a/debian/patches/opt-44_rotor.dpatch b/debian/patches/opt-44_rotor.dpatch
index 5105025..21d1e58 100644
--- a/debian/patches/opt-44_rotor.dpatch
+++ b/debian/patches/opt-44_rotor.dpatch
@@ -14,8 +14,8 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/device.h vdr/device.h
---- vdr~/device.h 2011-08-19 23:05:56.000000000 +0200
-+++ vdr/device.h 2011-08-19 23:05:56.000000000 +0200
+--- vdr~/device.h 2011-12-10 22:26:30.000000000 +0100
++++ vdr/device.h 2011-12-10 22:26:30.000000000 +0100
@@ -24,6 +24,8 @@
#include "spu.h"
#include "thread.h"
@@ -25,7 +25,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
#define MAXDEVICES 16 // the maximum number of devices in the system
#define MAXPIDHANDLES 64 // the maximum number of different PIDs per device
-@@ -305,6 +307,7 @@
+@@ -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.
@@ -34,38 +34,40 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
// PID handle facilities
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/dvbdevice.c vdr/dvbdevice.c
---- vdr~/dvbdevice.c 2011-06-19 19:27:39.000000000 +0200
-+++ vdr/dvbdevice.c 2011-08-19 23:08:31.000000000 +0200
-@@ -258,6 +258,7 @@
- class cDvbTuner : public cThread {
+--- vdr~/dvbdevice.c 2011-12-10 21:59:26.000000000 +0100
++++ vdr/dvbdevice.c 2011-12-10 22:28:03.000000000 +0100
+@@ -261,6 +261,7 @@
private:
+ static cMutex bondMutex;
enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
+ bool SendDiseqc;
- int device;
+ const cDvbDevice *device;
int fd_frontend;
int adapter, frontend;
-@@ -272,6 +273,7 @@
+@@ -276,6 +277,7 @@
cMutex mutex;
cCondVar locked;
cCondVar newSet;
+ dvb_diseqc_master_cmd diseqc_cmd;
- void ClearEventQueue(void) const;
- bool GetFrontendStatus(fe_status_t &Status) const;
- bool SetFrontend(void);
-@@ -286,10 +288,12 @@
+ cDvbTuner *bondedTuner;
+ bool bondedMaster;
+ bool bondedMasterFailed;
+@@ -300,12 +302,14 @@
bool Locked(int TimeoutMs = 0);
int GetSignalStrength(void) const;
int GetSignalQuality(void) const;
+ bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd);
};
- cDvbTuner::cDvbTuner(int Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType)
+ cMutex cDvbTuner::bondMutex;
+
+ cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType)
{
+ SendDiseqc=false;
device = Device;
fd_frontend = Fd_Frontend;
adapter = Adapter;
-@@ -475,6 +479,18 @@
+@@ -625,6 +629,18 @@
return -1;
}
@@ -84,7 +86,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
static unsigned int FrequencyToHz(unsigned int f)
{
while (f && f < 1000000)
-@@ -647,6 +663,10 @@
+@@ -813,6 +829,10 @@
if (GetFrontendStatus(NewStatus))
Status = NewStatus;
cMutexLock MutexLock(&mutex);
@@ -95,7 +97,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
switch (tunerStatus) {
case tsIdle:
break;
-@@ -1118,6 +1138,11 @@
+@@ -1415,6 +1435,11 @@
return dvbTuner ? dvbTuner->Locked(TimeoutMs) : false;
}
@@ -108,9 +110,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
{
setTransferModeForDolbyDigital = Mode;
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/dvbdevice.h vdr/dvbdevice.h
---- vdr~/dvbdevice.h 2011-06-19 19:27:39.000000000 +0200
-+++ vdr/dvbdevice.h 2011-08-19 23:05:56.000000000 +0200
-@@ -149,6 +149,7 @@
+--- vdr~/dvbdevice.h 2011-12-10 21:59:26.000000000 +0100
++++ vdr/dvbdevice.h 2011-12-10 22:26:30.000000000 +0100
+@@ -181,6 +181,7 @@
virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
public:
virtual bool HasLock(int TimeoutMs = 0);
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list