r502 - in vdr/vdr/trunk/debian: . patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Mon, 09 May 2005 19:13:21 +0000
Author: tschmidt
Date: 2005-05-09 19:13:20 +0000 (Mon, 09 May 2005)
New Revision: 502
Removed:
vdr/vdr/trunk/debian/patches/11_memleak.dpatch
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/patches/00list
vdr/vdr/trunk/debian/patches/15_dvbplayer.dpatch
Log:
vdr:
- New upstream release (1.3.24)
+ Removed 11_memleak.dpatch
+ Updated 15_dvbplayer.dpatch
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2005-05-09 13:47:23 UTC (rev 501)
+++ vdr/vdr/trunk/debian/changelog 2005-05-09 19:13:20 UTC (rev 502)
@@ -1,9 +1,18 @@
-vdr (1.3.23-1) experimental; urgency=low
+vdr (1.3.24-1) experimental; urgency=low
* (NOT RELEASED YET)
* Thomas Schmidt <tschmidt@debian.org>
- New upstream release
+ + Removed 11_memleak.dpatch
+ + Updated 15_dvbplayer.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Mon, 9 May 2005 15:47:50 +0200
+
+vdr (1.3.23-1) experimental; urgency=low
+
+ * Thomas Schmidt <tschmidt@debian.org>
+ - New upstream release
+ Removed 01_gcc3.4-FTBFS-fix.dpatch
+ Removed 09_amd64_epg.dpatch
+ Removed opt-23_osdpip-0.0.3.dpatch
Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list 2005-05-09 13:47:23 UTC (rev 501)
+++ vdr/vdr/trunk/debian/patches/00list 2005-05-09 19:13:20 UTC (rev 502)
@@ -8,7 +8,6 @@
08_security_CAN-2005-0071
09_sort_options
10_livelock
-11_memleak
12_nptl
13_remote
14_update-resume
Deleted: vdr/vdr/trunk/debian/patches/11_memleak.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/11_memleak.dpatch 2005-05-09 13:47:23 UTC (rev 501)
+++ vdr/vdr/trunk/debian/patches/11_memleak.dpatch 2005-05-09 19:13:20 UTC (rev 502)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_memleak.dpatch by Stefan Huelswitt <s.huelswitt@gmx.de> and Daniel Thompson <daniel.thompson@st.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Kill some memory leaks.
-
-@DPATCH@
-diff -urNad vdr-1.3.23/dvbplayer.c /tmp/dpep.HpFRhI/vdr-1.3.23/dvbplayer.c
---- vdr-1.3.23/dvbplayer.c 2005-04-12 01:28:38.278587027 +0100
-+++ /tmp/dpep.HpFRhI/vdr-1.3.23/dvbplayer.c 2005-04-12 01:28:38.569563448 +0100
-@@ -296,6 +296,7 @@
- nonBlockingFileReader->Clear();
- if ((readIndex = backTrace->Get(playDir == pdForward)) < 0)
- readIndex = writeIndex;
-+ delete readFrame;
- readFrame = NULL;
- playFrame = NULL;
- ringBuffer->Clear();
-diff -urNad vdr-1.3.23/epg.c /tmp/dpep.HpFRhI/vdr-1.3.23/epg.c
---- vdr-1.3.23/epg.c 2005-04-12 01:28:38.241590025 +0100
-+++ /tmp/dpep.HpFRhI/vdr-1.3.23/epg.c 2005-04-12 01:29:20.344178196 +0100
-@@ -29,9 +29,7 @@
- {
- unsigned int Stream, Type;
- int n = sscanf(s, "%X %02X %3c %a[^\n]", &Stream, &Type, language, &description);
-- if (n != 4)
-- description = NULL;
-- else if (isempty(description)) {
-+ if (n != 4 || isempty(description)) {
- free(description);
- description = NULL;
- }
Modified: vdr/vdr/trunk/debian/patches/15_dvbplayer.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/15_dvbplayer.dpatch 2005-05-09 13:47:23 UTC (rev 501)
+++ vdr/vdr/trunk/debian/patches/15_dvbplayer.dpatch 2005-05-09 19:13:20 UTC (rev 502)
@@ -5,9 +5,10 @@
## DP: send proper I-frames to the device
@DPATCH@
---- ./dvbplayer.c
-+++ ./dvbplayer.c
-@@ -358,6 +358,94 @@ void cDvbPlayer::Activate(bool On)
+diff -urNad vdr-1.3.24/dvbplayer.c /tmp/dpep.Ctc0VI/vdr-1.3.24/dvbplayer.c
+--- vdr-1.3.24/dvbplayer.c 2005-05-08 16:52:49.000000000 +0200
++++ /tmp/dpep.Ctc0VI/vdr-1.3.24/dvbplayer.c 2005-05-09 20:31:45.721116992 +0200
+@@ -360,6 +360,94 @@
}
}
@@ -102,17 +103,7 @@
void cDvbPlayer::Action(void)
{
uchar *b = NULL;
-@@ -380,14 +468,15 @@ void cDvbPlayer::Action(void)
-
- // Read the next frame from the file:
-
-- if (!readFrame && (replayFile >= 0 || readIndex >= 0)) {
-- if (playMode != pmStill) {
-+ if (playMode != pmStill && playMode != pmPause) {
-+ if (!readFrame && (replayFile >= 0 || readIndex >= 0)) {
- if (!nonBlockingFileReader->Reading()) {
- if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
- uchar FileNumber;
+@@ -395,6 +483,7 @@
int FileOffset;
int Index = index->GetNextIFrame(readIndex, playDir == pdForward, &FileNumber, &FileOffset, &Length, true);
if (Index >= 0) {
@@ -120,7 +111,7 @@
if (!NextFile(FileNumber, FileOffset))
continue;
}
-@@ -428,6 +523,8 @@ void cDvbPlayer::Action(void)
+@@ -435,6 +524,8 @@
}
int r = nonBlockingFileReader->Read(replayFile, b, Length);
if (r > 0) {
@@ -129,31 +120,7 @@
readFrame = new cFrame(b, -r, ftUnknown, readIndex); // hands over b to the ringBuffer
b = NULL;
}
-@@ -438,16 +535,16 @@ void cDvbPlayer::Action(void)
- break;
- }
- }
-- else
-- cCondWait::SleepMs(3); // this keeps the CPU load low
-- }
-
-- // Store the frame in the buffer:
-+ // Store the frame in the buffer:
-
-- if (readFrame) {
-- if (ringBuffer->Put(readFrame))
-- readFrame = NULL;
-+ if (readFrame) {
-+ if (ringBuffer->Put(readFrame))
-+ readFrame = NULL;
-+ }
- }
-+ else
-+ cCondWait::SleepMs(3); // this keeps the CPU load low
-
- // Get the next frame from the buffer:
-
-@@ -659,11 +756,13 @@ void cDvbPlayer::Goto(int Index, bool St
+@@ -666,11 +757,13 @@
int FileOffset, Length;
Index = index->GetNextIFrame(Index, false, &FileNumber, &FileOffset, &Length);
if (Index >= 0 && NextFile(FileNumber, FileOffset) && Still) {