r1215 - in vdr/vdr/trunk/debian: . patches
Thomas Schmidt
tschmidt at costa.debian.org
Sun Sep 11 16:28:27 UTC 2005
Author: tschmidt
Date: 2005-09-11 16:28:26 +0000 (Sun, 11 Sep 2005)
New Revision: 1215
Removed:
vdr/vdr/trunk/debian/patches/18_vdr-1.3.31-remuxbraces.dpatch
vdr/vdr/trunk/debian/patches/19_vdr-1.3.31-remux.dpatch
vdr/vdr/trunk/debian/patches/20_vdr-1.3.31-sequence-end-code5.dpatch
vdr/vdr/trunk/debian/patches/21_vdr-1.3.31-skipframes.dpatch
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/patches/00list
vdr/vdr/trunk/debian/patches/10_dd-record-option.dpatch
Log:
vdr: New upstream release 1.3.32
+ Updated 10_dd-record-option.dpatch
+ Removed 18_vdr-1.3.31-remuxbraces.dpatch
+ Removed 19_vdr-1.3.31-remux.dpatch
+ Removed 20_vdr-1.3.31-sequence-end-code5.dpatch
+ Removed 21_vdr-1.3.31-skipframes.dpatch
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2005-09-11 15:46:14 UTC (rev 1214)
+++ vdr/vdr/trunk/debian/changelog 2005-09-11 16:28:26 UTC (rev 1215)
@@ -1,8 +1,20 @@
-vdr (1.3.31-3) unstable; urgency=low
+vdr (1.3.32-1) unstable; urgency=low
* NOT RELEASED YET
* Thomas Schmidt <tschmidt at debian.org>
+ - New upstream release
+ + Updated 10_dd-record-option.dpatch
+ + Removed 18_vdr-1.3.31-remuxbraces.dpatch
+ + Removed 19_vdr-1.3.31-remux.dpatch
+ + Removed 20_vdr-1.3.31-sequence-end-code5.dpatch
+ + Removed 21_vdr-1.3.31-skipframes.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 11 Sep 2005 17:58:47 +0200
+
+vdr (1.3.31-3) unstable; urgency=low
+
+ * Thomas Schmidt <tschmidt at debian.org>
- Updated 01_Makefile-fPIC-fix.dpatch again, added -fPIC to the Makefile
of the skincurses plugin
- Build-Depend on libncurses5-dev, so the skincurses plugin gets compiled
@@ -622,8 +634,3 @@
* Made a little hack to create the channel.conf template from Debian examples
-- Eduard Bloch <blade at debian.org> Sat, 22 Sep 2001 03:16:11 +0200
-
-Local variables:
-mode: debian-changelog
-End:
-
Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list 2005-09-11 15:46:14 UTC (rev 1214)
+++ vdr/vdr/trunk/debian/patches/00list 2005-09-11 16:28:26 UTC (rev 1215)
@@ -15,10 +15,6 @@
15_dvbplayer
16_avoidTrashing
17_replay
-18_vdr-1.3.31-remuxbraces
-19_vdr-1.3.31-remux
-20_vdr-1.3.31-sequence-end-code5
-21_vdr-1.3.31-skipframes
22_vdr-playerepg
# Patch needed for DVB subtitles or ttxtsubs (does not work with AC3-patch)
Modified: vdr/vdr/trunk/debian/patches/10_dd-record-option.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/10_dd-record-option.dpatch 2005-09-11 15:46:14 UTC (rev 1214)
+++ vdr/vdr/trunk/debian/patches/10_dd-record-option.dpatch 2005-09-11 16:28:26 UTC (rev 1215)
@@ -8,10 +8,10 @@
## DP: dvd-plugin)
@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./config.c /tmp/dpep-work.8JUm9E/vdr-1.3.28/config.c
---- ./config.c 2005-08-07 20:48:05.000000000 +0200
-+++ /tmp/dpep-work.8JUm9E/vdr-1.3.28/config.c 2005-08-07 20:48:05.000000000 +0200
-@@ -364,6 +364,7 @@
+diff -urNad vdr-1.3.32/config.c /tmp/dpep.7sbpO9/vdr-1.3.32/config.c
+--- vdr-1.3.32/config.c 2005-09-11 18:11:45.024178024 +0200
++++ /tmp/dpep.7sbpO9/vdr-1.3.32/config.c 2005-09-11 18:11:45.795060832 +0200
+@@ -365,6 +365,7 @@
VideoDisplayFormat = 1;
VideoFormat = 0;
UpdateChannels = 4;
@@ -19,7 +19,7 @@
UseDolbyDigital = 1;
ChannelInfoPos = 0;
ChannelInfoTime = 5;
-@@ -522,6 +523,7 @@
+@@ -523,6 +524,7 @@
else if (!strcasecmp(Name, "VideoDisplayFormat")) VideoDisplayFormat = atoi(Value);
else if (!strcasecmp(Name, "VideoFormat")) VideoFormat = atoi(Value);
else if (!strcasecmp(Name, "UpdateChannels")) UpdateChannels = atoi(Value);
@@ -27,7 +27,7 @@
else if (!strcasecmp(Name, "UseDolbyDigital")) UseDolbyDigital = atoi(Value);
else if (!strcasecmp(Name, "ChannelInfoPos")) ChannelInfoPos = atoi(Value);
else if (!strcasecmp(Name, "ChannelInfoTime")) ChannelInfoTime = atoi(Value);
-@@ -587,6 +589,7 @@
+@@ -588,6 +590,7 @@
Store("VideoDisplayFormat", VideoDisplayFormat);
Store("VideoFormat", VideoFormat);
Store("UpdateChannels", UpdateChannels);
@@ -35,10 +35,10 @@
Store("UseDolbyDigital", UseDolbyDigital);
Store("ChannelInfoPos", ChannelInfoPos);
Store("ChannelInfoTime", ChannelInfoTime);
-diff -urNad --exclude=CVS --exclude=.svn ./config.h /tmp/dpep-work.8JUm9E/vdr-1.3.28/config.h
---- ./config.h 2005-08-07 20:48:05.000000000 +0200
-+++ /tmp/dpep-work.8JUm9E/vdr-1.3.28/config.h 2005-08-07 20:48:05.000000000 +0200
-@@ -258,6 +258,7 @@
+diff -urNad vdr-1.3.32/config.h /tmp/dpep.7sbpO9/vdr-1.3.32/config.h
+--- vdr-1.3.32/config.h 2005-09-11 18:11:45.025177872 +0200
++++ /tmp/dpep.7sbpO9/vdr-1.3.32/config.h 2005-09-11 18:11:45.795060832 +0200
+@@ -257,6 +257,7 @@
int VideoDisplayFormat;
int VideoFormat;
int UpdateChannels;
@@ -46,15 +46,13 @@
int UseDolbyDigital;
int ChannelInfoPos;
int ChannelInfoTime;
-diff -urNad --exclude=CVS --exclude=.svn ./i18n.c /tmp/dpep-work.8JUm9E/vdr-1.3.28/i18n.c
---- ./i18n.c 2005-08-06 18:09:44.000000000 +0200
-+++ /tmp/dpep-work.8JUm9E/vdr-1.3.28/i18n.c 2005-08-07 20:50:59.000000000 +0200
-@@ -3241,26 +3241,47 @@
+diff -urNad vdr-1.3.32/i18n.c /tmp/dpep.7sbpO9/vdr-1.3.32/i18n.c
+--- vdr-1.3.32/i18n.c 2005-09-11 18:02:41.692776952 +0200
++++ /tmp/dpep.7sbpO9/vdr-1.3.32/i18n.c 2005-09-11 18:11:45.799060224 +0200
+@@ -3262,8 +3262,29 @@
"TV külgsuhe",
"Video format",
},
-- { "Setup.DVB$Use Dolby Digital",
-- "Dolby Digital Ton benutzen",
+ { "Setup.DVB$Record Dolby Digital",
+ "Dolby Digital Ton aufzeichnen",
+ "",//TODO
@@ -76,41 +74,16 @@
+ "",//TODO
+ "",//TODO
+ },
-+ { "Setup.DVB$Replay Dolby Digital",
+ { "Setup.DVB$Use Dolby Digital",
+- "Dolby Digital Ton benutzen",
+ "Dolby Digital Ton wiedergeben",
-+ "",//TODO
-+ "",//TODO
-+ "",//TODO
-+ "",//TODO
-+ "",//TODO
-+ "",//TODO
-+ "",//TODO
-+ "",//TODO
+ "Uporabljaj Dolby Digital",
"",//TODO
- "",//TODO
-- "Dolby Digital gebruiken",
- "",//TODO
-- "Utiliser le Dolby Digital",
- "",//TODO
-- "Käytä Dolby Digital -ääntä",
- "",//TODO
- "",//TODO
- "",//TODO
-- "Använd Dolby Digital",
- "",//TODO
- "",//TODO
- "",//TODO
-- "²ÚÛîçØâì Dolby Digital",
-- "Koristi Dolby Digital",
-- "Dolby Digital kasutamine",
-- "Anvend Dolby Digital",
- },
- { "Setup.DVB$Update channels",
- "Kanäle aktualisieren",
-diff -urNad --exclude=CVS --exclude=.svn ./menu.c /tmp/dpep-work.8JUm9E/vdr-1.3.28/menu.c
---- ./menu.c 2005-08-07 20:48:05.000000000 +0200
-+++ /tmp/dpep-work.8JUm9E/vdr-1.3.28/menu.c 2005-08-07 20:48:05.000000000 +0200
-@@ -2074,7 +2074,8 @@
+ "Dolby Digital gebruiken",
+diff -urNad vdr-1.3.32/menu.c /tmp/dpep.7sbpO9/vdr-1.3.32/menu.c
+--- vdr-1.3.32/menu.c 2005-09-11 18:11:45.266141240 +0200
++++ /tmp/dpep.7sbpO9/vdr-1.3.32/menu.c 2005-09-11 18:11:45.801059920 +0200
+@@ -2039,7 +2039,8 @@
Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"), &data.VideoFormat, "4:3", "16:9"));
if (data.VideoFormat == 0)
Add(new cMenuEditStraItem(tr("Setup.DVB$Video display format"), &data.VideoDisplayFormat, 3, videoDisplayFormatTexts));
@@ -120,10 +93,10 @@
Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"), &data.UpdateChannels, 5, updateChannelsTexts));
Add(new cMenuEditIntItem( tr("Setup.DVB$Audio languages"), &numAudioLanguages, 0, I18nNumLanguages));
for (int i = 0; i < numAudioLanguages; i++)
-diff -urNad --exclude=CVS --exclude=.svn ./recorder.c /tmp/dpep-work.8JUm9E/vdr-1.3.28/recorder.c
---- ./recorder.c 2005-01-16 13:53:17.000000000 +0100
-+++ /tmp/dpep-work.8JUm9E/vdr-1.3.28/recorder.c 2005-08-07 20:48:05.000000000 +0200
-@@ -128,7 +128,7 @@
+diff -urNad vdr-1.3.32/recorder.c /tmp/dpep.7sbpO9/vdr-1.3.32/recorder.c
+--- vdr-1.3.32/recorder.c 2005-09-11 18:02:41.696776344 +0200
++++ /tmp/dpep.7sbpO9/vdr-1.3.32/recorder.c 2005-09-11 18:11:45.802059768 +0200
+@@ -122,7 +122,7 @@
}
cRecorder::cRecorder(const char *FileName, int Ca, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids)
@@ -131,8 +104,8 @@
+:cReceiver(Ca, Priority, VPid, APids, Setup.RecordDolbyDigital ? DPids : NULL, SPids)
,cThread("recording")
{
- active = false;
-@@ -139,7 +139,7 @@
+ // Make sure the disk is up and running:
+@@ -131,7 +131,7 @@
ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, TS_SIZE * 2, true, "Recorder");
ringBuffer->SetTimeouts(0, 100);
Deleted: vdr/vdr/trunk/debian/patches/18_vdr-1.3.31-remuxbraces.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/18_vdr-1.3.31-remuxbraces.dpatch 2005-09-11 15:46:14 UTC (rev 1214)
+++ vdr/vdr/trunk/debian/patches/18_vdr-1.3.31-remuxbraces.dpatch 2005-09-11 16:28:26 UTC (rev 1215)
@@ -1,61 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 18_vdr-1.3.31-remuxbraces.dpatch by Klaus Schmidinger <Klaus.Schmidinger at cadsoft.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes some gcc warning messages
-
- at DPATCH@
-diff -urNad vdr-1.3.31/remux.c /tmp/dpep.7mmgBA/vdr-1.3.31/remux.c
---- vdr-1.3.31/remux.c 2005-08-28 13:46:44.000000000 +0200
-+++ /tmp/dpep.7mmgBA/vdr-1.3.31/remux.c 2005-08-31 21:24:47.644378176 +0200
-@@ -522,18 +522,22 @@
- };
-
- int cAudioRepacker::bitRates[2][3][16] = { // all values are specified as kbits/s
-+ {
- // MPEG 1, Layer I
-- 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1,
-+ { 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1 },
- // MPEG 1, Layer II
-- 0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, -1,
-+ { 0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, -1 },
- // MPEG 1, Layer III
-- 0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1,
-+ { 0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1 }
-+ },
-+ {
- // MPEG 2, Layer I
-- 0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1,
-+ { 0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1 },
- // MPEG 2, Layer II/III
-- 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1,
-+ { 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1 },
- // MPEG 2, Layer II/III
-- 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1
-+ { 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1 }
-+ }
- };
-
- cAudioRepacker::cAudioRepacker(void)
-@@ -590,16 +594,16 @@
- else {
- static int samplingFrequencies[2][4] = { // all values are specified in Hz
- // MPEG 1
-- 44100, 48000, 32000, -1,
-+ { 44100, 48000, 32000, -1 },
- // MPEG 2
-- 22050, 24000, 16000, -1
-+ { 22050, 24000, 16000, -1 }
- };
-
- static int slots_per_frame[2][3] = {
- // MPEG 1, Layer I, II, III
-- 12, 144, 144,
-+ { 12, 144, 144 },
- // MPEG 2, Layer I, II, III
-- 12, 144, 72
-+ { 12, 144, 72 }
- };
-
- int mpegIndex = 1 - id;
Deleted: vdr/vdr/trunk/debian/patches/19_vdr-1.3.31-remux.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/19_vdr-1.3.31-remux.dpatch 2005-09-11 15:46:14 UTC (rev 1214)
+++ vdr/vdr/trunk/debian/patches/19_vdr-1.3.31-remux.dpatch 2005-09-11 16:28:26 UTC (rev 1215)
@@ -1,68 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 19_vdr-1.3.31-remux.dpatch by Reinhard Nissl <rnissl at gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes a bug in cVideo/AudioRepacker::Repack()
-
- at DPATCH@
-diff -urNad vdr-1.3.31/remux.c /tmp/dpep.Q0kE5W/vdr-1.3.31/remux.c
---- vdr-1.3.31/remux.c 2005-08-28 13:46:44.000000000 +0200
-+++ /tmp/dpep.Q0kE5W/vdr-1.3.31/remux.c 2005-08-31 21:25:31.440720120 +0200
-@@ -142,7 +142,7 @@
- {
- cRepacker::Reset();
- skippedBytes = 0;
-- packetTodo = maxPacketSize - 6 - 3;
-+ packetTodo = 0;
- fragmentLen = 0;
- pesHeaderLen = 0;
- pesHeaderBackupLen = 0;
-@@ -361,7 +361,7 @@
- done++;
- todo--;
- // do we have to start a new packet as there is no more space left?
-- if (--packetTodo <= 0) {
-+ if (state != syncing && --packetTodo <= 0) {
- // we connot start a new packet here if the current might end in a start
- // code and this start code shall possibly be put in the next packet. So
- // overfill the current packet until we can safely detect that we won't
-@@ -468,6 +468,9 @@
-
- int cVideoRepacker::BreakAt(const uchar *Data, int Count)
- {
-+ if (initiallySyncing)
-+ return -1; // fill the packet buffer completely until we have synced once
-+
- int PesPayloadOffset = 0;
-
- if (AnalyzePesHeader(Data, Count, PesPayloadOffset) <= phInvalid)
-@@ -732,7 +735,7 @@
- done++;
- todo--;
- // do we have to start a new packet as there is no more space left?
-- if (--packetTodo <= 0) {
-+ if (state != syncing && --packetTodo <= 0) {
- // We connot start a new packet here if the current might end in an audio
- // frame header and this header shall possibly be put in the next packet. So
- // overfill the current packet until we can safely detect that we won't
-@@ -836,6 +839,9 @@
-
- int cAudioRepacker::BreakAt(const uchar *Data, int Count)
- {
-+ if (initiallySyncing)
-+ return -1; // fill the packet buffer completely until we have synced once
-+
- int PesPayloadOffset = 0;
-
- ePesHeader MpegLevel = AnalyzePesHeader(Data, Count, PesPayloadOffset);
-@@ -1189,6 +1195,9 @@
-
- int cDolbyRepacker::BreakAt(const uchar *Data, int Count)
- {
-+ if (initiallySyncing)
-+ return -1; // fill the packet buffer completely until we have synced once
-+
- // enough data for test?
- if (Count < 6 + 3)
- return -1;
Deleted: vdr/vdr/trunk/debian/patches/20_vdr-1.3.31-sequence-end-code5.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/20_vdr-1.3.31-sequence-end-code5.dpatch 2005-09-11 15:46:14 UTC (rev 1214)
+++ vdr/vdr/trunk/debian/patches/20_vdr-1.3.31-sequence-end-code5.dpatch 2005-09-11 16:28:26 UTC (rev 1215)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 20_vdr-1.3.31-sequence-end-code5.dpatch by Reinhard Nissl <rnissl at gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes a problem when moving cutting marks in radio recordings
-
- at DPATCH@
-diff -urNad vdr-1.3.31/dvbplayer.c /tmp/dpep.hVSHGH/vdr-1.3.31/dvbplayer.c
---- vdr-1.3.31/dvbplayer.c 2005-08-14 12:52:45.000000000 +0200
-+++ /tmp/dpep.hVSHGH/vdr-1.3.31/dvbplayer.c 2005-08-31 21:26:31.886530960 +0200
-@@ -661,7 +661,7 @@
- if (playMode == pmPause)
- DevicePlay();
- // append sequence end code to get the image shown immediately with softdevices
-- if (r > 6) { // should be always true
-+ if (r > 6 && (b[3] & 0xF0) == 0xE0) { // make sure to append it only to a video packet
- b[r++] = 0x00;
- b[r++] = 0x00;
- b[r++] = 0x01;
Deleted: vdr/vdr/trunk/debian/patches/21_vdr-1.3.31-skipframes.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/21_vdr-1.3.31-skipframes.dpatch 2005-09-11 15:46:14 UTC (rev 1214)
+++ vdr/vdr/trunk/debian/patches/21_vdr-1.3.31-skipframes.dpatch 2005-09-11 16:28:26 UTC (rev 1215)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 21_vdr-1.3.31-skipframes.dpatch by Reinhard Nissl <rnissl at gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes a problem when moving cutting marks in radio recordings
-
- at DPATCH@
-diff -urNad vdr-1.3.31/dvbplayer.c /tmp/dpep.pCvmik/vdr-1.3.31/dvbplayer.c
---- vdr-1.3.31/dvbplayer.c 2005-08-14 12:52:45.000000000 +0200
-+++ /tmp/dpep.pCvmik/vdr-1.3.31/dvbplayer.c 2005-08-31 21:27:50.253617352 +0200
-@@ -621,7 +621,10 @@
- int Current, Total;
- GetIndex(Current, Total, true);
- int OldCurrent = Current;
-- Current = index->GetNextIFrame(Current + Frames, Frames > 0);
-+ // As GetNextIFrame() increments/decrements at least once, the
-+ // destination frame (= Current + Frames) must be adjusted by
-+ // -1/+1 respectively.
-+ Current = index->GetNextIFrame(Current + Frames + (Frames > 0 ? -1 : 1), Frames > 0);
- return Current >= 0 ? Current : OldCurrent;
- }
- return -1;
More information about the pkg-vdr-dvb-changes
mailing list