[vdr] Update to 1.7.25; RCU functionality split into -rcu plugin subpackage.
Ville Skyttä
scop at fedoraproject.org
Tue Mar 6 20:27:31 UTC 2012
commit cfc0752a4c3749d72a71414e53560a3020f11fae
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Tue Mar 6 22:27:10 2012 +0200
Update to 1.7.25; RCU functionality split into -rcu plugin subpackage.
sources | 5 +-
vdr-1.7.24-50fps-reload.patch | 12 --
vdr-1.7.24-dvbplayer-revert.diff | 122 --------------------
....21-jumpplay.patch => vdr-1.7.25-jumpplay.patch | 90 ++++++--------
vdr-1.7.25-mainmenuhooks101.patch | 109 +++++++++++++++++
vdr-rcu.conf | 5 +
vdr.spec | 46 +++++---
7 files changed, 187 insertions(+), 202 deletions(-)
---
diff --git a/sources b/sources
index 8599dc8..c5af897 100644
--- a/sources
+++ b/sources
@@ -1,10 +1,9 @@
3e9287f726df5a667054a15078235791 vdr_1.4.5-2.ds.diff.gz
-c34d06b00218d3c04f5bbca3fc773535 MainMenuHooks-v1_0_1.diff.gz
49db9691fe6023270d443a62bab0411b vdr-1.5.17-progressbar-support-0.0.1.diff
fae3698214bd45de1f675c2b037d5f3b vdr-1.7.21-ttxtsubs.patch
04511ae02243eb1bab94f3f45b59e574 vdr-timer-info-0.5-1.7.13.diff
71f7281d55eba1957f4267f596b11e29 vdr.epgsearch-exttimeredit-0.0.2.diff
925d44ca8a2d10a4b84f1d47e617fc46 vdr-1.7.22-hlcutter-0.2.2.diff
-a034c5e399417dfc583483f650d003ee vdr-1.7.24.tar.bz2
d40db7bea1b9af94d7625e611ef3dae2 vdr_1.7.23-1.debian.tar.bz2
-a0dfb753f9ff11ee43038a3a3a6ac31d vdr-1.7.24-liemikuutio-1.33.patch.gz
+a3fd482a3dd8027706d4f32a88c6bd13 vdr-1.7.25.tar.bz2
+c9244542ededd068e7417d1697e58271 vdr-1.7.25-liemikuutio-1.34.patch.gz
diff --git a/vdr-1.7.21-jumpplay.patch b/vdr-1.7.25-jumpplay.patch
similarity index 78%
rename from vdr-1.7.21-jumpplay.patch
rename to vdr-1.7.25-jumpplay.patch
index a645b7c..15020e3 100644
--- a/vdr-1.7.21-jumpplay.patch
+++ b/vdr-1.7.25-jumpplay.patch
@@ -1,9 +1,9 @@
-diff -up vdr-1.7.21/config.c~ vdr-1.7.21/config.c
---- vdr-1.7.21/config.c~ 2011-10-19 20:51:42.842811197 +0300
-+++ vdr-1.7.21/config.c 2011-10-19 20:53:39.408658278 +0300
-@@ -393,6 +393,9 @@ cSetup::cSetup(void)
- MultiSpeedMode = 0;
+diff -up vdr-1.7.25/config.c~ vdr-1.7.25/config.c
+--- vdr-1.7.25/config.c~ 2012-02-29 12:15:54.000000000 +0200
++++ vdr-1.7.25/config.c 2012-03-04 19:47:50.695755608 +0200
+@@ -454,6 +454,9 @@ cSetup::cSetup(void)
ShowReplayMode = 0;
+ ShowRemainingTime = 0;
ResumeID = 0;
+ JumpPlay = 0;
+ PlayJump = 0;
@@ -11,9 +11,9 @@ diff -up vdr-1.7.21/config.c~ vdr-1.7.21/config.c
CurrentChannel = -1;
CurrentVolume = MAXVOLUME;
CurrentDolby = 0;
-@@ -586,6 +589,9 @@ bool cSetup::Parse(const char *Name, con
- else if (!strcasecmp(Name, "MultiSpeedMode")) MultiSpeedMode = atoi(Value);
+@@ -648,6 +651,9 @@ bool cSetup::Parse(const char *Name, con
else if (!strcasecmp(Name, "ShowReplayMode")) ShowReplayMode = atoi(Value);
+ else if (!strcasecmp(Name, "ShowRemainingTime")) ShowRemainingTime = atoi(Value);
else if (!strcasecmp(Name, "ResumeID")) ResumeID = atoi(Value);
+ else if (!strcasecmp(Name, "JumpPlay")) JumpPlay = atoi(Value);
+ else if (!strcasecmp(Name, "PlayJump")) PlayJump = atoi(Value);
@@ -21,9 +21,9 @@ diff -up vdr-1.7.21/config.c~ vdr-1.7.21/config.c
else if (!strcasecmp(Name, "CurrentChannel")) CurrentChannel = atoi(Value);
else if (!strcasecmp(Name, "CurrentVolume")) CurrentVolume = atoi(Value);
else if (!strcasecmp(Name, "CurrentDolby")) CurrentDolby = atoi(Value);
-@@ -683,6 +689,9 @@ bool cSetup::Save(void)
- Store("MultiSpeedMode", MultiSpeedMode);
+@@ -745,6 +751,9 @@ bool cSetup::Save(void)
Store("ShowReplayMode", ShowReplayMode);
+ Store("ShowRemainingTime", ShowRemainingTime);
Store("ResumeID", ResumeID);
+ Store("JumpPlay", JumpPlay);
+ Store("PlayJump", PlayJump);
@@ -31,21 +31,21 @@ diff -up vdr-1.7.21/config.c~ vdr-1.7.21/config.c
Store("CurrentChannel", CurrentChannel);
Store("CurrentVolume", CurrentVolume);
Store("CurrentDolby", CurrentDolby);
-diff -up vdr-1.7.21/config.h~ vdr-1.7.21/config.h
---- vdr-1.7.21/config.h~ 2011-10-19 20:51:42.843811290 +0300
-+++ vdr-1.7.21/config.h 2011-10-19 20:53:38.807602345 +0300
-@@ -36,6 +36,8 @@
- // plugins to work with newer versions of the core VDR as long as no
- // VDR header files have changed.
+diff -up vdr-1.7.25/config.h~ vdr-1.7.25/config.h
+--- vdr-1.7.25/config.h~ 2012-02-29 14:28:01.000000000 +0200
++++ vdr-1.7.25/config.h 2012-03-04 19:47:50.264715834 +0200
+@@ -30,6 +30,8 @@
+ #define APIVERSION "1.7.25"
+ #define APIVERSNUM 10725 // Version * 10000 + Major * 100 + Minor
+#define JUMPPLAYVERSNUM 100
+
- #define LIEMIKUUTIO 133
-
- #define MAXPRIORITY 99
-@@ -287,6 +289,9 @@ public:
- int MultiSpeedMode;
+ // When loading plugins, VDR searches them by their APIVERSION, which
+ // may be smaller than VDRVERSION in case there have been no changes to
+ // VDR header files since the last APIVERSION. This allows compiled
+@@ -307,6 +309,9 @@ public:
int ShowReplayMode;
+ int ShowRemainingTime;
int ResumeID;
+ int JumpPlay;
+ int PlayJump;
@@ -53,9 +53,9 @@ diff -up vdr-1.7.21/config.h~ vdr-1.7.21/config.h
int CurrentChannel;
int CurrentVolume;
int CurrentDolby;
-diff -up vdr-1.7.21/dvbplayer.c~ vdr-1.7.21/dvbplayer.c
---- vdr-1.7.21/dvbplayer.c~ 2010-03-07 16:24:26.000000000 +0200
-+++ vdr-1.7.21/dvbplayer.c 2011-10-19 20:53:39.809695598 +0300
+diff -up vdr-1.7.25/dvbplayer.c~ vdr-1.7.25/dvbplayer.c
+--- vdr-1.7.25/dvbplayer.c~ 2012-02-21 13:34:04.000000000 +0200
++++ vdr-1.7.25/dvbplayer.c 2012-03-04 19:47:49.845677163 +0200
@@ -204,6 +204,7 @@ private:
cNonBlockingFileReader *nonBlockingFileReader;
cRingBufferFrame *ringBuffer;
@@ -64,15 +64,15 @@ diff -up vdr-1.7.21/dvbplayer.c~ vdr-1.7.21/dvbplayer.c
cFileName *fileName;
cIndexFile *index;
cUnbufferedFile *replayFile;
-@@ -282,6 +283,7 @@ cDvbPlayer::cDvbPlayer(const char *FileN
- delete index;
- index = NULL;
+@@ -286,6 +287,7 @@ cDvbPlayer::cDvbPlayer(const char *FileN
}
+ else if (PauseLive)
+ framesPerSecond = cRecording(FileName).FramesPerSecond(); // the fps rate might have changed from the default
+ marks.Load(FileName, framesPerSecond, isPesRecording);
}
cDvbPlayer::~cDvbPlayer()
-@@ -360,6 +362,10 @@ bool cDvbPlayer::Save(void)
+@@ -364,6 +366,10 @@ bool cDvbPlayer::Save(void)
if (index) {
int Index = ptsIndex.FindIndex(DeviceGetSTC());
if (Index >= 0) {
@@ -83,7 +83,7 @@ diff -up vdr-1.7.21/dvbplayer.c~ vdr-1.7.21/dvbplayer.c
Index -= int(round(RESUMEBACKUP * framesPerSecond));
if (Index > 0)
Index = index->GetNextIFrame(Index, false);
-@@ -386,11 +392,26 @@ void cDvbPlayer::Action(void)
+@@ -390,11 +396,26 @@ void cDvbPlayer::Action(void)
{
uchar *p = NULL;
int pc = 0;
@@ -110,7 +110,7 @@ diff -up vdr-1.7.21/dvbplayer.c~ vdr-1.7.21/dvbplayer.c
nonBlockingFileReader = new cNonBlockingFileReader;
int Length = 0;
bool Sleep = false;
-@@ -415,7 +436,7 @@ void cDvbPlayer::Action(void)
+@@ -421,7 +442,7 @@ void cDvbPlayer::Action(void)
// Read the next frame from the file:
@@ -119,7 +119,7 @@ diff -up vdr-1.7.21/dvbplayer.c~ vdr-1.7.21/dvbplayer.c
if (!readFrame && (replayFile || readIndex >= 0)) {
if (!nonBlockingFileReader->Reading()) {
if (!SwitchToPlayFrame && (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))) {
-@@ -452,6 +473,44 @@ void cDvbPlayer::Action(void)
+@@ -458,6 +479,44 @@ void cDvbPlayer::Action(void)
else if (index) {
uint16_t FileNumber;
off_t FileOffset;
@@ -164,7 +164,7 @@ diff -up vdr-1.7.21/dvbplayer.c~ vdr-1.7.21/dvbplayer.c
if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent, &Length) && NextFile(FileNumber, FileOffset))
readIndex++;
else
-@@ -496,6 +555,13 @@ void cDvbPlayer::Action(void)
+@@ -502,6 +561,13 @@ void cDvbPlayer::Action(void)
// Store the frame in the buffer:
if (readFrame) {
@@ -178,7 +178,7 @@ diff -up vdr-1.7.21/dvbplayer.c~ vdr-1.7.21/dvbplayer.c
if (ringBuffer->Put(readFrame))
readFrame = NULL;
else
-@@ -561,8 +627,13 @@ void cDvbPlayer::Action(void)
+@@ -567,8 +633,13 @@ void cDvbPlayer::Action(void)
p = NULL;
}
}
@@ -193,12 +193,12 @@ diff -up vdr-1.7.21/dvbplayer.c~ vdr-1.7.21/dvbplayer.c
// Handle hitting begin/end of recording:
-diff -up vdr-1.7.21/menu.c~ vdr-1.7.21/menu.c
---- vdr-1.7.21/menu.c~ 2011-10-19 20:51:42.854812316 +0300
-+++ vdr-1.7.21/menu.c 2011-10-19 20:53:38.486572473 +0300
-@@ -3408,6 +3408,9 @@ cMenuSetupReplay::cMenuSetupReplay(void)
- Add(new cMenuEditBoolItem(tr("Setup.Replay$Multi speed mode"), &data.MultiSpeedMode));
+diff -up vdr-1.7.25/menu.c~ vdr-1.7.25/menu.c
+--- vdr-1.7.25/menu.c~ 2012-03-02 12:33:17.000000000 +0200
++++ vdr-1.7.25/menu.c 2012-03-04 19:47:49.414637381 +0200
+@@ -3125,6 +3125,9 @@ cMenuSetupReplay::cMenuSetupReplay(void)
Add(new cMenuEditBoolItem(tr("Setup.Replay$Show replay mode"), &data.ShowReplayMode));
+ Add(new cMenuEditBoolItem(tr("Setup.Replay$Show remaining time"), &data.ShowRemainingTime));
Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
+ Add(new cMenuEditBoolItem(tr("Setup.Replay$Jump&Play"), &data.JumpPlay));
+ Add(new cMenuEditBoolItem(tr("Setup.Replay$Play&Jump"), &data.PlayJump));
@@ -206,19 +206,7 @@ diff -up vdr-1.7.21/menu.c~ vdr-1.7.21/menu.c
}
void cMenuSetupReplay::Store(void)
-@@ -5007,8 +5010,10 @@ void cReplayControl::MarkToggle(void)
- ShowTimed(2);
- bool Play, Forward;
- int Speed;
-- if (GetReplayMode(Play, Forward, Speed) && !Play)
-+ if (GetReplayMode(Play, Forward, Speed) && !Play) {
- Goto(Current, true);
-+ displayFrames = true;
-+ }
- }
- marks.Save();
- }
-@@ -5021,8 +5026,17 @@ void cReplayControl::MarkJump(bool Forwa
+@@ -4711,8 +4714,17 @@ void cReplayControl::MarkJump(bool Forwa
if (GetIndex(Current, Total)) {
cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
if (m) {
@@ -238,7 +226,7 @@ diff -up vdr-1.7.21/menu.c~ vdr-1.7.21/menu.c
}
}
}
-@@ -5078,7 +5092,7 @@ void cReplayControl::EditTest(void)
+@@ -4768,7 +4780,7 @@ void cReplayControl::EditTest(void)
if (!m)
m = marks.GetNext(Current);
if (m) {
diff --git a/vdr-1.7.25-mainmenuhooks101.patch b/vdr-1.7.25-mainmenuhooks101.patch
new file mode 100644
index 0000000..261d984
--- /dev/null
+++ b/vdr-1.7.25-mainmenuhooks101.patch
@@ -0,0 +1,109 @@
+diff -up vdr-1.7.25/config.h.orig vdr-1.7.25/config.h
+--- vdr-1.7.25/config.h.orig 2012-02-29 14:28:01.000000000 +0200
++++ vdr-1.7.25/config.h 2012-03-05 23:08:53.494489224 +0200
+@@ -48,6 +48,10 @@
+ #define MINOSDHEIGHT 324
+ #define MAXOSDHEIGHT 1200
+
++// The MainMenuHook Patch's version number:
++#define MAINMENUHOOKSVERSION "1.0.1"
++#define MAINMENUHOOKSVERSNUM 10001 // Version * 10000 + Major * 100 + Minor
++
+ #define MaxFileName 256
+ #define MaxSkinName 16
+ #define MaxThemeName 16
+diff -up vdr-1.7.25/menu.c.orig vdr-1.7.25/menu.c
+--- vdr-1.7.25/menu.c.orig 2012-03-02 12:33:17.000000000 +0200
++++ vdr-1.7.25/menu.c 2012-03-05 23:09:11.957028651 +0200
+@@ -3324,15 +3324,31 @@ cMenuMain::cMenuMain(eOSState State)
+
+ // Initial submenus:
+
++ cOsdObject *menu = NULL;
+ switch (State) {
+- 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 osSetup: AddSubMenu(new cMenuSetup); break;
+- case osCommands: AddSubMenu(new cMenuCommands(tr("Commands"), &Commands)); break;
++ case osSchedule:
++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osSchedule", &menu))
++ menu = new cMenuSchedule;
++ break;
++ case osChannels:
++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osChannels", &menu))
++ menu = new cMenuChannels;
++ break;
++ case osTimers:
++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osTimers", &menu))
++ menu = new cMenuTimers;
++ break;
++ case osRecordings:
++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osRecordings", &menu))
++ menu = new cMenuRecordings(NULL, 0, true);
++ break;
++ case osSetup: menu = new cMenuSetup; break;
++ case osCommands: menu = new cMenuCommands(tr("Commands"), &Commands); break;
+ default: break;
+ }
++ if (menu)
++ if (menu->IsMenu())
++ AddSubMenu((cOsdMenu *) menu);
+ }
+
+ cOsdObject *cMenuMain::PluginOsdObject(void)
+@@ -3447,13 +3463,34 @@ eOSState cMenuMain::ProcessKey(eKeys Key
+ eOSState state = cOsdMenu::ProcessKey(Key);
+ HadSubMenu |= HasSubMenu();
+
++ cOsdObject *menu = NULL;
+ switch (state) {
+- case osSchedule: return AddSubMenu(new cMenuSchedule);
+- case osChannels: return AddSubMenu(new cMenuChannels);
+- case osTimers: return AddSubMenu(new cMenuTimers);
+- case osRecordings: return AddSubMenu(new cMenuRecordings);
+- case osSetup: return AddSubMenu(new cMenuSetup);
+- case osCommands: return AddSubMenu(new cMenuCommands(tr("Commands"), &Commands));
++ case osSchedule:
++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osSchedule", &menu))
++ menu = new cMenuSchedule;
++ else
++ state = osContinue;
++ break;
++ case osChannels:
++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osChannels", &menu))
++ menu = new cMenuChannels;
++ else
++ state = osContinue;
++ break;
++ case osTimers:
++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osTimers", &menu))
++ menu = new cMenuTimers;
++ else
++ state = osContinue;
++ break;
++ case osRecordings:
++ if (!cPluginManager::CallFirstService("MainMenuHooksPatch-v1.0::osRecordings", &menu))
++ menu = new cMenuRecordings;
++ else
++ state = osContinue;
++ break;
++ case osSetup: menu = new cMenuSetup; break;
++ case osCommands: menu = new cMenuCommands(tr("Commands"), &Commands); break;
+ case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {
+ cOsdItem *item = Get(Current());
+ if (item) {
+@@ -3505,6 +3542,12 @@ eOSState cMenuMain::ProcessKey(eKeys Key
+ default: break;
+ }
+ }
++ if (menu) {
++ if (menu->IsMenu())
++ return AddSubMenu((cOsdMenu *) menu);
++ pluginOsdObject = menu;
++ return osPlugin;
++ }
+ if (!HasSubMenu() && Update(HadSubMenu))
+ Display();
+ if (Key != kNone) {
diff --git a/vdr-rcu.conf b/vdr-rcu.conf
new file mode 100644
index 0000000..21a0a55
--- /dev/null
+++ b/vdr-rcu.conf
@@ -0,0 +1,5 @@
+# Configuration snippet for vdr-rcu -*- sh -*-
+#
+# Add command line options to pass to the rcu plugin to PLUGIN_OPTIONS.
+
+PLUGIN_OPTIONS=""
diff --git a/vdr.spec b/vdr.spec
index 109e180..d47a594 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -24,8 +24,8 @@
%global migrfile %{_var}/run/systemd-migr_%{name}-%{version}-%{release}.%{_arch}
Name: vdr
-Version: 1.7.24
-Release: 3%{?dist}
+Version: 1.7.25
+Release: 1%{?dist}
Summary: Video Disk Recorder
License: GPLv2+
@@ -50,9 +50,10 @@ Source16: %{name}-CHANGES.package.old
Source17: %{name}.macros
Source18: http://cdn.debian.net/debian/pool/main/v/vdr/vdr_1.7.23-1.debian.tar.bz2
Source19: %{name}-check-setup.sh
+Source20: %{name}-rcu.conf
Patch0: %{name}-channel+epg.patch
Patch1: http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr_1.4.5-2.ds.diff.gz
-Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.7.24-liemikuutio-1.33.patch.gz
+Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.7.25-liemikuutio-1.34.patch.gz
# Extracted from http://copperhead.htpc-forum.de/downloads/extensionpatch/extpngvdr1.7.21v1.diff.gz
Patch3: %{name}-1.7.21-plugin-missing.patch
Patch4: %{name}-1.7.22-paths.patch
@@ -62,27 +63,23 @@ Patch6: %{name}-1.5.18-syncearly.patch
Patch7: http://projects.vdr-developer.org/projects/plg-ttxtsubs/repository/revisions/master/raw/patches/vdr-1.7.21-ttxtsubs.patch
# Extracted from http://copperhead.htpc-forum.de/downloads/extensionpatch/extpngvdr1.7.21v1.diff.gz
# Original at http://toms-cafe.de/vdr/download/vdr-jumpplay-1.0-1.7.6.diff
-Patch8: %{name}-1.7.21-jumpplay.patch
+Patch8: %{name}-1.7.25-jumpplay.patch
# http://www.udo-richter.de/vdr/patches.en.html#hlcutter
Patch9: http://www.udo-richter.de/vdr/files/vdr-1.7.22-hlcutter-0.2.2.diff
# Sent to hlcutter upstream 2009-06-15 and 2011-10-16
Patch10: %{name}-1.7.21-hlcutter-0.2.2-finnish.patch
# http://article.gmane.org/gmane.linux.vdr/43590
-Patch11: MainMenuHooks-v1_0_1.diff.gz
+Patch11: %{name}-1.7.25-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
Patch13: http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/vdr-1.5.17-progressbar-support-0.0.1.diff
-# http://www.linuxtv.org/pipermail/vdr/2012-February/025786.html
-Patch14: %{name}-1.7.24-dvbplayer-revert.diff
Patch15: %{name}-1.7.21-fedora-pkgconfig.patch
Patch16: %{name}-1.7.21-jumpplay-finnish.patch
Patch17: http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/vdr.epgsearch-exttimeredit-0.0.2.diff
Patch18: %{name}-1.7.22-msgidbugs.patch
# http://projects.vdr-developer.org/issues/819
Patch19: %{name}-1.7.22-ttxtsubs-on.patch
-# http://www.linuxtv.org/pipermail/vdr/2012-February/025779.html
-Patch20: %{name}-1.7.24-50fps-reload.patch
BuildRequires: libjpeg-devel
BuildRequires: libcap-devel
@@ -157,6 +154,15 @@ Obsoletes: vdr < 1.7.11
The dvbsddevice plugin implements the output device for the "Full
Featured" DVB cards based on the TechnoTrend/Fujitsu-Siemens design.
+%package rcu
+Summary: VDR remote control unit plugin
+Requires: vdr(abi)%{?_isa} = %{apiver}
+# To get this subpackage pulled in on upgrades
+Obsoletes: vdr < 1.7.25
+
+%description rcu
+The rcu plugin implements a remote control unit for VDR.
+
%package skincurses
Summary: Shell window skin plugin for VDR
BuildRequires: ncurses-devel
@@ -191,22 +197,20 @@ sed \
%patch5 -p1
# TODO: does not apply
#patch6 -p0
-%patch7 -p1 -F 1
-%patch8 -p1 -F 2
+%patch7 -p1 -F 2
+%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p1 -F 2
+%patch11 -p1
%patch12 -p1
# TODO: does not apply
#patch13 -p1
-%patch14 -p1
%patch15 -p0
%patch16 -p1
# TODO: build failure
#patch17 -p0 -F 3
%patch18 -p1
%patch19 -p1
-%patch20 -p1
for f in CONTRIBUTORS HISTORY UPDATE-1.4.0 README.timer-info ; do
iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -286,6 +290,7 @@ make %{?_smp_mflags} i18n LOCALEDIR=./locale
make %{?_smp_mflags} -C PLUGINS/src/dvbhddevice LIBDIR=. all
make %{?_smp_mflags} -C PLUGINS/src/dvbsddevice LIBDIR=. all
+make %{?_smp_mflags} -C PLUGINS/src/rcu LIBDIR=. all
make %{?_smp_mflags} -C PLUGINS/src/skincurses LIBDIR=. all
%if %{with docs}
@@ -404,6 +409,11 @@ install -pm 755 PLUGINS/src/dvbsddevice/libvdr-dvbsddevice.so.%{apiver} \
install -pm 644 %{SOURCE8} \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/dvbsddevice.conf
+install -pm 755 PLUGINS/src/rcu/libvdr-rcu.so.%{apiver} \
+ $RPM_BUILD_ROOT%{plugindir}
+install -pm 644 %{SOURCE20} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/rcu.conf
+
install -pm 755 PLUGINS/src/skincurses/libvdr-skincurses.so.%{apiver} \
$RPM_BUILD_ROOT%{plugindir}
install -pm 644 %{SOURCE11} \
@@ -525,6 +535,11 @@ rm -f %{migrfile} &>/dev/null || :
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/dvbsddevice.conf
%{plugindir}/libvdr-dvbsddevice.so.%{apiver}
+%files rcu
+%doc PLUGINS/src/rcu/COPYING PLUGINS/src/rcu/HISTORY PLUGINS/src/rcu/README
+%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/rcu.conf
+%{plugindir}/libvdr-rcu.so.%{apiver}
+
%files skincurses -f %{name}-skincurses.lang
%doc PLUGINS/src/skincurses/COPYING PLUGINS/src/skincurses/HISTORY
%doc PLUGINS/src/skincurses/README
@@ -533,6 +548,9 @@ rm -f %{migrfile} &>/dev/null || :
%changelog
+* Tue Mar 6 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7.25-1
+- Update to 1.7.25; RCU functionality split into -rcu plugin subpackage.
+
* Tue Feb 21 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7.24-3
- Apply upstream dvbplayer 50fps reload patch.
More information about the scm-commits
mailing list