[vdr] Update to 2.0.4.
Ville Skyttä
scop at fedoraproject.org
Wed Oct 23 16:56:50 UTC 2013
commit de1f536f66b3407e0a0ce4083d31a2c3ae692c0d
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Wed Oct 23 19:56:50 2013 +0300
Update to 2.0.4.
sources | 4 +-
...ks101.patch => vdr-2.0.4-mainmenuhooks101.patch | 22 +++---
...aludump-0.1.diff => vdr-2.0.4-naludump-0.1.diff | 70 +++++++++-----------
vdr.spec | 13 ++--
4 files changed, 52 insertions(+), 57 deletions(-)
---
diff --git a/sources b/sources
index 29fa9d8..ff72f2d 100644
--- a/sources
+++ b/sources
@@ -3,7 +3,7 @@
04511ae02243eb1bab94f3f45b59e574 vdr-timer-info-0.5-1.7.13.diff
71f7281d55eba1957f4267f596b11e29 vdr.epgsearch-exttimeredit-0.0.2.diff
da3a3ab8c2a42a320171b1648c3b3258 vdr-1.7.29-hlcutter-0.2.3.diff
-c1389b2902865fbda904f82c52b8b7d5 vdr_1.7.28-1.debian.tar.bz2
239727ecce9a79e146aa4ca7866a0e1e vdr-1.7.40-ttxtsubs.patch
-dd8fb1642bdfa7feb0e9a8ae41e9ef2f vdr-2.0.3.tar.bz2
6fe5d740c7fdb12af842de9c47b80fe8 vdr-2.0.3-vasarajanauloja.patch.gz
+d76b06a7bf1f458a02f2d1169776fb7f vdr_2.0.3-1.debian.tar.bz2
+8effb19fe09eb6c057ce354fe8f6be9f vdr-2.0.4.tar.bz2
diff --git a/vdr-1.7.38-mainmenuhooks101.patch b/vdr-2.0.4-mainmenuhooks101.patch
similarity index 86%
rename from vdr-1.7.38-mainmenuhooks101.patch
rename to vdr-2.0.4-mainmenuhooks101.patch
index 17fe14e..b7b2a5c 100644
--- a/vdr-1.7.38-mainmenuhooks101.patch
+++ b/vdr-2.0.4-mainmenuhooks101.patch
@@ -1,6 +1,6 @@
-diff -up vdr-1.7.38/config.h~ vdr-1.7.38/config.h
---- vdr-1.7.38/config.h~ 2013-02-14 17:13:59.000000000 +0200
-+++ vdr-1.7.38/config.h 2013-02-17 21:52:27.944334138 +0200
+diff -up vdr-2.0.4/config.h~ vdr-2.0.4/config.h
+--- vdr-2.0.4/config.h~ 2013-09-07 13:25:10.000000000 +0300
++++ vdr-2.0.4/config.h 2013-10-23 19:43:24.731445495 +0300
@@ -47,6 +47,10 @@
#define TIMERMACRO_TITLE "TITLE"
#define TIMERMACRO_EPISODE "EPISODE"
@@ -12,10 +12,10 @@ diff -up vdr-1.7.38/config.h~ vdr-1.7.38/config.h
#define MINOSDWIDTH 480
#define MAXOSDWIDTH 1920
#define MINOSDHEIGHT 324
-diff -up vdr-1.7.38/menu.c~ vdr-1.7.38/menu.c
---- vdr-1.7.38/menu.c~ 2013-02-17 15:17:49.000000000 +0200
-+++ vdr-1.7.38/menu.c 2013-02-17 21:52:27.946334168 +0200
-@@ -3374,15 +3374,31 @@ cMenuMain::cMenuMain(eOSState State)
+diff -up vdr-2.0.4/menu.c~ vdr-2.0.4/menu.c
+--- vdr-2.0.4/menu.c~ 2013-10-16 12:46:24.000000000 +0300
++++ vdr-2.0.4/menu.c 2013-10-23 19:43:24.275436244 +0300
+@@ -3377,15 +3377,31 @@ cMenuMain::cMenuMain(eOSState State, boo
// Initial submenus:
@@ -24,7 +24,7 @@ diff -up vdr-1.7.38/menu.c~ vdr-1.7.38/menu.c
- case osSchedule: AddSubMenu(new cMenuSchedule); break;
- case osChannels: AddSubMenu(new cMenuChannels); break;
- case osTimers: AddSubMenu(new cMenuTimers); break;
-- case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break;
+- case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, OpenSubMenus)); break;
- case osSetup: AddSubMenu(new cMenuSetup); break;
- case osCommands: AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break;
+ case osSchedule:
@@ -41,7 +41,7 @@ diff -up vdr-1.7.38/menu.c~ vdr-1.7.38/menu.c
+ break;
+ case osRecordings:
+ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osRecordings", &menu))
-+ menu = new cMenuRecordings(NULL, 0, true);
++ menu = new cMenuRecordings(NULL, 0, OpenSubMenus);
+ break;
+ case osSetup: menu = new cMenuSetup; break;
+ case osCommands: menu = new cMenuCommands(tr("Commands"), &Commands); break;
@@ -53,7 +53,7 @@ diff -up vdr-1.7.38/menu.c~ vdr-1.7.38/menu.c
}
cOsdObject *cMenuMain::PluginOsdObject(void)
-@@ -3490,13 +3506,34 @@ eOSState cMenuMain::ProcessKey(eKeys Key
+@@ -3493,13 +3509,34 @@ eOSState cMenuMain::ProcessKey(eKeys Key
eOSState state = cOsdMenu::ProcessKey(Key);
HadSubMenu |= HasSubMenu();
@@ -94,7 +94,7 @@ diff -up vdr-1.7.38/menu.c~ vdr-1.7.38/menu.c
case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {
cOsdItem *item = Get(Current());
if (item) {
-@@ -3548,6 +3585,12 @@ eOSState cMenuMain::ProcessKey(eKeys Key
+@@ -3551,6 +3588,12 @@ eOSState cMenuMain::ProcessKey(eKeys Key
default: break;
}
}
diff --git a/vdr-1.7.38-naludump-0.1.diff b/vdr-2.0.4-naludump-0.1.diff
similarity index 92%
rename from vdr-1.7.38-naludump-0.1.diff
rename to vdr-2.0.4-naludump-0.1.diff
index 88540f5..999c506 100644
--- a/vdr-1.7.38-naludump-0.1.diff
+++ b/vdr-2.0.4-naludump-0.1.diff
@@ -1,8 +1,7 @@
-diff --git a/config.c b/config.c
-index 168af2e..3023b7b 100644
---- a/config.c
-+++ b/config.c
-@@ -455,6 +455,7 @@ cSetup::cSetup(void)
+diff -up vdr-2.0.4/config.c~ vdr-2.0.4/config.c
+--- vdr-2.0.4/config.c~ 2013-03-18 10:57:50.000000000 +0200
++++ vdr-2.0.4/config.c 2013-10-23 19:38:35.887688290 +0300
+@@ -456,6 +456,7 @@ cSetup::cSetup(void)
MaxVideoFileSize = MAXVIDEOFILESIZEDEFAULT;
SplitEditedFiles = 0;
DelTimeshiftRec = 0;
@@ -10,7 +9,7 @@ index 168af2e..3023b7b 100644
MinEventTimeout = 30;
MinUserInactivity = 300;
NextWakeupTime = 0;
-@@ -659,6 +660,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
+@@ -661,6 +662,7 @@ bool cSetup::Parse(const char *Name, con
else if (!strcasecmp(Name, "MaxVideoFileSize")) MaxVideoFileSize = atoi(Value);
else if (!strcasecmp(Name, "SplitEditedFiles")) SplitEditedFiles = atoi(Value);
else if (!strcasecmp(Name, "DelTimeshiftRec")) DelTimeshiftRec = atoi(Value);
@@ -18,7 +17,7 @@ index 168af2e..3023b7b 100644
else if (!strcasecmp(Name, "MinEventTimeout")) MinEventTimeout = atoi(Value);
else if (!strcasecmp(Name, "MinUserInactivity")) MinUserInactivity = atoi(Value);
else if (!strcasecmp(Name, "NextWakeupTime")) NextWakeupTime = atoi(Value);
-@@ -767,6 +769,7 @@ bool cSetup::Save(void)
+@@ -770,6 +772,7 @@ bool cSetup::Save(void)
Store("MaxVideoFileSize", MaxVideoFileSize);
Store("SplitEditedFiles", SplitEditedFiles);
Store("DelTimeshiftRec", DelTimeshiftRec);
@@ -26,11 +25,10 @@ index 168af2e..3023b7b 100644
Store("MinEventTimeout", MinEventTimeout);
Store("MinUserInactivity", MinUserInactivity);
Store("NextWakeupTime", NextWakeupTime);
-diff --git a/config.h b/config.h
-index bba8f92..664f1ea 100644
---- a/config.h
-+++ b/config.h
-@@ -319,6 +319,7 @@ public:
+diff -up vdr-2.0.4/config.h~ vdr-2.0.4/config.h
+--- vdr-2.0.4/config.h~ 2013-09-07 13:25:10.000000000 +0300
++++ vdr-2.0.4/config.h 2013-10-23 19:38:36.335697544 +0300
+@@ -320,6 +320,7 @@ public:
int MaxVideoFileSize;
int SplitEditedFiles;
int DelTimeshiftRec;
@@ -38,11 +36,10 @@ index bba8f92..664f1ea 100644
int MinEventTimeout, MinUserInactivity;
time_t NextWakeupTime;
int MultiSpeedMode;
-diff --git a/menu.c b/menu.c
-index f1d0288..102c239 100644
---- a/menu.c
-+++ b/menu.c
-@@ -3142,6 +3142,7 @@ cMenuSetupRecord::cMenuSetupRecord(void)
+diff -up vdr-2.0.4/menu.c~ vdr-2.0.4/menu.c
+--- vdr-2.0.4/menu.c~ 2013-10-16 12:46:24.000000000 +0300
++++ vdr-2.0.4/menu.c 2013-10-23 19:38:36.767706478 +0300
+@@ -3145,6 +3145,7 @@ cMenuSetupRecord::cMenuSetupRecord(void)
Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZETS));
Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"), &data.SplitEditedFiles));
Add(new cMenuEditStraItem(tr("Setup.Recording$Delete timeshift recording"),&data.DelTimeshiftRec, 3, delTimeshiftRecTexts));
@@ -50,11 +47,10 @@ index f1d0288..102c239 100644
}
// --- cMenuSetupReplay ------------------------------------------------------
-diff --git a/recorder.c b/recorder.c
-index eccba0d..2258840 100644
---- a/recorder.c
-+++ b/recorder.c
-@@ -46,6 +46,14 @@ cRecorder::cRecorder(const char *FileName, const cChannel *Channel, int Priority
+diff -up vdr-2.0.4/recorder.c~ vdr-2.0.4/recorder.c
+--- vdr-2.0.4/recorder.c~ 2013-10-12 15:10:05.000000000 +0300
++++ vdr-2.0.4/recorder.c 2013-10-23 19:37:55.478852843 +0300
+@@ -46,6 +46,14 @@ cRecorder::cRecorder(const char *FileNam
Type = 0x06;
}
frameDetector = new cFrameDetector(Pid, Type);
@@ -69,7 +65,7 @@ index eccba0d..2258840 100644
index = NULL;
fileSize = 0;
lastDiskSpaceCheck = time(NULL);
-@@ -67,6 +75,12 @@ cRecorder::cRecorder(const char *FileName, const cChannel *Channel, int Priority
+@@ -67,6 +75,12 @@ cRecorder::cRecorder(const char *FileNam
cRecorder::~cRecorder()
{
Detach();
@@ -82,7 +78,7 @@ index eccba0d..2258840 100644
delete index;
delete fileName;
delete frameDetector;
-@@ -155,11 +169,32 @@ void cRecorder::Action(void)
+@@ -155,11 +169,31 @@ void cRecorder::Action(void)
fileSize += TS_SIZE;
}
}
@@ -115,14 +111,12 @@ index eccba0d..2258840 100644
+ fileSize += Count;
}
- fileSize += Count;
-+
- t = time(NULL);
+ t.Set(MAXBROKENTIMEOUT);
}
}
-diff --git a/recorder.h b/recorder.h
-index b92c93a..e64cdca 100644
---- a/recorder.h
-+++ b/recorder.h
+diff -up vdr-2.0.4/recorder.h~ vdr-2.0.4/recorder.h
+--- vdr-2.0.4/recorder.h~ 2010-12-27 13:17:04.000000000 +0200
++++ vdr-2.0.4/recorder.h 2013-10-23 19:38:37.191715241 +0300
@@ -21,6 +21,7 @@ private:
cRingBufferLinear *ringBuffer;
cFrameDetector *frameDetector;
@@ -131,10 +125,9 @@ index b92c93a..e64cdca 100644
cFileName *fileName;
cIndexFile *index;
cUnbufferedFile *recordFile;
-diff --git a/remux.c b/remux.c
-index 8b0f6d8..fee1cdd 100644
---- a/remux.c
-+++ b/remux.c
+diff -up vdr-2.0.4/remux.c~ vdr-2.0.4/remux.c
+--- vdr-2.0.4/remux.c~ 2013-03-03 12:37:58.000000000 +0200
++++ vdr-2.0.4/remux.c 2013-10-23 19:38:37.615724006 +0300
@@ -312,6 +312,42 @@ bool cTsPayload::Find(uint32_t Code)
return false;
}
@@ -178,7 +171,7 @@ index 8b0f6d8..fee1cdd 100644
// --- cPatPmtGenerator ------------------------------------------------------
cPatPmtGenerator::cPatPmtGenerator(const cChannel *Channel)
-@@ -1493,3 +1529,344 @@ int cFrameDetector::Analyze(const uchar *Data, int Length)
+@@ -1493,3 +1529,344 @@ int cFrameDetector::Analyze(const uchar
}
return Processed;
}
@@ -523,10 +516,9 @@ index 8b0f6d8..fee1cdd 100644
+ OutLength = (OutEnd - Out);
+ return OutLength > 0 ? Out : NULL;
+}
-diff --git a/remux.h b/remux.h
-index 6b3a982..3c7e152 100644
---- a/remux.h
-+++ b/remux.h
+diff -up vdr-2.0.4/remux.h~ vdr-2.0.4/remux.h
+--- vdr-2.0.4/remux.h~ 2013-01-20 13:43:59.000000000 +0200
++++ vdr-2.0.4/remux.h 2013-10-23 19:38:38.039732768 +0300
@@ -62,6 +62,11 @@ inline bool TsHasPayload(const uchar *p)
return p[3] & TS_PAYLOAD_EXISTS;
}
diff --git a/vdr.spec b/vdr.spec
index d8a8625..df7fe81 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -23,7 +23,7 @@
%global apiver 2.0.0
Name: vdr
-Version: 2.0.3
+Version: 2.0.4
Release: 1%{?dist}
Summary: Video Disk Recorder
@@ -47,7 +47,7 @@ Source14: %{name}-shutdown.sh
Source15: %{name}-moveto.sh
Source16: %{name}-CHANGES.package.old
Source17: %{name}.macros
-Source18: http://cdn.debian.net/debian/pool/main/v/vdr/vdr_1.7.28-1.debian.tar.bz2
+Source18: http://cdn.debian.net/debian/pool/main/v/vdr/vdr_2.0.3-1.debian.tar.bz2
Source19: %{name}-check-setup.sh
Source20: %{name}-rcu.conf
Patch0: %{name}-channel+epg.patch
@@ -66,10 +66,10 @@ Patch8: %{name}-1.7.28-vasarajanauloja-jumpplay.patch
# http://www.udo-richter.de/vdr/patches.en.html#hlcutter
Patch9: http://www.udo-richter.de/vdr/files/vdr-1.7.29-hlcutter-0.2.3.diff
# http://www.udo-richter.de/vdr/naludump.en.html
-# Updated version sent upstream 2013-02-27
-Patch10: %{name}-1.7.38-naludump-0.1.diff
+# This updated version sent upstream 2013-10-23
+Patch10: %{name}-2.0.4-naludump-0.1.diff
# http://article.gmane.org/gmane.linux.vdr/43590
-Patch11: %{name}-1.7.38-mainmenuhooks101.patch
+Patch11: %{name}-2.0.4-mainmenuhooks101.patch
# http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/timercmd-0.1_1.7.17.diff
# Modified so that it applies over the timer-info patch
Patch12: %{name}-1.7.21-timercmd.patch
@@ -525,6 +525,9 @@ systemctl daemon-reload &>/dev/null
%changelog
+* Wed Oct 23 2013 Ville Skyttä <ville.skytta at iki.fi> - 2.0.4-1
+- Update to 2.0.4.
+
* Mon Sep 2 2013 Ville Skyttä <ville.skytta at iki.fi> - 2.0.3-1
- Update to 2.0.3.
More information about the scm-commits
mailing list