r4342 - in vdr/vdr/trunk/debian: . patches
Tobias Grimm
tiber-guest at alioth.debian.org
Sun Mar 11 12:00:31 CET 2007
Author: tiber-guest
Date: 2007-03-11 11:00:31 +0000 (Sun, 11 Mar 2007)
New Revision: 4342
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/patches/opt-27_subtitles-ttxtsubs.dpatch
Log:
* Removed opt-42-x_extrecmenu.dpatch
* Upgraded opt-27_subtitles-ttxtsubs to Rolf Ahrenberg's
vdr-1.4.5-subtitles-0.5.0-and-ttxtsubs-0.0.5.diff.gz (no functional changes,
just new version numbers)
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2007-03-11 10:55:15 UTC (rev 4341)
+++ vdr/vdr/trunk/debian/changelog 2007-03-11 11:00:31 UTC (rev 4342)
@@ -5,7 +5,10 @@
* Upgraded opt-48_pin.dpatch
* Updated opt-50_graphtft.dpatch
* Removed 92_MainMenuHooks.dpatch
- * Removed opt-42-x_extrecmenu.dpatch
+ * Removed opt-42-x_extrecmenu.dpatch
+ * Upgraded opt-27_subtitles-ttxtsubs to Rolf Ahrenberg's
+ vdr-1.4.5-subtitles-0.5.0-and-ttxtsubs-0.0.5.diff.gz (no functional changes,
+ just new version numbers)
-- Tobias Grimm <tg at e-tobi.net> Sat, 10 Mar 2007 20:59:30 +0100
Modified: vdr/vdr/trunk/debian/patches/opt-27_subtitles-ttxtsubs.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/opt-27_subtitles-ttxtsubs.dpatch 2007-03-11 10:55:15 UTC (rev 4341)
+++ vdr/vdr/trunk/debian/patches/opt-27_subtitles-ttxtsubs.dpatch 2007-03-11 11:00:31 UTC (rev 4342)
@@ -1,18 +1,15 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## opt-27_subtitles-ttxtsubs.dpatch by Rolf Ahrenberg <Rolf.Ahrenberg AT sci.fi>
-## http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.1-subtitles-0.4.0-and-ttxtsubs-0.0.5.diff.gz
+## http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.5-subtitles-0.5.0-and-ttxtsubs-0.0.5.diff.gz
##
-## Thomas Günther <tom at toms-cafe.de>:
-## - adapted to dd-record-option patch (UseDolbyDigital -> RecordDolbyDigital)
-##
## All lines beginning with `## DP:' are a description of the patch.
## DP: This patch is needed for the subtitles and ttxtsubs plugin.
@DPATCH@
-diff -Nru vdr-1.4.1-vanilla/Makefile vdr-1.4.1-subtitles/Makefile
---- vdr-1.4.1-vanilla/Makefile 2006-06-11 13:17:40.000000000 +0300
-+++ vdr-1.4.1-subtitles/Makefile 2006-06-11 13:19:10.000000000 +0300
-@@ -39,6 +39,8 @@
+diff -urNad vdr-1.4.5~/Makefile vdr-1.4.5/Makefile
+--- vdr-1.4.5~/Makefile 2007-01-30 20:59:57.000000000 +0100
++++ vdr-1.4.5/Makefile 2007-01-30 20:59:58.000000000 +0100
+@@ -40,6 +40,8 @@
skinclassic.o skins.o skinsttng.o sources.o spu.o status.o svdrp.o themes.o thread.o\
timers.o tools.o transfer.o vdr.o videodir.o
@@ -21,9 +18,9 @@
FIXFONT_ISO8859_1 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
OSDFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
SMLFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-1
-diff -Nru vdr-1.4.1-vanilla/dvbplayer.c vdr-1.4.1-subtitles/dvbplayer.c
---- vdr-1.4.1-vanilla/dvbplayer.c 2006-06-11 13:17:40.000000000 +0300
-+++ vdr-1.4.1-subtitles/dvbplayer.c 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/dvbplayer.c vdr-1.4.5/dvbplayer.c
+--- vdr-1.4.5~/dvbplayer.c 2007-01-30 20:59:58.000000000 +0100
++++ vdr-1.4.5/dvbplayer.c 2007-01-30 20:59:58.000000000 +0100
@@ -14,6 +14,9 @@
#include "ringbuffer.h"
#include "thread.h"
@@ -34,7 +31,7 @@
// --- cBackTrace ------------------------------------------------------------
-@@ -312,6 +315,39 @@
+@@ -313,6 +316,39 @@
firstPacket = true;
}
@@ -74,7 +71,7 @@
bool cDvbPlayer::NextFile(uchar FileNumber, int FileOffset)
{
if (FileNumber > 0)
-@@ -495,6 +531,7 @@
+@@ -752,6 +788,7 @@
}
}
if (p) {
@@ -82,9 +79,9 @@
int w = PlayPes(p, pc, playMode != pmPlay);
if (w > 0) {
p += w;
-diff -Nru vdr-1.4.1-vanilla/dvbsub.c vdr-1.4.1-subtitles/dvbsub.c
---- vdr-1.4.1-vanilla/dvbsub.c 1970-01-01 02:00:00.000000000 +0200
-+++ vdr-1.4.1-subtitles/dvbsub.c 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/dvbsub.c vdr-1.4.5/dvbsub.c
+--- vdr-1.4.5~/dvbsub.c 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.4.5/dvbsub.c 2007-01-30 20:59:58.000000000 +0100
@@ -0,0 +1,18 @@
+#include "dvbsub.h"
+
@@ -104,9 +101,9 @@
+ else
+ return 0;
+}
-diff -Nru vdr-1.4.1-vanilla/dvbsub.h vdr-1.4.1-subtitles/dvbsub.h
---- vdr-1.4.1-vanilla/dvbsub.h 1970-01-01 02:00:00.000000000 +0200
-+++ vdr-1.4.1-subtitles/dvbsub.h 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/dvbsub.h vdr-1.4.5/dvbsub.h
+--- vdr-1.4.5~/dvbsub.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.4.5/dvbsub.h 2007-01-30 20:59:58.000000000 +0100
@@ -0,0 +1,22 @@
+class cChannel;
+class cRecordControl;
@@ -130,10 +127,10 @@
+
+extern cDvbSubtitlesRecording DvbSubtitlesRecording;
+
-diff -Nru vdr-1.4.1-vanilla/menu.c vdr-1.4.1-subtitles/menu.c
---- vdr-1.4.1-vanilla/menu.c 2006-06-11 13:17:40.000000000 +0300
-+++ vdr-1.4.1-subtitles/menu.c 2006-06-11 13:19:10.000000000 +0300
-@@ -27,6 +27,8 @@
+diff -urNad vdr-1.4.5~/menu.c vdr-1.4.5/menu.c
+--- vdr-1.4.5~/menu.c 2007-01-30 20:59:58.000000000 +0100
++++ vdr-1.4.5/menu.c 2007-01-30 20:59:58.000000000 +0100
+@@ -28,6 +28,8 @@
#include "themes.h"
#include "timers.h"
#include "transfer.h"
@@ -142,7 +139,7 @@
#include "videodir.h"
#define MAXWAIT4EPGINFO 3 // seconds
-@@ -3540,8 +3542,11 @@
+@@ -3811,8 +3813,11 @@
isyslog("record %s", fileName);
if (MakeDirs(fileName, true)) {
const cChannel *ch = timer->Channel();
@@ -155,9 +152,9 @@
Recording.WriteInfo();
cStatus::MsgRecording(device, Recording.Name(), Recording.FileName(), true);
if (!Timer && !cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
-diff -Nru vdr-1.4.1-vanilla/osd.c vdr-1.4.1-subtitles/osd.c
---- vdr-1.4.1-vanilla/osd.c 2006-06-11 13:17:40.000000000 +0300
-+++ vdr-1.4.1-subtitles/osd.c 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/osd.c vdr-1.4.5/osd.c
+--- vdr-1.4.5~/osd.c 2006-02-26 15:31:31.000000000 +0100
++++ vdr-1.4.5/osd.c 2007-01-30 20:59:58.000000000 +0100
@@ -14,6 +14,8 @@
#include <sys/stat.h>
#include <sys/unistd.h>
@@ -200,9 +197,9 @@
if (cOsd::IsOpen())
esyslog("ERROR: attempt to open OSD while it is already open - using dummy OSD!");
else if (osdProvider)
-diff -Nru vdr-1.4.1-vanilla/osd.h vdr-1.4.1-subtitles/osd.h
---- vdr-1.4.1-vanilla/osd.h 2006-06-11 13:17:40.000000000 +0300
-+++ vdr-1.4.1-subtitles/osd.h 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/osd.h vdr-1.4.5/osd.h
+--- vdr-1.4.5~/osd.h 2006-02-26 15:45:05.000000000 +0100
++++ vdr-1.4.5/osd.h 2007-01-30 20:59:58.000000000 +0100
@@ -222,6 +222,8 @@
cBitmap *bitmaps[MAXOSDAREAS];
int numBitmaps;
@@ -221,9 +218,9 @@
///< Returns a pointer to a newly created cOsd object, which will be located
///< at the given coordinates. When the cOsd object is no longer needed, the
///< caller must delete it. If the OSD is already in use, or there is no OSD
-diff -Nru vdr-1.4.1-vanilla/osdcontroller.c vdr-1.4.1-subtitles/osdcontroller.c
---- vdr-1.4.1-vanilla/osdcontroller.c 1970-01-01 02:00:00.000000000 +0200
-+++ vdr-1.4.1-subtitles/osdcontroller.c 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/osdcontroller.c vdr-1.4.5/osdcontroller.c
+--- vdr-1.4.5~/osdcontroller.c 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.4.5/osdcontroller.c 2007-01-30 20:59:58.000000000 +0100
@@ -0,0 +1,132 @@
+#include "osdcontroller.h"
+#include "thread.h"
@@ -357,9 +354,9 @@
+
+
+}
-diff -Nru vdr-1.4.1-vanilla/osdcontroller.h vdr-1.4.1-subtitles/osdcontroller.h
---- vdr-1.4.1-vanilla/osdcontroller.h 1970-01-01 02:00:00.000000000 +0200
-+++ vdr-1.4.1-subtitles/osdcontroller.h 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/osdcontroller.h vdr-1.4.5/osdcontroller.h
+--- vdr-1.4.5~/osdcontroller.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.4.5/osdcontroller.h 2007-01-30 20:59:58.000000000 +0100
@@ -0,0 +1,52 @@
+#ifndef __OSDCONTROLLER_H
+#define __OSDCONTROLLER_H
@@ -413,9 +410,9 @@
+
+}
+#endif
-diff -Nru vdr-1.4.1-vanilla/rcontroller.c vdr-1.4.1-subtitles/rcontroller.c
---- vdr-1.4.1-vanilla/rcontroller.c 1970-01-01 02:00:00.000000000 +0200
-+++ vdr-1.4.1-subtitles/rcontroller.c 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/rcontroller.c vdr-1.4.5/rcontroller.c
+--- vdr-1.4.5~/rcontroller.c 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.4.5/rcontroller.c 2007-01-30 20:59:58.000000000 +0100
@@ -0,0 +1,82 @@
+#include <stdlib.h>
+#include "rcontroller.h"
@@ -499,9 +496,9 @@
+ }
+
+} // namespace
-diff -Nru vdr-1.4.1-vanilla/rcontroller.h vdr-1.4.1-subtitles/rcontroller.h
---- vdr-1.4.1-vanilla/rcontroller.h 1970-01-01 02:00:00.000000000 +0200
-+++ vdr-1.4.1-subtitles/rcontroller.h 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/rcontroller.h vdr-1.4.5/rcontroller.h
+--- vdr-1.4.5~/rcontroller.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.4.5/rcontroller.h 2007-01-30 20:59:58.000000000 +0100
@@ -0,0 +1,29 @@
+#ifndef __RECORDING_PATCH_OSD_CONTROLLER_H
+#define __RECORDING_PATCH_OSD_CONTROLLER_H
@@ -532,9 +529,9 @@
+
+}
+#endif
-diff -Nru vdr-1.4.1-vanilla/recorder.c vdr-1.4.1-subtitles/recorder.c
---- vdr-1.4.1-vanilla/recorder.c 2006-06-11 13:17:40.000000000 +0300
-+++ vdr-1.4.1-subtitles/recorder.c 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/recorder.c vdr-1.4.5/recorder.c
+--- vdr-1.4.5~/recorder.c 2007-01-30 20:59:57.000000000 +0100
++++ vdr-1.4.5/recorder.c 2007-01-30 21:03:04.000000000 +0100
@@ -11,6 +11,7 @@
#include <stdarg.h>
#include <stdio.h>
@@ -612,9 +609,9 @@
}
cRecorder::~cRecorder()
-diff -Nru vdr-1.4.1-vanilla/recorder.h vdr-1.4.1-subtitles/recorder.h
---- vdr-1.4.1-vanilla/recorder.h 2006-06-11 13:17:40.000000000 +0300
-+++ vdr-1.4.1-subtitles/recorder.h 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/recorder.h vdr-1.4.5/recorder.h
+--- vdr-1.4.5~/recorder.h 2005-08-13 13:31:18.000000000 +0200
++++ vdr-1.4.5/recorder.h 2007-01-30 20:59:58.000000000 +0100
@@ -15,6 +15,7 @@
#include "remux.h"
#include "ringbuffer.h"
@@ -632,9 +629,9 @@
// Creates a new recorder that requires conditional access Ca, has
// the given Priority and will record the given PIDs into the file FileName.
virtual ~cRecorder();
-diff -Nru vdr-1.4.1-vanilla/remux.c vdr-1.4.1-subtitles/remux.c
---- vdr-1.4.1-vanilla/remux.c 2006-06-11 13:17:40.000000000 +0300
-+++ vdr-1.4.1-subtitles/remux.c 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/remux.c vdr-1.4.5/remux.c
+--- vdr-1.4.5~/remux.c 2006-12-01 15:46:25.000000000 +0100
++++ vdr-1.4.5/remux.c 2007-01-30 20:59:58.000000000 +0100
@@ -1413,6 +1413,9 @@
//pts_dts flags
#define PTS_ONLY 0x80
@@ -763,10 +760,10 @@
}
cRemux::~cRemux()
-diff -Nru vdr-1.4.1-vanilla/vdr.c vdr-1.4.1-subtitles/vdr.c
---- vdr-1.4.1-vanilla/vdr.c 2006-06-11 13:17:40.000000000 +0300
-+++ vdr-1.4.1-subtitles/vdr.c 2006-06-11 13:19:10.000000000 +0300
-@@ -960,7 +960,7 @@
+diff -urNad vdr-1.4.5~/vdr.c vdr-1.4.5/vdr.c
+--- vdr-1.4.5~/vdr.c 2007-01-30 20:59:57.000000000 +0100
++++ vdr-1.4.5/vdr.c 2007-01-30 20:59:58.000000000 +0100
+@@ -979,7 +979,7 @@
}
else
cDevice::PrimaryDevice()->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
@@ -775,9 +772,9 @@
Menu = cDisplayVolume::Create();
cDisplayVolume::Process(key);
key = kNone; // nobody else needs to see these keys
-diff -Nru vdr-1.4.1-vanilla/vdrttxtsubshooks.c vdr-1.4.1-subtitles/vdrttxtsubshooks.c
---- vdr-1.4.1-vanilla/vdrttxtsubshooks.c 1970-01-01 02:00:00.000000000 +0200
-+++ vdr-1.4.1-subtitles/vdrttxtsubshooks.c 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/vdrttxtsubshooks.c vdr-1.4.5/vdrttxtsubshooks.c
+--- vdr-1.4.5~/vdrttxtsubshooks.c 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.4.5/vdrttxtsubshooks.c 2007-01-30 20:59:58.000000000 +0100
@@ -0,0 +1,44 @@
+
+#include <stdlib.h>
@@ -823,9 +820,9 @@
+ return &gProxy;
+}
+
-diff -Nru vdr-1.4.1-vanilla/vdrttxtsubshooks.h vdr-1.4.1-subtitles/vdrttxtsubshooks.h
---- vdr-1.4.1-vanilla/vdrttxtsubshooks.h 1970-01-01 02:00:00.000000000 +0200
-+++ vdr-1.4.1-subtitles/vdrttxtsubshooks.h 2006-06-11 13:19:10.000000000 +0300
+diff -urNad vdr-1.4.5~/vdrttxtsubshooks.h vdr-1.4.5/vdrttxtsubshooks.h
+--- vdr-1.4.5~/vdrttxtsubshooks.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.4.5/vdrttxtsubshooks.h 2007-01-30 20:59:58.000000000 +0100
@@ -0,0 +1,36 @@
+
+#ifndef __VDRTTXTSUBSHOOKS_H
More information about the pkg-vdr-dvb-changes
mailing list