r2129 - in vdr/vdr/trunk/debian: . patches
Thomas Schmidt
tschmidt at costa.debian.org
Sun Mar 26 16:21:37 UTC 2006
Author: tschmidt
Date: 2006-03-26 16:21:36 +0000 (Sun, 26 Mar 2006)
New Revision: 2129
Removed:
vdr/vdr/trunk/debian/patches/18_vdr-1.3.39-menu-on-control.dpatch
vdr/vdr/trunk/debian/patches/19_vdr-1.3.41-no-title-fix.dpatch
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/patches/00list
vdr/vdr/trunk/debian/patches/11_sortrecordings.dpatch
vdr/vdr/trunk/debian/patches/15_dvbplayer.dpatch
Log:
vdr: New upstream release 1.3.45
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2006-03-26 16:17:48 UTC (rev 2128)
+++ vdr/vdr/trunk/debian/changelog 2006-03-26 16:21:36 UTC (rev 2129)
@@ -1,9 +1,20 @@
-vdr (1.3.41-1) unstable; urgency=low
+vdr (1.3.45-1) unstable; urgency=low
* NOT RELEASED YET
* Thomas Schmidt <tschmidt at debian.org>
- New upstream release
+ + Updated 11_sortrecordings.dpatch
+ + Updated 15_dvbplayer.dpatch
+ + Removed 18_vdr-1.3.39-menu-on-control.dpatch
+ + Removed 19_vdr-1.3.41-no-title-fix.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 26 Mar 2006 18:08:29 +0200
+
+vdr (1.3.41-1) unstable; urgency=low
+
+ * Thomas Schmidt <tschmidt at debian.org>
+ - New upstream release
+ Removed 13_epgfix.dpatch
+ Added 99_epg-fix.dpatch
+ Added 19_vdr-1.3.41-no-title-fix.dpatch
Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list 2006-03-26 16:17:48 UTC (rev 2128)
+++ vdr/vdr/trunk/debian/patches/00list 2006-03-26 16:21:36 UTC (rev 2129)
@@ -9,8 +9,6 @@
12_osdbase-maxitems
15_dvbplayer
17_replay
-18_vdr-1.3.39-menu-on-control
-19_vdr-1.3.41-no-title-fix
# Patch needed for DVB subtitles or ttxtsubs (does not work with AC3-patch)
# opt-21_subtitles_and_ttxtsubs
Modified: vdr/vdr/trunk/debian/patches/11_sortrecordings.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/11_sortrecordings.dpatch 2006-03-26 16:17:48 UTC (rev 2128)
+++ vdr/vdr/trunk/debian/patches/11_sortrecordings.dpatch 2006-03-26 16:21:36 UTC (rev 2129)
@@ -1,14 +1,15 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-
## 11_sortrecordings.dpatch by FrankJepsen at vdrportal.de
## http://www.jepsennet.de/vdr/download/11_sortrecordings.dpatch
##
+## Thomas Günther <tom at toms-cafe.de>:
+## - adapted to VDR-1.3.42
+##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Sort recordings dirs first and by name, recs by date or name (if last
## DP: char in dir is one of '.-$ª').
@DPATCH@
-
--- vdrdevel-1.3.24.org/recording.c 2005-05-07 17:25:15.000000000 +0200
+++ vdrdevel-1.3.24/recording.c 2005-06-17 00:24:44.000000000 +0200
@@ -445,8 +445,8 @@
@@ -28,6 +29,6 @@
if (!sortBuffer) {
- char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) + 1));
+ char *s = StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) ));
+ strreplace(s, '/', 'a'); // some locales ignore '/' when sorting
int l = strxfrm(NULL, s, 0) + 1;
sortBuffer = MALLOC(char, l);
- strxfrm(sortBuffer, s, l);
Modified: vdr/vdr/trunk/debian/patches/15_dvbplayer.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/15_dvbplayer.dpatch 2006-03-26 16:17:48 UTC (rev 2128)
+++ vdr/vdr/trunk/debian/patches/15_dvbplayer.dpatch 2006-03-26 16:21:36 UTC (rev 2129)
@@ -1,8 +1,10 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-
## 15_dvbplayer.dpatch by Reinhard Nissl <rnissl at gmx.de>
## http://home.vr-web.de/~rnissl/vdr-1.3.31-dvbplayer5.patch
##
+## Thomas Günther <tom at toms-cafe.de>:
+## - adapted to VDR-1.3.43
+##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fixes VDR's recording replayer to send proper I-frames to a device.
## DP: Without this patch it is very likely that incomplete I-frames are sent
@@ -233,9 +235,9 @@
if (r > 0) {
+ if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))
+ fixIFrame(b, r, Length - IPACKS);
+ WaitingForData = false;
readFrame = new cFrame(b, -r, ftUnknown, readIndex); // hands over b to the ringBuffer
b = NULL;
- }
@@ -655,9 +854,11 @@ void cDvbPlayer::Goto(int Index, bool St
int FileOffset, Length;
Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset, &Length);
Deleted: 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-03-26 16:17:48 UTC (rev 2128)
+++ vdr/vdr/trunk/debian/patches/18_vdr-1.3.39-menu-on-control.dpatch 2006-03-26 16:21:36 UTC (rev 2129)
@@ -1,25 +0,0 @@
-#! /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;
- }
-
Deleted: vdr/vdr/trunk/debian/patches/19_vdr-1.3.41-no-title-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/19_vdr-1.3.41-no-title-fix.dpatch 2006-03-26 16:17:48 UTC (rev 2128)
+++ vdr/vdr/trunk/debian/patches/19_vdr-1.3.41-no-title-fix.dpatch 2006-03-26 16:21:36 UTC (rev 2129)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 19_vdr-1.3.41-no-title-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vdr-1.3.41/epg.c /tmp/dpep.rYU6be/vdr-1.3.41/epg.c
---- vdr-1.3.41/epg.c 2006-01-29 15:17:33.000000000 +0100
-+++ /tmp/dpep.rYU6be/vdr-1.3.41/epg.c 2006-02-07 22:49:00.733200250 +0100
-@@ -321,7 +321,7 @@
- }
- }
- break;
-- case 'e': if (!Event->Title())
-+ case 'e': if (Event && !Event->Title())
- Event->SetTitle(tr("No title"));
- Event = NULL;
- break;
More information about the pkg-vdr-dvb-changes
mailing list