r1765 - in vdr/vdr/trunk/debian: . patches
Thomas Schmidt
tschmidt at costa.debian.org
Fri Jan 20 21:35:44 UTC 2006
Author: tschmidt
Date: 2006-01-20 21:35:43 +0000 (Fri, 20 Jan 2006)
New Revision: 1765
Added:
vdr/vdr/trunk/debian/patches/18_vdr-1.3.39-menu-on-control.dpatch
vdr/vdr/trunk/debian/patches/19_vdr-1.3.39-clre-crash-fix.dpatch
vdr/vdr/trunk/debian/patches/20_vdr-1.3.39-schedule-crash-fix.dpatch
vdr/vdr/trunk/debian/patches/21_vdr-1.3.39-keys-fix.dpatch
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/patches/00list
Log:
vdr: Added various fixes for vdr 1.3.39
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2006-01-20 00:18:28 UTC (rev 1764)
+++ vdr/vdr/trunk/debian/changelog 2006-01-20 21:35:43 UTC (rev 1765)
@@ -7,8 +7,12 @@
+ Updated 06_default_svdrp_port_0.dpatch
+ Updated 09_sort_options.dpatch
+ Removed 18_vdr-1.3.38-root-fix.dpatch
+ + Added 18_vdr-1.3.39-menu-on-control
+ + Added 19_vdr-1.3.39-clre-crash-fix
+ + Added 20_vdr-1.3.39-schedule-crash-fix
+ + Added 21_vdr-1.3.39-keys-fix
- -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Tue, 17 Jan 2006 21:22:07 +0100
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Fri, 20 Jan 2006 22:31:37 +0100
vdr (1.3.38-1) unstable; urgency=low
Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list 2006-01-20 00:18:28 UTC (rev 1764)
+++ vdr/vdr/trunk/debian/patches/00list 2006-01-20 21:35:43 UTC (rev 1765)
@@ -9,6 +9,10 @@
13_epgfix
15_dvbplayer
17_replay
+18_vdr-1.3.39-menu-on-control
+19_vdr-1.3.39-clre-crash-fix
+20_vdr-1.3.39-schedule-crash-fix
+21_vdr-1.3.39-keys-fix
# Patch needed for DVB subtitles or ttxtsubs (does not work with AC3-patch)
# opt-21_subtitles_and_ttxtsubs
Added: vdr/vdr/trunk/debian/patches/18_vdr-1.3.39-menu-on-control.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/18_vdr-1.3.39-menu-on-control.dpatch 2006-01-20 00:18:28 UTC (rev 1764)
+++ vdr/vdr/trunk/debian/patches/18_vdr-1.3.39-menu-on-control.dpatch 2006-01-20 21:35:43 UTC (rev 1765)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 18_vdr-1.3.39-menu-on-control.dpatch by Udo Richter <udo_richter at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes main menu doesn't open if any replay control is active.
+
+ at DPATCH@
+--- vdr-1.3.39-old/vdr.c 2006-01-15 18:33:54.000000000 +0100
++++ vdr-1.3.39/vdr.c 2006-01-15 18:38:28.000000000 +0100
+@@ -795,8 +795,12 @@
+ bool WasMenu = Interact && Interact->IsMenu();
+ if (Menu)
+ DELETE_MENU;
+- else if (cControl::Control() && cOsd::IsOpen())
+- cControl::Control()->Hide();
++ else if (cControl::Control()) {
++ if (cOsd::IsOpen())
++ cControl::Control()->Hide();
++ else
++ WasOpen = false;
++ }
+ if (!WasOpen || !WasMenu && !Setup.MenuButtonCloses)
+ Menu = new cMenuMain;
+ }
+
Added: vdr/vdr/trunk/debian/patches/19_vdr-1.3.39-clre-crash-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/19_vdr-1.3.39-clre-crash-fix.dpatch 2006-01-20 00:18:28 UTC (rev 1764)
+++ vdr/vdr/trunk/debian/patches/19_vdr-1.3.39-clre-crash-fix.dpatch 2006-01-20 21:35:43 UTC (rev 1765)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 19_vdr-1.3.39-clre-crash-fix.dpatch by Klaus Schmidinger <Klaus.Schmidinger at cadsoft.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes segfault of vdr when using the CLRE command via SVDRP
+
+ at DPATCH@
+diff -urNad vdr-1.3.39/epg.c /tmp/dpep.91NkxL/vdr-1.3.39/epg.c
+--- vdr-1.3.39/epg.c 2006-01-15 14:58:30.000000000 +0100
++++ /tmp/dpep.91NkxL/vdr-1.3.39/epg.c 2006-01-20 22:16:32.753728500 +0100
+@@ -935,7 +935,8 @@
+ cSchedulesLock SchedulesLock(true, 1000);
+ cSchedules *s = (cSchedules *)Schedules(SchedulesLock);
+ if (s) {
+- s->Clear();
++ for (cSchedule *Schedule = s->First(); Schedule; Schedule = s->Next(Schedule))
++ Schedule->Cleanup(INT_MAX);
+ return true;
+ }
+ return false;
Property changes on: vdr/vdr/trunk/debian/patches/19_vdr-1.3.39-clre-crash-fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr/trunk/debian/patches/20_vdr-1.3.39-schedule-crash-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/20_vdr-1.3.39-schedule-crash-fix.dpatch 2006-01-20 00:18:28 UTC (rev 1764)
+++ vdr/vdr/trunk/debian/patches/20_vdr-1.3.39-schedule-crash-fix.dpatch 2006-01-20 21:35:43 UTC (rev 1765)
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 20_vdr-1.3.39-schedule-crash-fix.dpatch by Klaus Schmidinger <Klaus.Schmidinger at cadsoft.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes crash of vdr when epg contains 'NULL' in titles
+
+ at DPATCH@
+diff -urNad vdr-1.3.39/epg.c /tmp/dpep.4wv6zh/vdr-1.3.39/epg.c
+--- vdr-1.3.39/epg.c 2006-01-15 14:58:30.000000000 +0100
++++ /tmp/dpep.4wv6zh/vdr-1.3.39/epg.c 2006-01-20 22:23:29.323762500 +0100
+@@ -421,13 +421,18 @@
+ strreplace(shortText, '\x87', ' ');
+ strreplace(description, '\x86', ' ');
+ strreplace(description, '\x87', ' ');
+-
++
++ if (!title) {
++ // we don't want any "(null)" titles
++ title = strcpyrealloc(title, tr("No title"));
++ EpgBugFixStat(12, ChannelID());
++ }
++
+ if (Setup.EPGBugfixLevel == 0)
+ return;
+
+ // Some TV stations apparently have their own idea about how to fill in the
+ // EPG data. Let's fix their bugs as good as we can:
+- if (title) {
+
+ // Some channels put the ShortText in quotes and use either the ShortText
+ // or the Description field, depending on how long the string is:
+@@ -609,12 +614,6 @@
+ }
+ }
+ }
+- else {
+- // we don't want any "(null)" titles
+- title = strcpyrealloc(title, tr("No title"));
+- EpgBugFixStat(12, ChannelID());
+- }
+-}
+
+ // --- cSchedule -------------------------------------------------------------
+
Property changes on: vdr/vdr/trunk/debian/patches/20_vdr-1.3.39-schedule-crash-fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr/trunk/debian/patches/21_vdr-1.3.39-keys-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/21_vdr-1.3.39-keys-fix.dpatch 2006-01-20 00:18:28 UTC (rev 1764)
+++ vdr/vdr/trunk/debian/patches/21_vdr-1.3.39-keys-fix.dpatch 2006-01-20 21:35:43 UTC (rev 1765)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 21_vdr-1.3.39-keys-fix.dpatch by Klaus Schmidinger <Klaus.Schmidinger at cadsoft.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes cKeyMacros to be kNone-safe
+
+ at DPATCH@
+diff -urNad vdr-1.3.39/keys.c /tmp/dpep.C9NYym/vdr-1.3.39/keys.c
+--- vdr-1.3.39/keys.c 2006-01-05 16:39:26.000000000 +0100
++++ /tmp/dpep.C9NYym/vdr-1.3.39/keys.c 2006-01-20 22:10:03.133378750 +0100
+@@ -250,9 +250,11 @@
+
+ const cKeyMacro *cKeyMacros::Get(eKeys Key)
+ {
+- for (cKeyMacro *k = First(); k; k = Next(k)) {
+- if (*k->Macro() == Key)
+- return k;
+- }
++ if (Key != kNone) {
++ for (cKeyMacro *k = First(); k; k = Next(k)) {
++ if (*k->Macro() == Key)
++ return k;
++ }
++ }
+ return NULL;
+ }
+diff -urNad vdr-1.3.39/vdr.c /tmp/dpep.C9NYym/vdr-1.3.39/vdr.c
+--- vdr-1.3.39/vdr.c 2006-01-15 14:31:57.000000000 +0100
++++ /tmp/dpep.C9NYym/vdr-1.3.39/vdr.c 2006-01-20 22:10:03.133378750 +0100
+@@ -985,7 +985,7 @@
+ }
+ else {
+ // Key functions in "normal" viewing mode:
+- if (KeyMacros.Get(key)) {
++ if (key != kNone && KeyMacros.Get(key)) {
+ cRemote::PutMacro(key);
+ key = kNone;
+ }
Property changes on: vdr/vdr/trunk/debian/patches/21_vdr-1.3.39-keys-fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the pkg-vdr-dvb-changes
mailing list