r8429 - in /vdr/vdr/trunk/debian: ./ patches/
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Thu Mar 4 23:05:20 UTC 2010
Author: tom-guest
Date: Thu Mar 4 23:05:19 2010
New Revision: 8429
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8429
Log:
* Added opt-22-x_edit_marks.dpatch
* Adapted opt-48-x_pin.dpatch to vdr-workaround-broken-sys-capability patch
* Updated opt-52_hard_link_cutter.dpatch to version 0.2.2 (fixes gcc 4.4 issue)
* Added include links via debian/vdr-dev.links to make the include structure
compatible to vdr standards
* Added -p to bash shebang line of init script, because this is needed,
if VDR calls the init script itself via a suid wrapper
* Added linux-libc-dev to Depends of package vdr-dev (linux/dvb/*.h included
in header files, e.g. device.h)
Added:
vdr/vdr/trunk/debian/patches/opt-22-x_edit_marks.dpatch
vdr/vdr/trunk/debian/vdr-dev.links
Modified:
vdr/vdr/trunk/debian/.vdr-patches.multipatch
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/control
vdr/vdr/trunk/debian/extract-patchinfo (props changed)
vdr/vdr/trunk/debian/patches/00list
vdr/vdr/trunk/debian/patches/00list.multipatch
vdr/vdr/trunk/debian/patches/opt-48-x_pin.dpatch
vdr/vdr/trunk/debian/patches/opt-52_hard_link_cutter.dpatch
vdr/vdr/trunk/debian/vdr.init
vdr/vdr/trunk/debian/vdrleaktest (props changed)
Modified: vdr/vdr/trunk/debian/.vdr-patches.multipatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/.vdr-patches.multipatch?rev=8429&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/.vdr-patches.multipatch (original)
+++ vdr/vdr/trunk/debian/.vdr-patches.multipatch Thu Mar 4 23:05:19 2010
@@ -1,4 +1,4 @@
-debian/patches/opt-52_hard_link_cutter.dpatch:2a82f643d53300c33da530935c8016a4
+debian/patches/opt-52_hard_link_cutter.dpatch:898b721991e948611ba0402af2f163a5
debian/patches/opt-43-x_recordshowfree.dpatch:66152f345b03259d28e89135cda42310
debian/patches/12_osdbase-maxitems.dpatch:e45d1b62f7d66c3e5d279e3561034107
debian/patches/11_sortrecordings.dpatch:9ed4cd1e144ee59dab34d4df4aa9af51
@@ -6,18 +6,19 @@
debian/patches/opt-50_graphtft.dpatch:aeba283cc500591fa0b6d112c063fadf
debian/patches/16_channels.conf.terr-fix.dpatch:72595733d0b46aa4093a640708d19226
debian/patches/06_default_svdrp_port_0.dpatch:b49237a9ee246acfa01ee7ec92ad0a52
-debian/patches/18_vdr-maintenance-1.6.0-2.dpatch:ffe53a24b2c592c18dd08b31d35fd655
+debian/patches/18_vdr-maintenance-1.6.0-2.dpatch:703dc617afcbf87cde443ed0df4642da
debian/patches/82_valgrind.dpatch:46960921b989f2f4dab829a51622ed85
debian/patches/opt-42-x_MainMenuHooks.dpatch:1c4c782b5c88c4f0408890a5f50b217b
debian/patches/opt-44_rotor.dpatch:bbcc27512e0a0b610efadcde8fa67d02
+debian/patches/opt-41-x_timer-info.dpatch:92ee6cdf60b795d9fbcf4fdcafe401b4
debian/patches/opt-20_liemikuutio.dpatch:b75777c886ae836a8d499a0628ae091f
debian/patches/10_dd-record-option.dpatch:58c3a3dbcd9a3ec4b0ee1814f71d1e88
debian/patches/opt-21_internal-cam-devices.dpatch:a883c0b09e67b679436b7df1e9807fc8
debian/patches/09_sort_options.dpatch:3b561fcd7645b216b4dab989d7786fda
-debian/patches/opt-41-x_timer-info.dpatch:92ee6cdf60b795d9fbcf4fdcafe401b4
+debian/patches/99_vdr-workaround-broken-sys-capability.dpatch:19d9edf94b745d972761cbcec9f442f2
debian/patches/opt-24_jumpplay.dpatch:1ff8f1a90e02b11a42218ffba18b5f26
debian/patches/opt-30-x_analogtv.dpatch:3789ff68d9dc9a2482f78519634b27b6
-debian/patches/17_vdr-maintenance-1.6.0-1.dpatch:3a2ff2c6d3b13489c19eda4e32f2537c
+debian/patches/17_vdr-maintenance-1.6.0-1.dpatch:386821878ee431af1b104a2f3a4f3746
debian/patches/03_cmdsubmenu.dpatch:abff754a3d760764796f06cdf1cf5105
debian/patches/19_dvb-api-v5.dpatch:6714266c10537521d2440cfa4d50b3f0
debian/patches/opt-28_audioindexer.dpatch:eab872310fd03a175b3b93a90d22d5db
@@ -26,9 +27,8 @@
debian/patches/opt-51_cuttime.dpatch:cfbf0a7934f109148fef4e385c3eb465
debian/patches/20_gcc44_ftbfs.dpatch:310f84b8c27541f3ecec0ce416c21a73
debian/patches/opt-40_pluginparam.dpatch:9dc3baf2532c9df6e715f0d6c9f7df06
-debian/patches/99_dvb-header-fixes.dpatch:ef5dae99f9ce2566d72a393c84e66741
debian/patches/14_cap-memsize.dpatch:7beb9bcecb1bdce4a03c1729acfbbdb3
-debian/patches/opt-48-x_pin.dpatch:5e8f7e1b1ad5ed8ac51736d2aed02f9c
+debian/patches/opt-48-x_pin.dpatch:77abed7c39fda93fbcdb7140d49f9566
debian/patches/opt-47_sourcecaps.dpatch:626ed6d141802b9cae8c4b6cab97311e
debian/patches/opt-37-x_menuorg.dpatch:9fb02cc8bd848add50b3866b6f476644
debian/patches/opt-45_yaepg.dpatch:351c08a687755050e1140766b56dc27b
Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=8429&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Thu Mar 4 23:05:19 2010
@@ -1,3 +1,17 @@
+vdr (1.6.0-16) UNRELEASED; urgency=low
+
+ * Added opt-22-x_edit_marks.dpatch
+ * Adapted opt-48-x_pin.dpatch to vdr-workaround-broken-sys-capability patch
+ * Updated opt-52_hard_link_cutter.dpatch to version 0.2.2 (fixes gcc 4.4 issue)
+ * Added include links via debian/vdr-dev.links to make the include structure
+ compatible to vdr standards
+ * Added -p to bash shebang line of init script, because this is needed,
+ if VDR calls the init script itself via a suid wrapper
+ * Added linux-libc-dev to Depends of package vdr-dev (linux/dvb/*.h included
+ in header files, e.g. device.h)
+
+ -- Thomas Günther <tom at toms-cafe.de> Fri, 05 Mar 2010 00:02:54 +0100
+
vdr (1.6.0-15) unstable; urgency=low
* Standards-Version: 3.8.4
Modified: vdr/vdr/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/control?rev=8429&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/control (original)
+++ vdr/vdr/trunk/debian/control Thu Mar 4 23:05:19 2010
@@ -34,7 +34,7 @@
Package: vdr-dev
Architecture: all
-Depends: ${misc:Depends}, debhelper
+Depends: ${misc:Depends}, debhelper, linux-libc-dev
Suggests: dh-make
Description: Video Disk Recorder for DVB cards
Video Disk Recorder (VDR) is a digital sat-receiver program using
Propchange: vdr/vdr/trunk/debian/extract-patchinfo
('svn:executable' removed)
Modified: vdr/vdr/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/00list?rev=8429&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/00list (original)
+++ vdr/vdr/trunk/debian/patches/00list Thu Mar 4 23:05:19 2010
@@ -25,6 +25,10 @@
# 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
Modified: vdr/vdr/trunk/debian/patches/00list.multipatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/00list.multipatch?rev=8429&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/00list.multipatch (original)
+++ vdr/vdr/trunk/debian/patches/00list.multipatch Thu Mar 4 23:05:19 2010
@@ -25,6 +25,10 @@
# 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
Added: vdr/vdr/trunk/debian/patches/opt-22-x_edit_marks.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/opt-22-x_edit_marks.dpatch?rev=8429&op=file
==============================================================================
--- vdr/vdr/trunk/debian/patches/opt-22-x_edit_marks.dpatch (added)
+++ vdr/vdr/trunk/debian/patches/opt-22-x_edit_marks.dpatch Thu Mar 4 23:05:19 2010
@@ -1,0 +1,72 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## opt-22-x_edit_marks.dpatch by FrankJepsen at vdrportal.de
+## http://www.jepsennet.de/vdr/download/opt-22-x_edit_marks.dpatch
+##
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch adds keys '1', '3' in replay mode to move marks by +/-5secs.
+## DP: When in replay mode key '0' sets a mark and stops there.
+## DP: 'Green' and 'Yellow' act as 'Prev' and 'Next'.
+ at DPATCH@
+diff -u vdr-1.6.0p/menu.c vdr-1.6.0n/menu.c
+--- vdr-1.6.0p/menu.c 2010-01-15 12:55:13.000000000 +0100
++++ vdr-1.6.0n/menu.c 2010-01-15 13:17:01.000000000 +0100
+@@ -5078,10 +5078,6 @@
+ case kGreen: SkipSeconds(-60); break;
+ case kYellow|k_Repeat:
+ case kYellow: SkipSeconds( 60); break;
+- case k1|k_Repeat:
+- case k1: SkipSeconds(-20); break;
+- case k3|k_Repeat:
+- case k3: SkipSeconds( 20); break;
+ case kPrev|k_Repeat:
+ case kPrev: if (lastSkipTimeout.TimedOut()) {
+ lastSkipSeconds = REPLAYCONTROLSKIPSECONDS;
+@@ -5109,10 +5105,46 @@
+ Stop();
+ return osEnd;
+ default: {
++ bool play, forward;
++ int speed;
++ int Current, Total;
++ cMark *m;
++
+ DoShowMode = false;
+ switch (Key) {
+ // Editing:
+- case kMarkToggle: MarkToggle(); break;
++ case k1|k_Repeat:
++ case k1: if (GetReplayMode(play, forward, speed) && !play && GetIndex(Current, Total) && (m = marks.Get(Current)) != NULL) {
++ displayFrames = true;
++ int p = SkipFrames(-5 * FRAMESPERSEC);
++ cMark *m2;
++ if ((m2 = marks.Prev(m)) != NULL && m2->position >= p)
++ break;
++ Goto(m->position = p, true);
++ marks.Save();
++ }
++ else
++ SkipSeconds(-20);
++ break;
++ case k3|k_Repeat:
++ case k3: if (GetReplayMode(play, forward, speed) && !play && GetIndex(Current, Total) && (m = marks.Get(Current)) != NULL) {
++ displayFrames = true;
++ int p = SkipFrames(5 * FRAMESPERSEC);
++ cMark *m2;
++ if ((m2 = marks.Next(m)) != NULL && m2->position <= p)
++ break;
++ Goto(m->position = p, true);
++ marks.Save();
++ }
++ else
++ SkipSeconds(20);
++ break;
++ case kMarkToggle: if (GetReplayMode(play, forward, speed) && play) {
++ displayFrames = true;
++ Pause();
++ }
++ MarkToggle();
++ break;
+ case kMarkJumpBack|k_Repeat:
+ case kMarkJumpBack: MarkJump(false); break;
+ case kMarkJumpForward|k_Repeat:
Modified: vdr/vdr/trunk/debian/patches/opt-48-x_pin.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/opt-48-x_pin.dpatch?rev=8429&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/opt-48-x_pin.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/opt-48-x_pin.dpatch Thu Mar 4 23:05:19 2010
@@ -13,8 +13,8 @@
@DPATCH@
diff -urNad vdr-1.6.0~/Makefile vdr-1.6.0/Makefile
---- vdr-1.6.0~/Makefile 2008-05-11 01:08:05.000000000 +0200
-+++ vdr-1.6.0/Makefile 2008-05-11 01:08:06.000000000 +0200
+--- vdr-1.6.0~/Makefile 2010-01-14 01:40:15.000000000 +0100
++++ vdr-1.6.0/Makefile 2010-01-14 01:40:15.000000000 +0100
@@ -45,6 +45,8 @@
OBJS += vdrttxtsubshooks.o
@@ -26,7 +26,7 @@
endif
diff -urNad vdr-1.6.0~/childlock.c vdr-1.6.0/childlock.c
--- vdr-1.6.0~/childlock.c 1970-01-01 01:00:00.000000000 +0100
-+++ vdr-1.6.0/childlock.c 2008-05-11 01:08:06.000000000 +0200
++++ vdr-1.6.0/childlock.c 2010-01-14 01:40:15.000000000 +0100
@@ -0,0 +1,166 @@
+#include "childlock.h"
+#include "childlockservice.h"
@@ -196,7 +196,7 @@
+}
diff -urNad vdr-1.6.0~/childlock.h vdr-1.6.0/childlock.h
--- vdr-1.6.0~/childlock.h 1970-01-01 01:00:00.000000000 +0100
-+++ vdr-1.6.0/childlock.h 2008-05-11 01:08:06.000000000 +0200
++++ vdr-1.6.0/childlock.h 2010-01-14 01:40:15.000000000 +0100
@@ -0,0 +1,47 @@
+#ifndef __CHILDLOCK_H
+#define __CHILDLOCK_H
@@ -247,7 +247,7 @@
+#endif
diff -urNad vdr-1.6.0~/childlockservice.h vdr-1.6.0/childlockservice.h
--- vdr-1.6.0~/childlockservice.h 1970-01-01 01:00:00.000000000 +0100
-+++ vdr-1.6.0/childlockservice.h 2008-05-11 01:08:06.000000000 +0200
++++ vdr-1.6.0/childlockservice.h 2010-01-14 01:40:15.000000000 +0100
@@ -0,0 +1,46 @@
+#ifndef __CHILDLOCKSERVICE_H
+#define __CHILDLOCKSERVICE_H
@@ -296,8 +296,8 @@
+};
+#endif
diff -urNad vdr-1.6.0~/device.c vdr-1.6.0/device.c
---- vdr-1.6.0~/device.c 2008-05-11 01:08:05.000000000 +0200
-+++ vdr-1.6.0/device.c 2008-05-11 01:08:06.000000000 +0200
+--- vdr-1.6.0~/device.c 2010-01-14 01:40:15.000000000 +0100
++++ vdr-1.6.0/device.c 2010-01-14 01:40:15.000000000 +0100
@@ -18,6 +18,7 @@
#include "receiver.h"
#include "status.h"
@@ -306,7 +306,7 @@
// --- cLiveSubtitle ---------------------------------------------------------
-@@ -766,6 +767,7 @@
+@@ -769,6 +770,7 @@
cChannel *channel;
while ((channel = Channels.GetByNumber(n, Direction)) != NULL) {
// try only channels which are currently available
@@ -314,7 +314,7 @@
if (GetDevice(channel, 0, true))
break;
n = channel->Number() + Direction;
-@@ -787,6 +789,9 @@
+@@ -790,6 +792,9 @@
eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
{
@@ -325,8 +325,8 @@
StopReplay();
DELETENULL(liveSubtitle);
diff -urNad vdr-1.6.0~/menu.c vdr-1.6.0/menu.c
---- vdr-1.6.0~/menu.c 2008-05-11 01:08:05.000000000 +0200
-+++ vdr-1.6.0/menu.c 2008-05-11 01:09:10.000000000 +0200
+--- vdr-1.6.0~/menu.c 2010-01-14 01:40:15.000000000 +0100
++++ vdr-1.6.0/menu.c 2010-01-14 01:40:15.000000000 +0100
@@ -32,6 +32,7 @@
#include "vdrttxtsubshooks.h"
#include "videodir.h"
@@ -345,7 +345,7 @@
char* p = strrchr(data.file, '~');
if (p) {
p++;
-@@ -2344,7 +2348,8 @@
+@@ -2342,7 +2346,8 @@
for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
if (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == '~')) {
cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
@@ -355,7 +355,7 @@
Add(Item);
LastItem = Item;
free(LastItemText);
-@@ -2407,6 +2412,9 @@
+@@ -2405,6 +2410,9 @@
{
cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
if (ri) {
@@ -365,7 +365,7 @@
if (ri->IsDirectory())
Open();
else {
-@@ -3439,6 +3447,8 @@
+@@ -3437,6 +3445,8 @@
}
else if ((*i)->IsPluginItem()) {
const char *item = (*i)->PluginMenuEntry();
@@ -374,7 +374,7 @@
if (item)
osdItem = new cMenuPluginItem(hk(item), (*i)->PluginIndex());
}
-@@ -3453,9 +3463,13 @@
+@@ -3451,9 +3461,13 @@
// Basic menu items:
@@ -388,7 +388,7 @@
Add(new cOsdItem(hk(tr("Recordings")), osRecordings));
// Plugins:
-@@ -3463,18 +3477,22 @@
+@@ -3461,18 +3475,22 @@
for (int i = 0; ; i++) {
cPlugin *p = cPluginManager::GetPlugin(i);
if (p) {
@@ -411,7 +411,7 @@
Add(new cOsdItem(hk(tr("Commands")), osCommands));
}
-@@ -3555,6 +3573,11 @@
+@@ -3553,6 +3571,11 @@
eOSState state = cOsdMenu::ProcessKey(Key);
HadSubMenu |= HasSubMenu();
@@ -423,7 +423,7 @@
cOsdMenu *menu = NULL;
switch (state) {
case osSchedule:
-@@ -3601,6 +3624,7 @@
+@@ -3599,6 +3622,7 @@
if (item) {
cPlugin *p = cPluginManager::GetPlugin(item->PluginIndex());
if (p) {
@@ -431,7 +431,7 @@
cOsdObject *menu = p->MainMenuAction();
if (menu) {
if (menu->IsMenu())
-@@ -3612,6 +3636,7 @@
+@@ -3610,6 +3634,7 @@
}
}
}
@@ -439,7 +439,7 @@
state = osEnd;
}
break;
-@@ -3814,6 +3839,7 @@
+@@ -3812,6 +3837,7 @@
if (Direction) {
while (Channel) {
Channel = Direction > 0 ? Channels.Next(Channel) : Channels.Prev(Channel);
@@ -447,7 +447,7 @@
if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, 0, true))
return Channel;
}
-@@ -4448,6 +4474,7 @@
+@@ -4446,6 +4472,7 @@
for (int i = 0; i < MAXRECORDCONTROLS; i++) {
if (!RecordControls[i]) {
RecordControls[i] = new cRecordControl(device, Timer, Pause);
@@ -456,8 +456,8 @@
}
}
diff -urNad vdr-1.6.0~/po/de_DE.po vdr-1.6.0/po/de_DE.po
---- vdr-1.6.0~/po/de_DE.po 2008-05-11 01:08:05.000000000 +0200
-+++ vdr-1.6.0/po/de_DE.po 2008-05-11 01:08:06.000000000 +0200
+--- vdr-1.6.0~/po/de_DE.po 2010-01-14 01:40:15.000000000 +0100
++++ vdr-1.6.0/po/de_DE.po 2010-01-14 01:40:15.000000000 +0100
@@ -360,6 +360,9 @@
msgid "Lifetime"
msgstr "Lebensdauer"
@@ -469,8 +469,8 @@
msgstr "Datei"
diff -urNad vdr-1.6.0~/po/fr_FR.po vdr-1.6.0/po/fr_FR.po
---- vdr-1.6.0~/po/fr_FR.po 2008-05-11 01:08:05.000000000 +0200
-+++ vdr-1.6.0/po/fr_FR.po 2008-05-11 01:08:06.000000000 +0200
+--- vdr-1.6.0~/po/fr_FR.po 2010-01-14 01:40:15.000000000 +0100
++++ vdr-1.6.0/po/fr_FR.po 2010-01-14 01:40:15.000000000 +0100
@@ -366,6 +366,9 @@
msgid "Lifetime"
msgstr "Durée de vie"
@@ -482,8 +482,8 @@
msgstr "Fichier"
diff -urNad vdr-1.6.0~/timers.c vdr-1.6.0/timers.c
---- vdr-1.6.0~/timers.c 2008-05-11 01:08:05.000000000 +0200
-+++ vdr-1.6.0/timers.c 2008-05-11 01:08:06.000000000 +0200
+--- vdr-1.6.0~/timers.c 2010-01-14 01:40:15.000000000 +0100
++++ vdr-1.6.0/timers.c 2010-01-14 01:40:15.000000000 +0100
@@ -16,6 +16,7 @@
#include "recording.h"
#include "remote.h"
@@ -573,7 +573,7 @@
void cTimer::ClrFlags(uint Flags)
diff -urNad vdr-1.6.0~/timers.h vdr-1.6.0/timers.h
--- vdr-1.6.0~/timers.h 2008-02-16 15:33:23.000000000 +0100
-+++ vdr-1.6.0/timers.h 2008-05-11 01:08:06.000000000 +0200
++++ vdr-1.6.0/timers.h 2010-01-14 01:40:15.000000000 +0100
@@ -20,6 +20,7 @@
tfInstant = 0x0002,
tfVps = 0x0004,
@@ -583,17 +583,17 @@
};
enum eTimerMatch { tmNone, tmPartial, tmFull };
diff -urNad vdr-1.6.0~/vdr.c vdr-1.6.0/vdr.c
---- vdr-1.6.0~/vdr.c 2008-05-11 01:08:05.000000000 +0200
-+++ vdr-1.6.0/vdr.c 2008-05-11 01:08:06.000000000 +0200
-@@ -64,6 +64,7 @@
- #include "tools.h"
- #include "transfer.h"
- #include "videodir.h"
+--- vdr-1.6.0~/vdr.c 2010-01-14 01:40:15.000000000 +0100
++++ vdr-1.6.0/vdr.c 2010-01-14 01:40:50.000000000 +0100
+@@ -66,6 +66,7 @@
+ // include this one last due to some versions of it being buggy:
+ // http://www.linuxtv.org/pipermail/vdr/2009-August/021194.html
+ #include <sys/capability.h>
+#include "childlock.h"
#define MINCHANNELWAIT 10 // seconds to wait between failed channel switchings
#define ACTIVITYTIMEOUT 60 // seconds before starting housekeeping
-@@ -923,6 +924,7 @@
+@@ -924,6 +925,7 @@
cOsdObject *Interact = Menu ? Menu : cControl::Control();
eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse());
if (ISREALKEY(key)) {
@@ -601,7 +601,7 @@
EITScanner.Activity();
// Cancel shutdown countdown:
if (ShutdownHandler.countdown)
-@@ -995,10 +997,12 @@
+@@ -996,10 +998,12 @@
cControl::Control()->Hide();
cPlugin *plugin = cPluginManager::GetPlugin(PluginName);
if (plugin) {
@@ -614,7 +614,7 @@
else
esyslog("ERROR: unknown plugin '%s'", PluginName);
}
-@@ -1208,9 +1212,11 @@
+@@ -1209,9 +1213,11 @@
// Instant resume of the last viewed recording:
case kPlay:
if (cReplayControl::LastReplayed()) {
Modified: vdr/vdr/trunk/debian/patches/opt-52_hard_link_cutter.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/opt-52_hard_link_cutter.dpatch?rev=8429&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/opt-52_hard_link_cutter.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/opt-52_hard_link_cutter.dpatch Thu Mar 4 23:05:19 2010
@@ -2,7 +2,7 @@
## opt-52_hard_link_cutter.dpatch by Udo Richter <udo_richter at gmx.de>
## http://www.udo-richter.de/vdr/patches.en.html#hlcutter
##
-## This is version 0.2.0 of the patch
+## This is version 0.2.2 of the patch
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: The hard link cutter patch changes the recording editing algorithms
@@ -12,7 +12,7 @@
@DPATCH@
diff -urNad vdr-1.6.0~/README-HLCUTTER vdr-1.6.0/README-HLCUTTER
--- vdr-1.6.0~/README-HLCUTTER 1970-01-01 01:00:00.000000000 +0100
-+++ vdr-1.6.0/README-HLCUTTER 2008-05-11 12:13:51.000000000 +0200
++++ vdr-1.6.0/README-HLCUTTER 2009-11-28 12:09:29.000000000 +0100
@@ -0,0 +1,117 @@
+
+ VDR-HLCUTTER README
@@ -132,8 +132,8 @@
+
+SetBrokenLink may get lost on rare cases, this needs some more thoughts.
diff -urNad vdr-1.6.0~/config.c vdr-1.6.0/config.c
---- vdr-1.6.0~/config.c 2008-05-11 12:13:51.000000000 +0200
-+++ vdr-1.6.0/config.c 2008-05-11 12:13:51.000000000 +0200
+--- vdr-1.6.0~/config.c 2009-11-28 12:09:25.000000000 +0100
++++ vdr-1.6.0/config.c 2009-11-28 12:09:29.000000000 +0100
@@ -321,7 +321,9 @@
FontSmlSize = 18;
FontFixSize = 20;
@@ -165,8 +165,8 @@
Store("MinUserInactivity", MinUserInactivity);
Store("NextWakeupTime", NextWakeupTime);
diff -urNad vdr-1.6.0~/config.h vdr-1.6.0/config.h
---- vdr-1.6.0~/config.h 2008-05-11 12:13:51.000000000 +0200
-+++ vdr-1.6.0/config.h 2008-05-11 12:13:51.000000000 +0200
+--- vdr-1.6.0~/config.h 2009-11-28 12:09:25.000000000 +0100
++++ vdr-1.6.0/config.h 2009-11-28 12:09:29.000000000 +0100
@@ -293,7 +293,9 @@
int FontFixSize;
int noEPGMode;
@@ -178,8 +178,8 @@
time_t NextWakeupTime;
int MultiSpeedMode;
diff -urNad vdr-1.6.0~/cutter.c vdr-1.6.0/cutter.c
---- vdr-1.6.0~/cutter.c 2008-05-11 12:13:51.000000000 +0200
-+++ vdr-1.6.0/cutter.c 2008-05-11 12:13:51.000000000 +0200
+--- vdr-1.6.0~/cutter.c 2009-11-28 12:09:25.000000000 +0100
++++ vdr-1.6.0/cutter.c 2009-11-28 12:09:28.000000000 +0100
@@ -71,6 +71,7 @@
Mark = fromMarks.Next(Mark);
int FileSize = 0;
@@ -333,9 +333,9 @@
}
Recordings.TouchUpdate();
diff -urNad vdr-1.6.0~/menu.c vdr-1.6.0/menu.c
---- vdr-1.6.0~/menu.c 2008-05-11 12:13:51.000000000 +0200
-+++ vdr-1.6.0/menu.c 2008-05-11 12:16:21.000000000 +0200
-@@ -3187,7 +3187,9 @@
+--- vdr-1.6.0~/menu.c 2009-11-28 12:09:25.000000000 +0100
++++ vdr-1.6.0/menu.c 2009-11-28 12:10:21.000000000 +0100
+@@ -3185,7 +3185,9 @@
Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"), data.NameInstantRecord, sizeof(data.NameInstantRecord)));
Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"), &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
@@ -346,8 +346,8 @@
Add(new cMenuEditBoolItem(tr("Setup.Recording$Show time"), &data.ShowRecTime));
Add(new cMenuEditBoolItem(tr("Setup.Recording$Show length"), &data.ShowRecLength));
diff -urNad vdr-1.6.0~/recorder.c vdr-1.6.0/recorder.c
---- vdr-1.6.0~/recorder.c 2008-05-11 12:13:50.000000000 +0200
-+++ vdr-1.6.0/recorder.c 2008-05-11 12:13:51.000000000 +0200
+--- vdr-1.6.0~/recorder.c 2009-11-28 12:09:25.000000000 +0100
++++ vdr-1.6.0/recorder.c 2009-11-28 12:09:29.000000000 +0100
@@ -90,7 +90,7 @@
bool cFileWriter::NextFile(void)
{
@@ -358,9 +358,9 @@
fileSize = 0;
}
diff -urNad vdr-1.6.0~/recording.c vdr-1.6.0/recording.c
---- vdr-1.6.0~/recording.c 2008-05-11 12:13:51.000000000 +0200
-+++ vdr-1.6.0/recording.c 2008-05-11 12:13:51.000000000 +0200
-@@ -1631,6 +1631,16 @@
+--- vdr-1.6.0~/recording.c 2009-11-28 12:09:25.000000000 +0100
++++ vdr-1.6.0/recording.c 2009-11-28 12:09:29.000000000 +0100
+@@ -1630,6 +1630,16 @@
return NULL;
}
@@ -378,8 +378,8 @@
{
return SetOffset(fileNumber + 1);
diff -urNad vdr-1.6.0~/recording.h vdr-1.6.0/recording.h
---- vdr-1.6.0~/recording.h 2008-05-11 12:13:51.000000000 +0200
-+++ vdr-1.6.0/recording.h 2008-05-11 12:13:51.000000000 +0200
+--- vdr-1.6.0~/recording.h 2009-11-28 12:09:25.000000000 +0100
++++ vdr-1.6.0/recording.h 2009-11-28 12:09:29.000000000 +0100
@@ -213,7 +213,15 @@
// may be slightly higher because we stop recording only before the next
// 'I' frame, to have a complete Group Of Pictures):
@@ -397,7 +397,7 @@
class cIndexFile {
private:
-@@ -254,6 +262,8 @@
+@@ -256,6 +264,8 @@
cUnbufferedFile *Open(void);
void Close(void);
cUnbufferedFile *SetOffset(int Number, int Offset = 0);
@@ -407,8 +407,8 @@
};
diff -urNad vdr-1.6.0~/videodir.c vdr-1.6.0/videodir.c
---- vdr-1.6.0~/videodir.c 2008-02-16 14:00:03.000000000 +0100
-+++ vdr-1.6.0/videodir.c 2008-05-11 12:13:51.000000000 +0200
+--- vdr-1.6.0~/videodir.c 2009-11-28 11:57:20.000000000 +0100
++++ vdr-1.6.0/videodir.c 2009-11-28 12:09:29.000000000 +0100
@@ -19,6 +19,9 @@
#include "recording.h"
#include "tools.h"
@@ -427,7 +427,7 @@
+{
+ cString Name(FileName);
+ char *p;
-+ while ((p = strrchr((const char*)Name + 1, '/')) != NULL) {
++ while ((p = strrchr((char*)(const char*)Name + 1, '/')) != NULL) {
+ *p = 0; // truncate at last '/'
+ if (stat(Name, Stat) == 0) {
+ isyslog("StatNearestDir: Stating %s", (const char*)Name);
@@ -541,8 +541,8 @@
{
cVideoDirectory Dir;
diff -urNad vdr-1.6.0~/videodir.h vdr-1.6.0/videodir.h
---- vdr-1.6.0~/videodir.h 2008-02-16 13:53:11.000000000 +0100
-+++ vdr-1.6.0/videodir.h 2008-05-11 12:13:51.000000000 +0200
+--- vdr-1.6.0~/videodir.h 2009-11-28 11:57:20.000000000 +0100
++++ vdr-1.6.0/videodir.h 2009-11-28 12:09:29.000000000 +0100
@@ -19,6 +19,7 @@
int CloseVideoFile(cUnbufferedFile *File);
bool RenameVideoFile(const char *OldName, const char *NewName);
Added: vdr/vdr/trunk/debian/vdr-dev.links
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/vdr-dev.links?rev=8429&op=file
==============================================================================
--- vdr/vdr/trunk/debian/vdr-dev.links (added)
+++ vdr/vdr/trunk/debian/vdr-dev.links Thu Mar 4 23:05:19 2010
@@ -1,0 +1,2 @@
+usr/include/vdr/libsi usr/include/vdr/include/libsi
+usr/include/vdr usr/include/vdr/include/vdr
Modified: vdr/vdr/trunk/debian/vdr.init
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/vdr.init?rev=8429&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/vdr.init (original)
+++ vdr/vdr/trunk/debian/vdr.init Thu Mar 4 23:05:19 2010
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/bash -p
#
# vdr start-stop script
#
Propchange: vdr/vdr/trunk/debian/vdrleaktest
('svn:executable' removed)
More information about the pkg-vdr-dvb-changes
mailing list