From 72a2fe4080ea13847e4d46d3540b65125693c29f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:24:47 +0000 Subject: [PATCH 01/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index e2fdf80..8383c17 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide Version: 1.2.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin Group: Applications/Multimedia License: GPLv2+ @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.2.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.2.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 107d305b03a0bfa4aa21d1ccb980c4a90590a811 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:28:35 +0000 Subject: [PATCH 02/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 8383c17..e748e86 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide Version: 1.2.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin Group: Applications/Multimedia License: GPLv2+ @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.2.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.2.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 1385cc4092d158ab5c94c0a7ad7bc8857cd3b8ae Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 19 Jul 2018 20:56:42 +0200 Subject: [PATCH 03/69] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- vdr-tvguide.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index e748e86..adba622 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -9,6 +9,7 @@ Source0: http://projects.vdr-developer.org/attachments/download/1624/%{na # Configuration files for plugin parameters. These are Fedora specific and not in upstream. Source1: %{name}.conf +BuildRequires: gcc-c++ BuildRequires: GraphicsMagick-c++-devel BuildRequires: vdr-devel >= 2.0.0 Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} From e58161829f3d61fbe8306aaa7a900d585c7c8e71 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 21 Jul 2018 19:01:19 +0200 Subject: [PATCH 04/69] Fix FTBFS due missing BR gcc (RHBZ#1606892) Add vdr-2.3.1-tvguide.diff Add vdr-2.3.5-tvguide.diff Add vdr-2.3.7-tvguide.diff --- .gitignore | 1 + sources | 3 ++- vdr-tvguide.spec | 15 ++++++++++++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b279849..d7d800d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /vdr-tvguide-1.2.0.tgz /vdr-tvguide-1.2.1.tgz /vdr-tvguide-1.2.2.tgz +/vdr-tvguide.conf diff --git a/sources b/sources index bbccfc7..31a5d72 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -1e811e1a99f68afd8f85f56fd416a0f1 vdr-tvguide-1.2.2.tgz +SHA512 (vdr-tvguide-1.2.2.tgz) = 53b57a34a8816235366754b0e12bc574188c5602f302b68b09cc9c13c369b22799738f28e0d50dab66d485c7591bcc8b2c168c4cf5ad15cd822479148f4bd5d9 +SHA512 (vdr-tvguide.conf) = c8e4577fc3d236c7446022a01c58622d7d867d0e3ca8457f979febe1a09320daf84982e77bd630b952437d02a442950add488fe024986d4139e251cc397827dc diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index adba622..2075407 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide Version: 1.2.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin Group: Applications/Multimedia License: GPLv2+ @@ -8,7 +8,10 @@ URL: http://projects.vdr-developer.org/projects/plg-tvguide Source0: http://projects.vdr-developer.org/attachments/download/1624/%{name}-%{version}.tgz # Configuration files for plugin parameters. These are Fedora specific and not in upstream. Source1: %{name}.conf - +Patch1: vdr-2.3.1-tvguide.diff +Patch2: vdr-2.3.5-tvguide.diff +Patch3: vdr-2.3.7-tvguide.diff +BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: GraphicsMagick-c++-devel BuildRequires: vdr-devel >= 2.0.0 @@ -18,7 +21,7 @@ Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} VDR plugin: tvguide - %{summary} %prep -%setup -qn tvguide-%{version} +%autosetup -p1 -n tvguide-%{version} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build @@ -45,6 +48,12 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Jul 21 2018 Martin Gansser - 1.2.2-16 +- Fix FTBFS due missing BR gcc (RHBZ#1606892) +- Add vdr-2.3.1-tvguide.diff +- Add vdr-2.3.5-tvguide.diff +- Add vdr-2.3.7-tvguide.diff + * Sat Jul 14 2018 Fedora Release Engineering - 1.2.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 160720acc609c89c738cb0cae832cfd278ce6287 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 21 Jul 2018 19:07:44 +0200 Subject: [PATCH 05/69] Fix FTBFS due missing BR gcc (RHBZ#1606892) Add vdr-2.3.1-tvguide.diff Add vdr-2.3.5-tvguide.diff Add vdr-2.3.7-tvguide.diff --- vdr-2.3.1-tvguide.diff | 1228 ++++++++++++++++++++++++++++++++++++++++ vdr-2.3.5-tvguide.diff | 154 +++++ vdr-2.3.7-tvguide.diff | 14 + 3 files changed, 1396 insertions(+) create mode 100644 vdr-2.3.1-tvguide.diff create mode 100644 vdr-2.3.5-tvguide.diff create mode 100644 vdr-2.3.7-tvguide.diff diff --git a/vdr-2.3.1-tvguide.diff b/vdr-2.3.1-tvguide.diff new file mode 100644 index 0000000..bed5e5c --- /dev/null +++ b/vdr-2.3.1-tvguide.diff @@ -0,0 +1,1228 @@ +Index: b/channelcolumn.c +=================================================================== +--- a/channelcolumn.c ++++ b/channelcolumn.c +@@ -5,9 +5,15 @@ + this->channel = channel; + this->num = num; + this->myTime = myTime; ++#if VDRVERSNUM > 20300 ++ setTimer(); ++#else + hasTimer = channel->HasTimer(); ++#endif + hasSwitchTimer = SwitchTimers.ChannelInSwitchList(channel); ++#if VDRVERSNUM < 20300 + schedulesLock = new cSchedulesLock(false, 100); ++#endif + header = NULL; + } + +@@ -15,7 +21,9 @@ + if (header) + delete header; + grids.Clear(); ++#if VDRVERSNUM < 20300 + delete schedulesLock; ++#endif + } + + void cChannelColumn::clearGrids() { +@@ -33,7 +41,12 @@ + } + + bool cChannelColumn::readGrids() { ++#if VDRVERSNUM > 20300 ++ LOCK_SCHEDULES_READ; ++ schedules = Schedules; ++#else + schedules = cSchedules::Schedules(*schedulesLock); ++#endif + const cSchedule *Schedule = NULL; + Schedule = schedules->GetSchedule(channel); + if (!Schedule) { +@@ -186,7 +199,12 @@ + return; + } + //if not, i have to add new ones to the list ++#if VDRVERSNUM > 2030 ++ LOCK_SCHEDULES_READ; ++ schedules = Schedules; ++#else + schedules = cSchedules::Schedules(*schedulesLock); ++#endif + const cSchedule *Schedule = NULL; + Schedule = schedules->GetSchedule(channel); + if (!Schedule) { +@@ -234,7 +252,12 @@ + return; + } + //if not, i have to add new ones to the list ++#if VDRVERSNUM > 2030 ++ LOCK_SCHEDULES_READ; ++ schedules = Schedules; ++#else + schedules = cSchedules::Schedules(*schedulesLock); ++#endif + const cSchedule *Schedule = NULL; + Schedule = schedules->GetSchedule(channel); + if (!Schedule) { +@@ -319,6 +342,15 @@ + } + } + ++#if VDRVERSNUM > 20300 ++void cChannelColumn::setTimer() { ++ hasTimer = false; ++ LOCK_TIMERS_READ; ++ if (Timers->UsesChannel(channel)) ++ hasTimer = true; ++} ++ ++#endif + cGrid *cChannelColumn::addEpgGrid(const cEvent *event, cGrid *firstGrid, bool color) { + cGrid *grid = new cEpgGrid(this, event); + grid->setText(); +@@ -342,7 +374,11 @@ + } + + void cChannelColumn::SetTimers() { ++#if VDRVERSNUM > 20300 ++ setTimer(); ++#else + hasTimer = channel->HasTimer(); ++#endif + hasSwitchTimer = SwitchTimers.ChannelInSwitchList(channel); + for (cGrid *grid = grids.First(); grid; grid = grids.Next(grid)) { + bool gridHadTimer = grid->HasTimer(); +@@ -364,4 +400,4 @@ + esyslog("tvguide: grid %d: start: %s, stop: %s", i, *cMyTime::printTime(grid->StartTime()), *cMyTime::printTime(grid->EndTime())); + i++; + } +-} +\ No newline at end of file ++} +Index: b/channelcolumn.h +=================================================================== +--- a/channelcolumn.h ++++ b/channelcolumn.h +@@ -50,7 +50,11 @@ + void ClearOutdatedEnd(); + int GetNum() {return num;}; + void SetNum(int num) {this->num = num;}; ++#if VDRVERSNUM > 20300 ++ void setTimer(); ++#else + void setTimer() {hasTimer = channel->HasTimer();}; ++#endif + bool HasTimer() { return hasTimer; }; + void setSwitchTimer() {hasSwitchTimer = SwitchTimers.ChannelInSwitchList(channel);}; + bool HasSwitchTimer() { return hasSwitchTimer; }; +Index: b/channelgroups.c +=================================================================== +--- a/channelgroups.c ++++ b/channelgroups.c +@@ -10,12 +10,21 @@ + void cChannelGroups::ReadChannelGroups(void) { + bool setStart = false; + int lastChannelNumber = 0; ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ const cChannel *first = Channels->First(); ++#else + const cChannel *first = Channels.First(); ++#endif + if (!first->GroupSep()) { + channelGroups.push_back(cChannelGroup(tr("Main Program"))); + setStart = true; + } ++#if VDRVERSNUM > 20300 ++ for (const cChannel *channel = Channels->First(); channel; channel = Channels->Next(channel)) { ++#else + for (const cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) { ++#endif + if (setStart && (channelGroups.size() > 0)) { + channelGroups[channelGroups.size()-1].SetChannelStart(channel->Number()); + setStart = false; +@@ -103,7 +112,12 @@ + int groupLast = group; + int line = 0; + int lineStart = 0; ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ for (const cChannel *channel = Channels->Next(start); channel; channel = Channels->Next(channel)) { ++#else + for (const cChannel *channel = Channels.Next(start); channel; channel = Channels.Next(channel)) { ++#endif + if (channel->GroupSep()) + continue; + group = GetGroup(channel); +Index: b/channeljump.c +=================================================================== +--- a/channeljump.c ++++ b/channeljump.c +@@ -11,7 +11,12 @@ + pixmapText = NULL; + channel = 0; + if (!tvguideConfig.hideLastGroup) { ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ maxChannels = Channels->MaxNumber(); ++#else + maxChannels = Channels.MaxNumber(); ++#endif + } else { + maxChannels = channelGroups->GetLastValidChannel(); + } +@@ -87,4 +92,4 @@ + if ((cTimeMs::Now() - startTime) > timeout) + return true; + return false; +- } +\ No newline at end of file ++ } +Index: b/detailview.c +=================================================================== +--- a/detailview.c ++++ b/detailview.c +@@ -9,7 +9,12 @@ + Cancel(-1); + while (Active()) + cCondWait::SleepMs(10); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ footer->LeaveDetailedViewMode(Channels->GetByChannelID(event->ChannelID())); ++#else + footer->LeaveDetailedViewMode(Channels.GetByChannelID(event->ChannelID())); ++#endif + if (view) + delete view; + } +@@ -42,7 +47,12 @@ + dateTime = cString::sprintf("%s %s - %s (%d %s)", *event->GetDateString(), *event->GetTimeString(), *event->GetEndTimeString(), event->Duration()/60, tr("min")); + } + view->SetDateTime(*dateTime); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ view->SetChannel(Channels->GetByChannelID(event->ChannelID(), true)); ++#else + view->SetChannel(Channels.GetByChannelID(event->ChannelID(), true)); ++#endif + view->SetEventID(event->EventID()); + view->SetEvent(event); + } +@@ -90,7 +100,12 @@ + continue; + i++; + sstrReruns << *DayDateTime(r->event->StartTime()); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ cChannel *channel = (cChannel *)Channels->GetByChannelID(r->event->ChannelID(), true, true); ++#else + cChannel *channel = Channels.GetByChannelID(r->event->ChannelID(), true, true); ++#endif + if (channel) { + sstrReruns << ", " << trVDR("Channel") << " " << channel->Number() << ":"; + sstrReruns << " " << channel->ShortName(true); +@@ -156,4 +171,4 @@ + break; + } + return state; +-} +\ No newline at end of file ++} +Index: b/imagecache.c +=================================================================== +--- a/imagecache.c ++++ b/imagecache.c +@@ -280,7 +280,12 @@ + return; + if (tvguideConfig.numLogosInitial > 0) { + int channelsCached = 0; ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ for (const cChannel *channel = Channels->First(); channel; channel = Channels->Next(channel)) { ++#else + for (const cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) { ++#endif + if (channelsCached >= tvguideConfig.numLogosInitial) + break; + if (!channel->GroupSep()) { +Index: b/recmanager.c +=================================================================== +--- a/recmanager.c ++++ b/recmanager.c +@@ -62,8 +62,14 @@ + rtMatch.event = event; + pRemoteTimers->Service("RemoteTimers::GetMatch-v1.0", &rtMatch); + timer = rtMatch.timer; +- } else ++ } else { ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ timer = (cTimer*) Timers->GetMatch(event); ++#else + timer = Timers.GetMatch(event); ++#endif ++ } + return timer; + } + +@@ -79,19 +85,35 @@ + + cTimer *cRecManager::createLocalTimer(const cEvent *event, std::string path) { + cTimer *timer = new cTimer(event); ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_WRITE; ++ cTimer *t = Timers->GetTimer(timer); ++#else + cTimer *t = Timers.GetTimer(timer); ++#endif + if (t) { + t->OnOff(); ++#if VDRVERSNUM > 20300 ++ LOCK_SCHEDULES_READ; ++ t->SetEventFromSchedule(Schedules); ++#else + t->SetEventFromSchedule(); ++#endif + delete timer; + timer = t; + isyslog("timer %s reactivated", *t->ToDescr()); + } else { ++#if VDRVERSNUM > 20300 ++ Timers->Add(timer); ++#else + Timers.Add(timer); ++#endif + isyslog("timer %s added (active)", *timer->ToDescr()); + } + SetTimerPath(timer, event, path); ++#if VDRVERSNUM < 20300 + Timers.SetModified(); ++#endif + return timer; + } + +@@ -148,7 +170,12 @@ + } + + void cRecManager::DeleteTimer(int timerID) { ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ cTimer *t = (cTimer *)Timers->Get(timerID); ++#else + cTimer *t = Timers.Get(timerID); ++#endif + if (!t) + return; + DeleteTimer(t); +@@ -165,7 +192,12 @@ + } + + void cRecManager::DeleteLocalTimer(const cEvent *event) { ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ cTimer *t = (cTimer *)Timers->GetMatch(event); ++#else + cTimer *t = Timers.GetMatch(event); ++#endif + if (!t) + return; + DeleteTimer(t); +@@ -173,13 +205,24 @@ + + + void cRecManager::DeleteTimer(cTimer *timer) { ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_WRITE; ++#endif + if (timer->Recording()) { + timer->Skip(); ++#if VDRVERSNUM > 20300 ++ cRecordControls::Process(Timers,time(NULL)); ++#else + cRecordControls::Process(time(NULL)); ++#endif + } + isyslog("timer %s deleted", *timer->ToDescr()); ++#if VDRVERSNUM > 20300 ++ Timers->Del(timer, true); ++#else + Timers.Del(timer, true); + Timers.SetModified(); ++#endif + } + + void cRecManager::DeleteRemoteTimer(const cEvent *event) { +@@ -220,21 +263,33 @@ + else if (!timer->HasFlags(tfActive) && active) + timer->SetFlags(tfActive); + ++#if VDRVERSNUM > 20300 ++ LOCK_SCHEDULES_READ; ++ timer->SetEventFromSchedule(Schedules); ++#else + timer->SetEventFromSchedule(); ++#endif + if (tvguideConfig.useRemoteTimers && pRemoteTimers) { + RemoteTimers_Timer_v1_0 rt; + rt.timer = timer; + if (!pRemoteTimers->Service("RemoteTimers::ModTimer-v1.0", &rt)) + rt.timer = NULL; + RefreshRemoteTimers(); ++#if VDRVERSNUM < 20300 + } else { +- Timers.SetModified(); ++ Timers.SetModified(); // what to do JF ??? ++#endif + } + } + + + bool cRecManager::IsRecorded(const cEvent *event) { ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ cTimer *timer = (cTimer *)Timers->GetMatch(event); ++#else + cTimer *timer = Timers.GetMatch(event); ++#endif + if (!timer) + return false; + return timer->Recording(); +@@ -260,7 +315,12 @@ + } + + void cRecManager::CreateSeriesTimer(cTimer *seriesTimer) { ++#if VDRVERSNUM > 20300 ++ LOCK_SCHEDULES_READ; ++ seriesTimer->SetEventFromSchedule(Schedules); ++#else + seriesTimer->SetEventFromSchedule(); ++#endif + if (tvguideConfig.useRemoteTimers && pRemoteTimers) { + RemoteTimers_Timer_v1_0 rt; + rt.timer = seriesTimer; +@@ -268,8 +328,13 @@ + isyslog("%s", *rt.errorMsg); + RefreshRemoteTimers(); + } else { ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_WRITE; ++ Timers->Add(seriesTimer); ++#else + Timers.Add(seriesTimer); + Timers.SetModified(); ++#endif + } + } + +@@ -316,9 +381,15 @@ + numResults = results.size(); + if (numResults > 0) { + searchResults = new const cEvent *[numResults]; ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ LOCK_SCHEDULES_READ; ++ const cSchedules *schedules = Schedules; ++#else + cSchedulesLock schedulesLock; + const cSchedules *schedules; + schedules = cSchedules::Schedules(schedulesLock); ++#endif + const cEvent *event = NULL; + int index=0; + for (std::list::iterator it=results.begin(); it != results.end(); ++it) { +@@ -328,7 +399,11 @@ + int eventID = atoi(flds[1].c_str()); + std::string channelID = flds[7]; + tChannelID chanID = tChannelID::FromString(channelID.c_str()); ++#if VDRVERSNUM > 20300 ++ cChannel *channel = (cChannel *)Channels->GetByChannelID(chanID); ++#else + cChannel *channel = Channels.GetByChannelID(chanID); ++#endif + if (channel) { + const cSchedule *Schedule = NULL; + Schedule = schedules->GetSchedule(channel); +@@ -435,24 +510,45 @@ + return; + int searchTimerID = searchTimer->GetID(); + if (delTimers) { ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ cTimer *timer = (cTimer *)Timers->First(); ++#else + cTimer *timer = Timers.First(); ++#endif + while(timer) { + if (!timer->Recording()) { + char* searchID = GetAuxValue(timer, "s-id"); + if (searchID) { + if (searchTimerID == atoi(searchID)) { ++#if VDRVERSNUM > 20300 ++ cTimer* timerNext = (cTimer *)Timers->Next(timer); ++#else + cTimer* timerNext = Timers.Next(timer); ++#endif + DeleteTimer(timer); + timer = timerNext; + } else { ++#if VDRVERSNUM > 20300 ++ timer = (cTimer *)Timers->Next(timer); ++#else + timer = Timers.Next(timer); ++#endif + } + free(searchID); + } else { ++#if VDRVERSNUM > 20300 ++ timer = (cTimer *)Timers->Next(timer); ++#else + timer = Timers.Next(timer); ++#endif + } + } else { ++#if VDRVERSNUM > 20300 ++ timer = (cTimer *)Timers->Next(timer); ++#else + timer = Timers.Next(timer); ++#endif + } + } + } +@@ -511,7 +607,12 @@ + int num = 0; + numResults = 0; + ++#if VDRVERSNUM > 20300 ++ LOCK_RECORDINGS_READ; ++ for (cRecording *recording = (cRecording *)Recordings->First(); recording; recording = (cRecording *)Recordings->Next(recording)) { ++#else + for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) { ++#endif + std::string s1 = recording->Name(); + std::string s2 = searchString; + if (s1.empty() || s2.empty()) continue; +@@ -619,17 +720,37 @@ + + const cEvent **cRecManager::WhatsOnNow(bool nowOrNext, int &numResults) { + std::vector tmpResults; ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ LOCK_SCHEDULES_READ; ++ const cSchedules *schedules = Schedules; ++#else + cSchedulesLock schedulesLock; + const cSchedules *schedules = cSchedules::Schedules(schedulesLock); ++#endif + const cChannel *startChannel = NULL, *stopChannel = NULL; + if (tvguideConfig.favLimitChannels) { ++#if VDRVERSNUM > 20300 ++ startChannel = Channels->GetByNumber(tvguideConfig.favStartChannel); ++ stopChannel = Channels->GetByNumber(tvguideConfig.favStopChannel); ++#else + startChannel = Channels.GetByNumber(tvguideConfig.favStartChannel); + stopChannel = Channels.GetByNumber(tvguideConfig.favStopChannel); ++#endif + } +- if (!startChannel) ++ if (!startChannel) { ++#if VDRVERSNUM > 20300 ++ startChannel = Channels->First(); ++#else + startChannel = Channels.First(); ++#endif ++ } + ++#if VDRVERSNUM > 20300 ++ for (const cChannel *channel = startChannel; channel; channel = Channels->Next(channel)) { ++#else + for (const cChannel *channel = startChannel; channel; channel = Channels.Next(channel)) { ++#endif + if (channel->GroupSep()) continue; + const cSchedule *Schedule = schedules->GetSchedule(channel); + if (!Schedule) continue; +@@ -679,17 +800,37 @@ + if (searchTime < now) + searchTime += 24*60*60; + ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ LOCK_SCHEDULES_READ; ++ const cSchedules *schedules = Schedules; ++#else + cSchedulesLock schedulesLock; + const cSchedules *schedules = cSchedules::Schedules(schedulesLock); ++#endif + const cChannel *startChannel = NULL, *stopChannel = NULL; + if (tvguideConfig.favLimitChannels) { ++#if VDRVERSNUM > 20300 ++ startChannel = Channels->GetByNumber(tvguideConfig.favStartChannel); ++ stopChannel = Channels->GetByNumber(tvguideConfig.favStopChannel); ++#else + startChannel = Channels.GetByNumber(tvguideConfig.favStartChannel); + stopChannel = Channels.GetByNumber(tvguideConfig.favStopChannel); ++#endif + } +- if (!startChannel) ++ if (!startChannel) { ++#if VDRVERSNUM > 20300 ++ startChannel = Channels->First(); ++#else + startChannel = Channels.First(); ++#endif ++ } + ++#if VDRVERSNUM > 20300 ++ for (const cChannel *channel = startChannel; channel; channel = Channels->Next(channel)) { ++#else + for (const cChannel *channel = startChannel; channel; channel = Channels.Next(channel)) { ++#endif + if (channel->GroupSep()) continue; + const cSchedule *Schedule = schedules->GetSchedule(channel); + if (!Schedule) continue; +Index: b/recmenuitem.c +=================================================================== +--- a/recmenuitem.c ++++ b/recmenuitem.c +@@ -1817,7 +1817,12 @@ + if (!event) + return; + int logoX = DrawIcons(); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ const cChannel *channel = Channels->GetByChannelID(event->ChannelID()); ++#else + const cChannel *channel = Channels.GetByChannelID(event->ChannelID()); ++#endif + cString channelName = ""; + if (channel) + channelName = channel->Name(); +@@ -1999,14 +2004,26 @@ + if (!channel) + return rmsConsumed; + cChannel *prev = channel; ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ const cChannel *firstChannel = Channels->First(); ++ if(firstChannel->GroupSep()) ++ firstChannel = Channels->Next(firstChannel); ++#else + cChannel *firstChannel = Channels.First(); + if(firstChannel->GroupSep()) + firstChannel = Channels.Next(firstChannel); ++#endif + if (prev == firstChannel) { + if (!initialChannelSet) + channel = NULL; + } else { ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ while (prev = (cChannel *)Channels->Prev(prev)) { ++#else + while (prev = Channels.Prev(prev)) { ++#endif + if(!prev->GroupSep()) { + channel = prev; + break; +@@ -2025,12 +2042,24 @@ + case kRight: { + fresh = true; + if (!channel) { ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ channel = (cChannel *)Channels->First(); ++ if(channel->GroupSep()) ++ channel = (cChannel *)Channels->Next(channel); ++#else + channel = Channels.First(); + if(channel->GroupSep()) + channel = Channels.Next(channel); ++#endif + } else { + cChannel *next = channel; ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ while (next = (cChannel *)Channels->Next(next)) { ++#else + while (next = Channels.Next(next)) { ++#endif + if(!next->GroupSep()) { + channel = next; + break; +@@ -2052,7 +2081,12 @@ + fresh = false; + } + channelNumber = channelNumber * 10 + (Key - k0); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ cChannel *chanNew = (cChannel *)Channels->GetByNumber(channelNumber); ++#else + cChannel *chanNew = Channels.GetByNumber(channelNumber); ++#endif + if (chanNew) { + channel = chanNew; + DrawValue(); +@@ -2242,7 +2276,12 @@ + if (!recording) + return; + const cRecordingInfo *recInfo = recording->Info(); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ cChannel *channel = (cChannel *)Channels->GetByChannelID(recInfo->ChannelID()); ++#else + cChannel *channel = Channels.GetByChannelID(recInfo->ChannelID()); ++#endif + cString channelName = tr("unknown channel"); + if (channel) + channelName = channel->Name(); +@@ -2899,4 +2938,4 @@ + break; + } + return rmsNotConsumed; +-} +\ No newline at end of file ++} +Index: b/recmenumanager.c +=================================================================== +--- a/recmenumanager.c ++++ b/recmenumanager.c +@@ -125,7 +125,12 @@ + timerIndex = menu->GetTimerConflictIndex(); + } else break; + int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex); ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ cTimer *t = (cTimer *)Timers->Get(timerID); ++#else + cTimer *t = Timers.Get(timerID); ++#endif + if (t) { + const cEvent *ev = t->Event(); + if (ev) { +@@ -156,7 +161,12 @@ + timerIndex = menu->GetTimerConflictIndex(); + } else break; + int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex); ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ cTimer *timer = (cTimer *)Timers->Get(timerID); ++#else + cTimer *timer = Timers.Get(timerID); ++#endif + if (timer) { + delete activeMenu; + activeMenu = new cRecMenuEditTimer(timer, rmsSaveTimerConflictMenu); +@@ -230,7 +240,12 @@ + recFolder = menu->GetFolder(); + } + delete activeMenu; ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ cChannel *channel = (cChannel *)Channels->GetByChannelID(event->ChannelID()); ++#else + cChannel *channel = Channels.GetByChannelID(event->ChannelID()); ++#endif + activeMenu = new cRecMenuSeriesTimer(channel, event, recFolder); + activeMenu->Display(); + break; } +@@ -606,7 +621,12 @@ + timerConflict = menu->GetTimerConflictIndex(); + } else break; + int timerID = timerConflicts->GetCurrentConflictTimerID(timerConflict); ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ cTimer *timer = (cTimer *)Timers->Get(timerID); ++#else + cTimer *timer = Timers.Get(timerID); ++#endif + if (timer) { + const cEvent *event = timer->Event(); + if (event) { +@@ -648,7 +668,12 @@ + originalConflictIndex = menu->GetTimerConflictIndex(); + } else break; + int originalTimerID = timerConflicts->GetCurrentConflictTimerID(originalConflictIndex); ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ cTimer *timerOriginal = (cTimer *)Timers->Get(originalTimerID); ++#else + cTimer *timerOriginal = Timers.Get(originalTimerID); ++#endif + if (replace && timerOriginal) { + recManager->DeleteTimer(timerOriginal->Event()); + recManager->createTimer(replace); +@@ -820,7 +845,12 @@ + + bool cRecMenuManager::DisplayTimerConflict(cTimer *timer) { + int timerID = 0; ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ for (cTimer *t = (cTimer *)Timers->First(); t; t = (cTimer *)Timers->Next(t)) { ++#else + for (cTimer *t = Timers.First(); t; t = Timers.Next(t)) { ++#endif + if (t == timer) + return DisplayTimerConflict(timerID); + timerID++; +@@ -890,4 +920,4 @@ + } + osdManager.flush(); + return state; +-} +\ No newline at end of file ++} +Index: b/recmenus.c +=================================================================== +--- a/recmenus.c ++++ b/recmenus.c +@@ -105,7 +105,12 @@ + // --- cRecMenuConfirmTimer --------------------------------------------------------- + cRecMenuConfirmTimer::cRecMenuConfirmTimer(const cEvent *event) { + SetWidthPercent(50); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ cString channelName = Channels->GetByChannelID(event->ChannelID())->Name(); ++#else + cString channelName = Channels.GetByChannelID(event->ChannelID())->Name(); ++#endif + cString message; + bool eventHasTimer = false; + if (tvguideConfig.useRemoteTimers && pRemoteTimers) { +@@ -143,7 +148,12 @@ + // --- cRecMenuConfirmDeleteTimer --------------------------------------------------------- + cRecMenuConfirmDeleteTimer::cRecMenuConfirmDeleteTimer(const cEvent *event) { + SetWidthPercent(50); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ cString channelName = Channels->GetByChannelID(event->ChannelID())->Name(); ++#else + cString channelName = Channels.GetByChannelID(event->ChannelID())->Name(); ++#endif + cString text = cString::sprintf("%s\n%s\n%s %s - %s\n%s", + tr("Timer deleted"), + *channelName, +@@ -165,7 +175,12 @@ + // --- cRecMenuAskDeleteTimer --------------------------------------------------------- + cRecMenuAskDeleteTimer::cRecMenuAskDeleteTimer(const cEvent *event) { + SetWidthPercent(50); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ cString channelName = Channels->GetByChannelID(event->ChannelID())->Name(); ++#else + cString channelName = Channels.GetByChannelID(event->ChannelID())->Name(); ++#endif + cString text = cString::sprintf("%s \"%s, %s\" %s", + tr("Timer"), + *channelName, +@@ -227,8 +242,15 @@ + conflict->overlapStop)); + SetFooter(new cRecMenuItemButton(tr("Ignore Conflict"), rmsIgnoreTimerConflict, false, true)); + int i=0; ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++#endif + for(std::vector::iterator it = conflict->timerIDs.begin(); it != conflict->timerIDs.end(); it++) { ++#if VDRVERSNUM > 20300 ++ const cTimer *timer = Timers->Get(*it); ++#else + const cTimer *timer = Timers.Get(*it); ++#endif + if (timer) { + if (!AddMenuItemInitial(new cRecMenuItemTimer( timer, + rmsTimerConflictShowInfo, +@@ -252,7 +274,12 @@ + + cRecMenuItem *cRecMenuTimerConflict::GetMenuItem(int number) { + if ((number >= 0) && (number < conflict->timerIDs.size())) { ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ const cTimer *timer = Timers->Get(conflict->timerIDs[number]); ++#else + const cTimer *timer = Timers.Get(conflict->timerIDs[number]); ++#endif + cRecMenuItem *result = new cRecMenuItemTimer( timer, + rmsTimerConflictShowInfo, + rmsDeleteTimerConflictMenu, +@@ -353,8 +380,14 @@ + // --- cRecMenuConfirmRerunUsed --------------------------------------------------------- + cRecMenuConfirmRerunUsed::cRecMenuConfirmRerunUsed(const cEvent *original, const cEvent *replace) { + SetWidthPercent(70); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ cString channelOrig = Channels->GetByChannelID(original->ChannelID())->Name(); ++ cString channelReplace = Channels->GetByChannelID(replace->ChannelID())->Name(); ++#else + cString channelOrig = Channels.GetByChannelID(original->ChannelID())->Name(); + cString channelReplace = Channels.GetByChannelID(replace->ChannelID())->Name(); ++#endif + cString message1 = tr("Timer for"); + cString message2 = tr("replaced by rerun"); + cString text = cString::sprintf("%s\n\"%s\", %s %s, %s\n%s\n\"%s\", %s %s, %s", +@@ -508,7 +541,12 @@ + } + + cTimer *cRecMenuSeriesTimer::GetTimer(void) { ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ cChannel *chan = (cChannel *)Channels->GetByNumber(channel); ++#else + cChannel *chan = Channels.GetByNumber(channel); ++#endif + cTimer *seriesTimer = new cTimer(NULL, NULL, chan); + cString fileName = "TITLE EPISODE"; + if (folder.size() > 0) { +@@ -789,8 +827,14 @@ + startChannel = 1; + if (stopChannel == 0) + stopChannel = 1; ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ useChannelSubMenu.push_back(new cRecMenuItemChannelChooser(tr("Start Channel"), (cChannel *)Channels->GetByNumber(startChannel), false, &startChannel, rmsSearchTimerSave)); ++ useChannelSubMenu.push_back(new cRecMenuItemChannelChooser(tr("Stop Channel"), (cChannel *)Channels->GetByNumber(stopChannel), false, &stopChannel, rmsSearchTimerSave)); ++#else + useChannelSubMenu.push_back(new cRecMenuItemChannelChooser(tr("Start Channel"), Channels.GetByNumber(startChannel), false, &startChannel, rmsSearchTimerSave)); + useChannelSubMenu.push_back(new cRecMenuItemChannelChooser(tr("Stop Channel"), Channels.GetByNumber(stopChannel), false, &stopChannel, rmsSearchTimerSave)); ++#endif + + useTimeSubMenu.push_back(new cRecMenuItemTime(tr("Start after"), startTime, false, &startTime, rmsSearchTimerSave)); + useTimeSubMenu.push_back(new cRecMenuItemTime(tr("Start before"), stopTime, false, &stopTime, rmsSearchTimerSave)); +@@ -1214,7 +1258,12 @@ + // --- cRecMenuSearchConfirmTimer --------------------------------------------------------- + cRecMenuSearchConfirmTimer::cRecMenuSearchConfirmTimer(const cEvent *event, eRecMenuState nextAction) { + SetWidthPercent(50); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ cString channelName = Channels->GetByChannelID(event->ChannelID())->Name(); ++#else + cString channelName = Channels.GetByChannelID(event->ChannelID())->Name(); ++#endif + cString message = tr("Timer created"); + cString text = cString::sprintf("%s\n%s\n%s %s - %s\n%s", + *message, +@@ -1363,7 +1412,12 @@ + + void cRecMenuTimeline::GetTimersForDay(void) { + timersToday.clear(); ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ for (cTimer *t = (cTimer *)Timers->First(); t; t = (cTimer *)Timers->Next(t)) { ++#else + for (cTimer *t = Timers.First(); t; t = Timers.Next(t)) { ++#endif + if (((t->StartTime() > timeStart) && (t->StartTime() <= timeStop)) || ((t->StopTime() > timeStart) && (t->StopTime() <= timeStop))) { + timersToday.push_back(t); + } +@@ -1558,4 +1612,4 @@ + cTVGuideSearchTimer cRecMenuFavorites::GetFavorite(void) { + cRecMenuItemFavorite *activeItem = dynamic_cast(GetActiveMenuItem()); + return activeItem->GetFavorite(); +-} +\ No newline at end of file ++} +Index: b/searchtimer.c +=================================================================== +--- a/searchtimer.c ++++ b/searchtimer.c +@@ -16,8 +16,14 @@ + startTime = 0000; + stopTime = 2359; + useChannel = false; ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ channelMin = (cChannel *)Channels->GetByNumber(cDevice::CurrentChannel()); ++ channelMax = (cChannel *)Channels->GetByNumber(cDevice::CurrentChannel()); ++#else + channelMin = Channels.GetByNumber(cDevice::CurrentChannel()); + channelMax = Channels.GetByNumber(cDevice::CurrentChannel()); ++#endif + channelGroup = ""; + useCase = false; + mode = 0; +@@ -239,7 +245,12 @@ + char *channelMinbuffer = NULL; + char *channelMaxbuffer = NULL; + int channels = sscanf(values[value].c_str(), "%a[^|]|%a[^|]", &channelMinbuffer, &channelMaxbuffer); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ channelMin = (cChannel *)Channels->GetByChannelID(tChannelID::FromString(channelMinbuffer), true, true); ++#else + channelMin = Channels.GetByChannelID(tChannelID::FromString(channelMinbuffer), true, true); ++#endif + if (!channelMin) { + channelMin = channelMax = NULL; + useChannel = 0; +@@ -247,7 +258,12 @@ + if (channels == 1) + channelMax = channelMin; + else { ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ channelMax = (cChannel *)Channels->GetByChannelID(tChannelID::FromString(channelMaxbuffer), true, true); ++#else + channelMax = Channels.GetByChannelID(tChannelID::FromString(channelMaxbuffer), true, true); ++#endif + if (!channelMax) { + channelMin = channelMax = NULL; + useChannel = 0; +@@ -511,7 +527,12 @@ + int numTimers = 0; + if (ID < 0) + return numTimers; ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ for (cTimer *timer = (cTimer *)Timers->First(); timer; timer = (cTimer *)Timers->Next(timer)) { ++#else + for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) { ++#endif + char* searchID = GetAuxValue(timer, "s-id"); + if (!searchID) continue; + if (ID == atoi(searchID)) +@@ -525,7 +546,12 @@ + int numRecordings = 0; + if (ID < 0) + return numRecordings; ++#if VDRVERSNUM > 20300 ++ LOCK_RECORDINGS_READ; ++ for (cRecording *recording = (cRecording *)Recordings->First(); recording; recording = (cRecording *)Recordings->Next(recording)) { ++#else + for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) { ++#endif + if (recording->IsEdited()) + continue; + if (!recording->Info()) +Index: b/searchtimer.h +=================================================================== +--- a/searchtimer.h ++++ b/searchtimer.h +@@ -106,8 +106,13 @@ + void SetUseSubtitle(bool useSubtitle) { this->useSubtitle = useSubtitle; }; + void SetUseDesription(bool useDescription) { this->useDescription = useDescription; }; + void SetUseChannel(bool useChannel) { this->useChannel = useChannel; }; ++#if VDRVERSNUM > 20300 ++ void SetStartChannel(int startChannel) { LOCK_CHANNELS_READ; channelMin = (cChannel *)Channels->GetByNumber(startChannel); }; ++ void SetStopChannel(int stopChannel) { LOCK_CHANNELS_READ; channelMax = (cChannel *)Channels->GetByNumber(stopChannel); }; ++#else + void SetStartChannel(int startChannel) { channelMin = Channels.GetByNumber(startChannel); }; + void SetStopChannel(int stopChannel) { channelMax = Channels.GetByNumber(stopChannel); }; ++#endif + void SetUseTime(bool useTime) { this->useTime = useTime; }; + void SetStartTime(int startTime) { this->startTime = startTime; }; + void SetStopTime(int stopTime) { this->stopTime = stopTime; }; +Index: b/tvguideosd.c +=================================================================== +--- a/tvguideosd.c ++++ b/tvguideosd.c +@@ -73,11 +73,20 @@ + + void cTvGuideOsd::drawOsd() { + cPixmap::Lock(); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ cChannel *startChannel = (cChannel *)Channels->GetByNumber(cDevice::CurrentChannel()); ++#else + cChannel *startChannel = Channels.GetByNumber(cDevice::CurrentChannel()); ++#endif + int numBack = tvguideConfig.numGrids / 2; + int offset = 0; + const cChannel *newStartChannel = startChannel; ++#if VDRVERSNUM > 20300 ++ for (; newStartChannel ; newStartChannel = Channels->Prev(newStartChannel)) { ++#else + for (; newStartChannel ; newStartChannel = Channels.Prev(newStartChannel)) { ++#endif + if (newStartChannel && !newStartChannel->GroupSep()) { + offset++; + } +@@ -85,7 +94,11 @@ + break; + } + if (!newStartChannel) ++#if VDRVERSNUM > 20300 ++ newStartChannel = Channels->First(); ++#else + newStartChannel = Channels.First(); ++#endif + offset--; + if (offset < 0) + offset = 0; +@@ -122,7 +135,12 @@ + columns.Clear(); + if (!channelStart) + return; ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ for (const cChannel *channel = channelStart; channel; channel = Channels->Next(channel)) { ++#else + for (const cChannel *channel = channelStart; channel; channel = Channels.Next(channel)) { ++#endif + if (!channel->GroupSep()) { + if (channelGroups->IsInLastGroup(channel)) { + break; +@@ -144,7 +162,11 @@ + int numCurrent = columns.Count(); + int numBack = tvguideConfig.numGrids - numCurrent; + int newChannelNumber = columns.First()->getChannel()->Number() - numBack; ++#if VDRVERSNUM > 20300 ++ const cChannel *newStart = Channels->GetByNumber(newChannelNumber); ++#else + const cChannel *newStart = Channels.GetByNumber(newChannelNumber); ++#endif + readChannels(newStart); + } + } +@@ -213,7 +235,12 @@ + bool colAdded = false; + if (!colRight) { + const cChannel *channelRight = activeGrid->column->getChannel(); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ while (channelRight = Channels->Next(channelRight)) { ++#else + while (channelRight = Channels.Next(channelRight)) { ++#endif + if (!channelRight->GroupSep()) { + if (channelGroups->IsInLastGroup(channelRight)) { + break; +@@ -263,7 +290,12 @@ + bool colAdded = false; + if (!colLeft) { + const cChannel *channelLeft = activeGrid->column->getChannel(); ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ while (channelLeft = Channels->Prev(channelLeft)) { ++#else + while (channelLeft = Channels.Prev(channelLeft)) { ++#endif + if (!channelLeft->GroupSep()) { + colLeft = new cChannelColumn(0, channelLeft, myTime); + if (colLeft->readGrids()) { +@@ -431,14 +463,25 @@ + int currentCol = activeGrid->column->GetNum(); + const cChannel *prev = NULL; + ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++#endif + if (tvguideConfig.channelJumpMode == eGroupJump) { + int prevNum = channelGroups->GetPrevGroupChannelNumber(currentChannel); + if (prevNum) { ++#if VDRVERSNUM > 20300 ++ prev = Channels->GetByNumber(prevNum); ++#else + prev = Channels.GetByNumber(prevNum); ++#endif + } + } else if (tvguideConfig.channelJumpMode == eNumJump) { + int i = tvguideConfig.jumpChannels + 1; ++#if VDRVERSNUM > 20300 ++ for (const cChannel *channel = firstChannel; channel; channel = Channels->Prev(channel)) { ++#else + for (const cChannel *channel = firstChannel; channel; channel = Channels.Prev(channel)) { ++#endif + if (!channel->GroupSep()) { + prev = channel; + i--; +@@ -467,14 +510,25 @@ + const cChannel *firstChannel = columns.First()->getChannel(); + const cChannel *next = NULL; + ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++#endif + if (tvguideConfig.channelJumpMode == eGroupJump) { + int nextNum = channelGroups->GetNextGroupChannelNumber(currentChannel); + if (nextNum) { ++#if VDRVERSNUM > 20300 ++ next = Channels->GetByNumber(nextNum); ++#else + next = Channels.GetByNumber(nextNum); ++#endif + } + } else if (tvguideConfig.channelJumpMode == eNumJump) { + int i=0; ++#if VDRVERSNUM > 20300 ++ for (const cChannel *channel = firstChannel; channel; channel = Channels->Next(channel)) { ++#else + for (const cChannel *channel = firstChannel; channel; channel = Channels.Next(channel)) { ++#endif + if (channelGroups->IsInLastGroup(channel)) { + break; + } +@@ -625,7 +679,12 @@ + int newChannelNum = channelJumper->GetChannel(); + delete channelJumper; + channelJumper = NULL; ++#if VDRVERSNUM > 20300 ++ LOCK_CHANNELS_READ; ++ const cChannel *newChannel = Channels->GetByNumber(newChannelNum); ++#else + const cChannel *newChannel = Channels.GetByNumber(newChannelNum); ++#endif + if (newChannel) { + readChannels(newChannel); + if (columns.Count() > 0) { +Index: b/timerconflict.c +=================================================================== +--- a/timerconflict.c ++++ b/timerconflict.c +@@ -85,8 +85,15 @@ + for (int i=0; i < numConflicts; i++) { + cTimeInterval *unionSet = NULL; + int numTimers = conflicts[i]->timerIDs.size(); ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++#endif + for (int j=0; j < numTimers; j++) { ++#if VDRVERSNUM > 20300 ++ const cTimer *timer = Timers->Get(conflicts[i]->timerIDs[j]); ++#else + const cTimer *timer = Timers.Get(conflicts[i]->timerIDs[j]); ++#endif + if (timer) { + if (!unionSet) { + unionSet = new cTimeInterval(timer->StartTime(), timer->StopTime()); +@@ -105,7 +112,11 @@ + + cTimeInterval *intersect = NULL; + for (int j=0; j < numTimers; j++) { ++#if VDRVERSNUM > 20300 ++ const cTimer *timer = Timers->Get(conflicts[i]->timerIDs[j]); ++#else + const cTimer *timer = Timers.Get(conflicts[i]->timerIDs[j]); ++#endif + if (timer) { + if (!intersect) { + intersect = new cTimeInterval(timer->StartTime(), timer->StopTime()); +@@ -174,4 +185,4 @@ + conflictsFound.push_back(conflicts[i]); + } + return conflictsFound; +-} +\ No newline at end of file ++} +Index: b/view.c +=================================================================== +--- a/view.c ++++ b/view.c +@@ -130,7 +130,12 @@ + timerMatch = (eTimerMatch)rtMatch.timerMatch; + ti = rtMatch.timer; + } else { ++#if VDRVERSNUM > 20300 ++ LOCK_TIMERS_READ; ++ ti=(cTimer *)Timers->GetMatch(event, &timerMatch); ++#else + ti=Timers.GetMatch(event, &timerMatch); ++#endif + } + if (timerMatch == tmFull) { + cString recIconText(" REC "); +@@ -1043,4 +1048,4 @@ + } + DrawScrollbar(); + osdManager.flush(); +-} +\ No newline at end of file ++} diff --git a/vdr-2.3.5-tvguide.diff b/vdr-2.3.5-tvguide.diff new file mode 100644 index 0000000..7b5e32e --- /dev/null +++ b/vdr-2.3.5-tvguide.diff @@ -0,0 +1,154 @@ +Index: b/epggrid.c +=================================================================== +--- a/epggrid.c ++++ b/epggrid.c +@@ -20,7 +20,7 @@ + void cEpgGrid::SetViewportHeight() { + int viewportHeightOld = viewportHeight; + if ( column->Start() > StartTime() ) { +- viewportHeight = (min((int)EndTime(), column->Stop()) - column->Start()) /60; ++ viewportHeight = (std::min((int)EndTime(), column->Stop()) - column->Start()) /60; + } else if ( column->Stop() < EndTime() ) { + viewportHeight = (column->Stop() - StartTime()) /60; + if (viewportHeight < 0) viewportHeight = 0; +Index: b/imagecache.c +=================================================================== +--- a/imagecache.c ++++ b/imagecache.c +@@ -460,7 +460,7 @@ + } + if (!cornerLeft || !cornerRight) + return; +- int maxX = min(cornerWidth, imgWidth); ++ int maxX = std::min(cornerWidth, imgWidth); + for (int row = 0; row < cornerHeight; row++) { + for (int col = 0; col < maxX; ++col) { + img->SetPixel(cPoint(col, row), cornerLeft->GetPixel(cPoint(col, row))); +@@ -482,7 +482,7 @@ + } + if (!cornerHead || !cornerBottom) + return; +- int maxY = min(cornerHeight, imgHeight); ++ int maxY = std::min(cornerHeight, imgHeight); + for (int row = 0; row < maxY; row++) { + for (int col = 0; col < cornerWidth; ++col) { + img->SetPixel(cPoint(col, row), cornerHead->GetPixel(cPoint(col, row))); +@@ -527,7 +527,7 @@ + int imgWidth = img->Width(); + int imgHeight = img->Height(); + int heightHeadBottom = groupsHead->Height(); +- int maxY = min(heightHeadBottom, imgHeight); ++ int maxY = std::min(heightHeadBottom, imgHeight); + for (int row = 0; row < maxY; row++) { + for (int col = 0; col < imgWidth; ++col) { + img->SetPixel(cPoint(col, row), groupsHead->GetPixel(cPoint(col, row))); +@@ -542,7 +542,7 @@ + int imgWidth = img->Width(); + int imgHeight = img->Height(); + int widthLeftRight = groupsLeft->Width(); +- int maxX = min(widthLeftRight, imgWidth); ++ int maxX = std::min(widthLeftRight, imgWidth); + for (int row = 0; row < imgHeight; row++) { + for (int col = 0; col < maxX; ++col) { + img->SetPixel(cPoint(col, row), groupsLeft->GetPixel(cPoint(col, row))); +Index: b/recmenuitem.c +=================================================================== +--- a/recmenuitem.c ++++ b/recmenuitem.c +@@ -543,7 +543,7 @@ + void cRecMenuItemSelect::DrawValue(void) { + pixmapVal->Fill(clrTransparent); + std::string textVal = strings[currentVal]; +- int iconSize = min(128, height); ++ int iconSize = std::min(128, height); + int textX = width - font->Width(textVal.c_str()) - iconSize; + int textY = (height - font->Height()) / 2; + pixmapVal->DrawText(cPoint(textX, textY), textVal.c_str(), colorText, clrTransparent, font); +@@ -644,7 +644,7 @@ + + void cRecMenuItemSelectDirectory::DrawValue(void) { + pixmapVal->Fill(clrTransparent); +- int iconSize = min(128, height); ++ int iconSize = std::min(128, height); + int textX = width - font->Width(folders[currentVal].c_str()) - iconSize; + int textY = (height - font->Height()) / 2; + pixmapVal->DrawText(cPoint(textX, textY), folders[currentVal].c_str(), colorText, clrTransparent, font); +@@ -948,7 +948,7 @@ + if (specialChar) + addition = 1; + Utf8FromArray(startCharUtf8, p, numChars+addition); +- int maxChars = min(numChars+1+addition, 8); ++ int maxChars = std::min(numChars+1+addition, 8); + char *smskey = new char[maxChars]; + Utf8Strn0Cpy(smskey, p, maxChars); + return smskey; +@@ -2161,7 +2161,7 @@ + if (charWidth > maxWidth) + maxWidth = charWidth; + } +- daysSize = min(maxWidth + 15, height-4); ++ daysSize = std::min(maxWidth + 15, height-4); + daysX = width - 10 - 7*daysSize; + daysY = (height - daysSize) / 2; + } +Index: b/statusheader.c +=================================================================== +--- a/statusheader.c ++++ b/statusheader.c +@@ -82,7 +82,7 @@ + int lineHeight = fontManager.FontStatusHeader->Height(); + int textLines = description.Lines(); + int maxLines = heightText / lineHeight; +- int lines = min(textLines, maxLines); ++ int lines = std::min(textLines, maxLines); + for (int i = 0; i < lines-1; i++) { + pixmapText->DrawText(cPoint(x,y), description.GetLine(i), theme.Color(clrFont), colorTextBack, fontManager.FontStatusHeader); + y += lineHeight; +@@ -139,4 +139,4 @@ + pixmapTVFrame->DrawEllipse(cRect(frame, height - radius - frame, radius, radius), theme.Color(clrBackgroundOSD), -3); + pixmapTVFrame->DrawRectangle(cRect(0, height - frame, tvFrameWidth, frame), theme.Color(clrBackgroundOSD)); + pixmapTVFrame->DrawEllipse(cRect(tvFrameWidth - radius - frame, height - radius - frame, radius, radius), theme.Color(clrBackgroundOSD), -4); +-} +\ No newline at end of file ++} +Index: b/switchtimer.c +=================================================================== +--- a/switchtimer.c ++++ b/switchtimer.c +@@ -20,6 +20,23 @@ + } + } + ++cSwitchTimer::cSwitchTimer(const cSwitchTimer &SwitchTimer) { ++ eventID = 0; ++ startTime = 0; ++ switchMinsBefore = 0; ++ announceOnly = 0; ++ *this = SwitchTimer; ++} ++ ++cSwitchTimer& cSwitchTimer::operator= (const cSwitchTimer &SwitchTimer) { ++ this->eventID = SwitchTimer.eventID; ++ this->startTime = SwitchTimer.startTime; ++ this->channelID = SwitchTimer.channelID; ++ this->switchMinsBefore = SwitchTimer.switchMinsBefore; ++ this->announceOnly = SwitchTimer.announceOnly; ++ return *this; ++} ++ + bool cSwitchTimer::Parse(const char *s) { + char *line; + char *pos; +Index: b/switchtimer.h +=================================================================== +--- a/switchtimer.h ++++ b/switchtimer.h +@@ -12,6 +12,8 @@ + int announceOnly; + cSwitchTimer(void); + cSwitchTimer(const cEvent* Event); ++ cSwitchTimer(const cSwitchTimer &SwitchTimer); ++ cSwitchTimer& operator= (const cSwitchTimer &SwitchTimer); + bool Parse(const char *s); + void SetEventID(tEventID eventID) { this->eventID = eventID; }; + void SetStartTime(time_t startTime) { this->startTime = startTime; }; diff --git a/vdr-2.3.7-tvguide.diff b/vdr-2.3.7-tvguide.diff new file mode 100644 index 0000000..1a5eca5 --- /dev/null +++ b/vdr-2.3.7-tvguide.diff @@ -0,0 +1,14 @@ +Index: b/channelcolumn.h +=================================================================== +--- a/channelcolumn.h ++++ b/channelcolumn.h +@@ -20,7 +20,9 @@ + const cChannel *channel; + cHeaderGrid *header; + cList grids; ++#if VDRVERSNUM < 20300 + cSchedulesLock *schedulesLock; ++#endif + const cSchedules *schedules; + bool hasTimer; + bool hasSwitchTimer; From f7819ee4babac7e81b877c3492edc158636e39b1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 06/69] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- vdr-tvguide.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 2075407..9de32af 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,7 +2,6 @@ Name: vdr-tvguide Version: 1.2.2 Release: 16%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin -Group: Applications/Multimedia License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide Source0: http://projects.vdr-developer.org/attachments/download/1624/%{name}-%{version}.tgz From 0e4e70ce9b1fd501693256f1786adc5a9aea0a28 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:11:23 +0000 Subject: [PATCH 07/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 9de32af..16e9014 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide Version: 1.2.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -47,6 +47,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.2.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 21 2018 Martin Gansser - 1.2.2-16 - Fix FTBFS due missing BR gcc (RHBZ#1606892) - Add vdr-2.3.1-tvguide.diff From 4a4a0e79ecda6df5eab09fc6f41cd4aaf8e02840 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 21 Jun 2019 09:40:11 +0200 Subject: [PATCH 08/69] Rebuilt for new VDR API version --- sources | 1 - vdr-tvguide.spec | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 31a5d72..e41c0c2 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (vdr-tvguide-1.2.2.tgz) = 53b57a34a8816235366754b0e12bc574188c5602f302b68b09cc9c13c369b22799738f28e0d50dab66d485c7591bcc8b2c168c4cf5ad15cd822479148f4bd5d9 -SHA512 (vdr-tvguide.conf) = c8e4577fc3d236c7446022a01c58622d7d867d0e3ca8457f979febe1a09320daf84982e77bd630b952437d02a442950add488fe024986d4139e251cc397827dc diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 16e9014..14bd935 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide Version: 1.2.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -23,6 +23,9 @@ VDR plugin: tvguide - %{summary} %autosetup -p1 -n tvguide-%{version} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README +# std::auto_ptr deprecation warning in libstdc++ 5.1 +sed -i -e 's| std::auto_ptr| std::unique_ptr|g' services/epgsearch.h + %build make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=graphicsmagick %{?_smp_mflags} all @@ -47,6 +50,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Tue Jun 18 2019 Martin Gansser - 1.2.2-18 +- Rebuilt for new VDR API version + * Sun Feb 03 2019 Fedora Release Engineering - 1.2.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 7d4346daf02ea76ac6f0be5f3f7022541e180723 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 22 Jun 2019 18:49:15 +0200 Subject: [PATCH 09/69] Update to 1.2.8 Spec file cleanup --- .gitignore | 1 + sources | 2 +- vdr-2.3.1-tvguide.diff | 1228 ---------------------------------------- vdr-2.3.5-tvguide.diff | 154 ----- vdr-2.3.7-tvguide.diff | 14 - vdr-tvguide.conf | 2 +- vdr-tvguide.spec | 18 +- 7 files changed, 11 insertions(+), 1408 deletions(-) delete mode 100644 vdr-2.3.1-tvguide.diff delete mode 100644 vdr-2.3.5-tvguide.diff delete mode 100644 vdr-2.3.7-tvguide.diff diff --git a/.gitignore b/.gitignore index d7d800d..314e7cf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /vdr-tvguide-1.2.1.tgz /vdr-tvguide-1.2.2.tgz /vdr-tvguide.conf +/vdr-plugin-tvguide-1.2.8.tar.bz2 diff --git a/sources b/sources index e41c0c2..99e67ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-tvguide-1.2.2.tgz) = 53b57a34a8816235366754b0e12bc574188c5602f302b68b09cc9c13c369b22799738f28e0d50dab66d485c7591bcc8b2c168c4cf5ad15cd822479148f4bd5d9 +SHA512 (vdr-plugin-tvguide-1.2.8.tar.bz2) = 65e0de6609675ca46296a71a95d579d83c3096e3bdcab7659641050778529e1574ea36e33104d244f29bc8933e2b4b8d1132229b47c380c913dd1438bc541980 diff --git a/vdr-2.3.1-tvguide.diff b/vdr-2.3.1-tvguide.diff deleted file mode 100644 index bed5e5c..0000000 --- a/vdr-2.3.1-tvguide.diff +++ /dev/null @@ -1,1228 +0,0 @@ -Index: b/channelcolumn.c -=================================================================== ---- a/channelcolumn.c -+++ b/channelcolumn.c -@@ -5,9 +5,15 @@ - this->channel = channel; - this->num = num; - this->myTime = myTime; -+#if VDRVERSNUM > 20300 -+ setTimer(); -+#else - hasTimer = channel->HasTimer(); -+#endif - hasSwitchTimer = SwitchTimers.ChannelInSwitchList(channel); -+#if VDRVERSNUM < 20300 - schedulesLock = new cSchedulesLock(false, 100); -+#endif - header = NULL; - } - -@@ -15,7 +21,9 @@ - if (header) - delete header; - grids.Clear(); -+#if VDRVERSNUM < 20300 - delete schedulesLock; -+#endif - } - - void cChannelColumn::clearGrids() { -@@ -33,7 +41,12 @@ - } - - bool cChannelColumn::readGrids() { -+#if VDRVERSNUM > 20300 -+ LOCK_SCHEDULES_READ; -+ schedules = Schedules; -+#else - schedules = cSchedules::Schedules(*schedulesLock); -+#endif - const cSchedule *Schedule = NULL; - Schedule = schedules->GetSchedule(channel); - if (!Schedule) { -@@ -186,7 +199,12 @@ - return; - } - //if not, i have to add new ones to the list -+#if VDRVERSNUM > 2030 -+ LOCK_SCHEDULES_READ; -+ schedules = Schedules; -+#else - schedules = cSchedules::Schedules(*schedulesLock); -+#endif - const cSchedule *Schedule = NULL; - Schedule = schedules->GetSchedule(channel); - if (!Schedule) { -@@ -234,7 +252,12 @@ - return; - } - //if not, i have to add new ones to the list -+#if VDRVERSNUM > 2030 -+ LOCK_SCHEDULES_READ; -+ schedules = Schedules; -+#else - schedules = cSchedules::Schedules(*schedulesLock); -+#endif - const cSchedule *Schedule = NULL; - Schedule = schedules->GetSchedule(channel); - if (!Schedule) { -@@ -319,6 +342,15 @@ - } - } - -+#if VDRVERSNUM > 20300 -+void cChannelColumn::setTimer() { -+ hasTimer = false; -+ LOCK_TIMERS_READ; -+ if (Timers->UsesChannel(channel)) -+ hasTimer = true; -+} -+ -+#endif - cGrid *cChannelColumn::addEpgGrid(const cEvent *event, cGrid *firstGrid, bool color) { - cGrid *grid = new cEpgGrid(this, event); - grid->setText(); -@@ -342,7 +374,11 @@ - } - - void cChannelColumn::SetTimers() { -+#if VDRVERSNUM > 20300 -+ setTimer(); -+#else - hasTimer = channel->HasTimer(); -+#endif - hasSwitchTimer = SwitchTimers.ChannelInSwitchList(channel); - for (cGrid *grid = grids.First(); grid; grid = grids.Next(grid)) { - bool gridHadTimer = grid->HasTimer(); -@@ -364,4 +400,4 @@ - esyslog("tvguide: grid %d: start: %s, stop: %s", i, *cMyTime::printTime(grid->StartTime()), *cMyTime::printTime(grid->EndTime())); - i++; - } --} -\ No newline at end of file -+} -Index: b/channelcolumn.h -=================================================================== ---- a/channelcolumn.h -+++ b/channelcolumn.h -@@ -50,7 +50,11 @@ - void ClearOutdatedEnd(); - int GetNum() {return num;}; - void SetNum(int num) {this->num = num;}; -+#if VDRVERSNUM > 20300 -+ void setTimer(); -+#else - void setTimer() {hasTimer = channel->HasTimer();}; -+#endif - bool HasTimer() { return hasTimer; }; - void setSwitchTimer() {hasSwitchTimer = SwitchTimers.ChannelInSwitchList(channel);}; - bool HasSwitchTimer() { return hasSwitchTimer; }; -Index: b/channelgroups.c -=================================================================== ---- a/channelgroups.c -+++ b/channelgroups.c -@@ -10,12 +10,21 @@ - void cChannelGroups::ReadChannelGroups(void) { - bool setStart = false; - int lastChannelNumber = 0; -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ const cChannel *first = Channels->First(); -+#else - const cChannel *first = Channels.First(); -+#endif - if (!first->GroupSep()) { - channelGroups.push_back(cChannelGroup(tr("Main Program"))); - setStart = true; - } -+#if VDRVERSNUM > 20300 -+ for (const cChannel *channel = Channels->First(); channel; channel = Channels->Next(channel)) { -+#else - for (const cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) { -+#endif - if (setStart && (channelGroups.size() > 0)) { - channelGroups[channelGroups.size()-1].SetChannelStart(channel->Number()); - setStart = false; -@@ -103,7 +112,12 @@ - int groupLast = group; - int line = 0; - int lineStart = 0; -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ for (const cChannel *channel = Channels->Next(start); channel; channel = Channels->Next(channel)) { -+#else - for (const cChannel *channel = Channels.Next(start); channel; channel = Channels.Next(channel)) { -+#endif - if (channel->GroupSep()) - continue; - group = GetGroup(channel); -Index: b/channeljump.c -=================================================================== ---- a/channeljump.c -+++ b/channeljump.c -@@ -11,7 +11,12 @@ - pixmapText = NULL; - channel = 0; - if (!tvguideConfig.hideLastGroup) { -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ maxChannels = Channels->MaxNumber(); -+#else - maxChannels = Channels.MaxNumber(); -+#endif - } else { - maxChannels = channelGroups->GetLastValidChannel(); - } -@@ -87,4 +92,4 @@ - if ((cTimeMs::Now() - startTime) > timeout) - return true; - return false; -- } -\ No newline at end of file -+ } -Index: b/detailview.c -=================================================================== ---- a/detailview.c -+++ b/detailview.c -@@ -9,7 +9,12 @@ - Cancel(-1); - while (Active()) - cCondWait::SleepMs(10); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ footer->LeaveDetailedViewMode(Channels->GetByChannelID(event->ChannelID())); -+#else - footer->LeaveDetailedViewMode(Channels.GetByChannelID(event->ChannelID())); -+#endif - if (view) - delete view; - } -@@ -42,7 +47,12 @@ - dateTime = cString::sprintf("%s %s - %s (%d %s)", *event->GetDateString(), *event->GetTimeString(), *event->GetEndTimeString(), event->Duration()/60, tr("min")); - } - view->SetDateTime(*dateTime); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ view->SetChannel(Channels->GetByChannelID(event->ChannelID(), true)); -+#else - view->SetChannel(Channels.GetByChannelID(event->ChannelID(), true)); -+#endif - view->SetEventID(event->EventID()); - view->SetEvent(event); - } -@@ -90,7 +100,12 @@ - continue; - i++; - sstrReruns << *DayDateTime(r->event->StartTime()); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ cChannel *channel = (cChannel *)Channels->GetByChannelID(r->event->ChannelID(), true, true); -+#else - cChannel *channel = Channels.GetByChannelID(r->event->ChannelID(), true, true); -+#endif - if (channel) { - sstrReruns << ", " << trVDR("Channel") << " " << channel->Number() << ":"; - sstrReruns << " " << channel->ShortName(true); -@@ -156,4 +171,4 @@ - break; - } - return state; --} -\ No newline at end of file -+} -Index: b/imagecache.c -=================================================================== ---- a/imagecache.c -+++ b/imagecache.c -@@ -280,7 +280,12 @@ - return; - if (tvguideConfig.numLogosInitial > 0) { - int channelsCached = 0; -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ for (const cChannel *channel = Channels->First(); channel; channel = Channels->Next(channel)) { -+#else - for (const cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) { -+#endif - if (channelsCached >= tvguideConfig.numLogosInitial) - break; - if (!channel->GroupSep()) { -Index: b/recmanager.c -=================================================================== ---- a/recmanager.c -+++ b/recmanager.c -@@ -62,8 +62,14 @@ - rtMatch.event = event; - pRemoteTimers->Service("RemoteTimers::GetMatch-v1.0", &rtMatch); - timer = rtMatch.timer; -- } else -+ } else { -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ timer = (cTimer*) Timers->GetMatch(event); -+#else - timer = Timers.GetMatch(event); -+#endif -+ } - return timer; - } - -@@ -79,19 +85,35 @@ - - cTimer *cRecManager::createLocalTimer(const cEvent *event, std::string path) { - cTimer *timer = new cTimer(event); -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_WRITE; -+ cTimer *t = Timers->GetTimer(timer); -+#else - cTimer *t = Timers.GetTimer(timer); -+#endif - if (t) { - t->OnOff(); -+#if VDRVERSNUM > 20300 -+ LOCK_SCHEDULES_READ; -+ t->SetEventFromSchedule(Schedules); -+#else - t->SetEventFromSchedule(); -+#endif - delete timer; - timer = t; - isyslog("timer %s reactivated", *t->ToDescr()); - } else { -+#if VDRVERSNUM > 20300 -+ Timers->Add(timer); -+#else - Timers.Add(timer); -+#endif - isyslog("timer %s added (active)", *timer->ToDescr()); - } - SetTimerPath(timer, event, path); -+#if VDRVERSNUM < 20300 - Timers.SetModified(); -+#endif - return timer; - } - -@@ -148,7 +170,12 @@ - } - - void cRecManager::DeleteTimer(int timerID) { -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ cTimer *t = (cTimer *)Timers->Get(timerID); -+#else - cTimer *t = Timers.Get(timerID); -+#endif - if (!t) - return; - DeleteTimer(t); -@@ -165,7 +192,12 @@ - } - - void cRecManager::DeleteLocalTimer(const cEvent *event) { -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ cTimer *t = (cTimer *)Timers->GetMatch(event); -+#else - cTimer *t = Timers.GetMatch(event); -+#endif - if (!t) - return; - DeleteTimer(t); -@@ -173,13 +205,24 @@ - - - void cRecManager::DeleteTimer(cTimer *timer) { -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_WRITE; -+#endif - if (timer->Recording()) { - timer->Skip(); -+#if VDRVERSNUM > 20300 -+ cRecordControls::Process(Timers,time(NULL)); -+#else - cRecordControls::Process(time(NULL)); -+#endif - } - isyslog("timer %s deleted", *timer->ToDescr()); -+#if VDRVERSNUM > 20300 -+ Timers->Del(timer, true); -+#else - Timers.Del(timer, true); - Timers.SetModified(); -+#endif - } - - void cRecManager::DeleteRemoteTimer(const cEvent *event) { -@@ -220,21 +263,33 @@ - else if (!timer->HasFlags(tfActive) && active) - timer->SetFlags(tfActive); - -+#if VDRVERSNUM > 20300 -+ LOCK_SCHEDULES_READ; -+ timer->SetEventFromSchedule(Schedules); -+#else - timer->SetEventFromSchedule(); -+#endif - if (tvguideConfig.useRemoteTimers && pRemoteTimers) { - RemoteTimers_Timer_v1_0 rt; - rt.timer = timer; - if (!pRemoteTimers->Service("RemoteTimers::ModTimer-v1.0", &rt)) - rt.timer = NULL; - RefreshRemoteTimers(); -+#if VDRVERSNUM < 20300 - } else { -- Timers.SetModified(); -+ Timers.SetModified(); // what to do JF ??? -+#endif - } - } - - - bool cRecManager::IsRecorded(const cEvent *event) { -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ cTimer *timer = (cTimer *)Timers->GetMatch(event); -+#else - cTimer *timer = Timers.GetMatch(event); -+#endif - if (!timer) - return false; - return timer->Recording(); -@@ -260,7 +315,12 @@ - } - - void cRecManager::CreateSeriesTimer(cTimer *seriesTimer) { -+#if VDRVERSNUM > 20300 -+ LOCK_SCHEDULES_READ; -+ seriesTimer->SetEventFromSchedule(Schedules); -+#else - seriesTimer->SetEventFromSchedule(); -+#endif - if (tvguideConfig.useRemoteTimers && pRemoteTimers) { - RemoteTimers_Timer_v1_0 rt; - rt.timer = seriesTimer; -@@ -268,8 +328,13 @@ - isyslog("%s", *rt.errorMsg); - RefreshRemoteTimers(); - } else { -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_WRITE; -+ Timers->Add(seriesTimer); -+#else - Timers.Add(seriesTimer); - Timers.SetModified(); -+#endif - } - } - -@@ -316,9 +381,15 @@ - numResults = results.size(); - if (numResults > 0) { - searchResults = new const cEvent *[numResults]; -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ LOCK_SCHEDULES_READ; -+ const cSchedules *schedules = Schedules; -+#else - cSchedulesLock schedulesLock; - const cSchedules *schedules; - schedules = cSchedules::Schedules(schedulesLock); -+#endif - const cEvent *event = NULL; - int index=0; - for (std::list::iterator it=results.begin(); it != results.end(); ++it) { -@@ -328,7 +399,11 @@ - int eventID = atoi(flds[1].c_str()); - std::string channelID = flds[7]; - tChannelID chanID = tChannelID::FromString(channelID.c_str()); -+#if VDRVERSNUM > 20300 -+ cChannel *channel = (cChannel *)Channels->GetByChannelID(chanID); -+#else - cChannel *channel = Channels.GetByChannelID(chanID); -+#endif - if (channel) { - const cSchedule *Schedule = NULL; - Schedule = schedules->GetSchedule(channel); -@@ -435,24 +510,45 @@ - return; - int searchTimerID = searchTimer->GetID(); - if (delTimers) { -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ cTimer *timer = (cTimer *)Timers->First(); -+#else - cTimer *timer = Timers.First(); -+#endif - while(timer) { - if (!timer->Recording()) { - char* searchID = GetAuxValue(timer, "s-id"); - if (searchID) { - if (searchTimerID == atoi(searchID)) { -+#if VDRVERSNUM > 20300 -+ cTimer* timerNext = (cTimer *)Timers->Next(timer); -+#else - cTimer* timerNext = Timers.Next(timer); -+#endif - DeleteTimer(timer); - timer = timerNext; - } else { -+#if VDRVERSNUM > 20300 -+ timer = (cTimer *)Timers->Next(timer); -+#else - timer = Timers.Next(timer); -+#endif - } - free(searchID); - } else { -+#if VDRVERSNUM > 20300 -+ timer = (cTimer *)Timers->Next(timer); -+#else - timer = Timers.Next(timer); -+#endif - } - } else { -+#if VDRVERSNUM > 20300 -+ timer = (cTimer *)Timers->Next(timer); -+#else - timer = Timers.Next(timer); -+#endif - } - } - } -@@ -511,7 +607,12 @@ - int num = 0; - numResults = 0; - -+#if VDRVERSNUM > 20300 -+ LOCK_RECORDINGS_READ; -+ for (cRecording *recording = (cRecording *)Recordings->First(); recording; recording = (cRecording *)Recordings->Next(recording)) { -+#else - for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) { -+#endif - std::string s1 = recording->Name(); - std::string s2 = searchString; - if (s1.empty() || s2.empty()) continue; -@@ -619,17 +720,37 @@ - - const cEvent **cRecManager::WhatsOnNow(bool nowOrNext, int &numResults) { - std::vector tmpResults; -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ LOCK_SCHEDULES_READ; -+ const cSchedules *schedules = Schedules; -+#else - cSchedulesLock schedulesLock; - const cSchedules *schedules = cSchedules::Schedules(schedulesLock); -+#endif - const cChannel *startChannel = NULL, *stopChannel = NULL; - if (tvguideConfig.favLimitChannels) { -+#if VDRVERSNUM > 20300 -+ startChannel = Channels->GetByNumber(tvguideConfig.favStartChannel); -+ stopChannel = Channels->GetByNumber(tvguideConfig.favStopChannel); -+#else - startChannel = Channels.GetByNumber(tvguideConfig.favStartChannel); - stopChannel = Channels.GetByNumber(tvguideConfig.favStopChannel); -+#endif - } -- if (!startChannel) -+ if (!startChannel) { -+#if VDRVERSNUM > 20300 -+ startChannel = Channels->First(); -+#else - startChannel = Channels.First(); -+#endif -+ } - -+#if VDRVERSNUM > 20300 -+ for (const cChannel *channel = startChannel; channel; channel = Channels->Next(channel)) { -+#else - for (const cChannel *channel = startChannel; channel; channel = Channels.Next(channel)) { -+#endif - if (channel->GroupSep()) continue; - const cSchedule *Schedule = schedules->GetSchedule(channel); - if (!Schedule) continue; -@@ -679,17 +800,37 @@ - if (searchTime < now) - searchTime += 24*60*60; - -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ LOCK_SCHEDULES_READ; -+ const cSchedules *schedules = Schedules; -+#else - cSchedulesLock schedulesLock; - const cSchedules *schedules = cSchedules::Schedules(schedulesLock); -+#endif - const cChannel *startChannel = NULL, *stopChannel = NULL; - if (tvguideConfig.favLimitChannels) { -+#if VDRVERSNUM > 20300 -+ startChannel = Channels->GetByNumber(tvguideConfig.favStartChannel); -+ stopChannel = Channels->GetByNumber(tvguideConfig.favStopChannel); -+#else - startChannel = Channels.GetByNumber(tvguideConfig.favStartChannel); - stopChannel = Channels.GetByNumber(tvguideConfig.favStopChannel); -+#endif - } -- if (!startChannel) -+ if (!startChannel) { -+#if VDRVERSNUM > 20300 -+ startChannel = Channels->First(); -+#else - startChannel = Channels.First(); -+#endif -+ } - -+#if VDRVERSNUM > 20300 -+ for (const cChannel *channel = startChannel; channel; channel = Channels->Next(channel)) { -+#else - for (const cChannel *channel = startChannel; channel; channel = Channels.Next(channel)) { -+#endif - if (channel->GroupSep()) continue; - const cSchedule *Schedule = schedules->GetSchedule(channel); - if (!Schedule) continue; -Index: b/recmenuitem.c -=================================================================== ---- a/recmenuitem.c -+++ b/recmenuitem.c -@@ -1817,7 +1817,12 @@ - if (!event) - return; - int logoX = DrawIcons(); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ const cChannel *channel = Channels->GetByChannelID(event->ChannelID()); -+#else - const cChannel *channel = Channels.GetByChannelID(event->ChannelID()); -+#endif - cString channelName = ""; - if (channel) - channelName = channel->Name(); -@@ -1999,14 +2004,26 @@ - if (!channel) - return rmsConsumed; - cChannel *prev = channel; -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ const cChannel *firstChannel = Channels->First(); -+ if(firstChannel->GroupSep()) -+ firstChannel = Channels->Next(firstChannel); -+#else - cChannel *firstChannel = Channels.First(); - if(firstChannel->GroupSep()) - firstChannel = Channels.Next(firstChannel); -+#endif - if (prev == firstChannel) { - if (!initialChannelSet) - channel = NULL; - } else { -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ while (prev = (cChannel *)Channels->Prev(prev)) { -+#else - while (prev = Channels.Prev(prev)) { -+#endif - if(!prev->GroupSep()) { - channel = prev; - break; -@@ -2025,12 +2042,24 @@ - case kRight: { - fresh = true; - if (!channel) { -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ channel = (cChannel *)Channels->First(); -+ if(channel->GroupSep()) -+ channel = (cChannel *)Channels->Next(channel); -+#else - channel = Channels.First(); - if(channel->GroupSep()) - channel = Channels.Next(channel); -+#endif - } else { - cChannel *next = channel; -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ while (next = (cChannel *)Channels->Next(next)) { -+#else - while (next = Channels.Next(next)) { -+#endif - if(!next->GroupSep()) { - channel = next; - break; -@@ -2052,7 +2081,12 @@ - fresh = false; - } - channelNumber = channelNumber * 10 + (Key - k0); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ cChannel *chanNew = (cChannel *)Channels->GetByNumber(channelNumber); -+#else - cChannel *chanNew = Channels.GetByNumber(channelNumber); -+#endif - if (chanNew) { - channel = chanNew; - DrawValue(); -@@ -2242,7 +2276,12 @@ - if (!recording) - return; - const cRecordingInfo *recInfo = recording->Info(); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ cChannel *channel = (cChannel *)Channels->GetByChannelID(recInfo->ChannelID()); -+#else - cChannel *channel = Channels.GetByChannelID(recInfo->ChannelID()); -+#endif - cString channelName = tr("unknown channel"); - if (channel) - channelName = channel->Name(); -@@ -2899,4 +2938,4 @@ - break; - } - return rmsNotConsumed; --} -\ No newline at end of file -+} -Index: b/recmenumanager.c -=================================================================== ---- a/recmenumanager.c -+++ b/recmenumanager.c -@@ -125,7 +125,12 @@ - timerIndex = menu->GetTimerConflictIndex(); - } else break; - int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex); -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ cTimer *t = (cTimer *)Timers->Get(timerID); -+#else - cTimer *t = Timers.Get(timerID); -+#endif - if (t) { - const cEvent *ev = t->Event(); - if (ev) { -@@ -156,7 +161,12 @@ - timerIndex = menu->GetTimerConflictIndex(); - } else break; - int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex); -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ cTimer *timer = (cTimer *)Timers->Get(timerID); -+#else - cTimer *timer = Timers.Get(timerID); -+#endif - if (timer) { - delete activeMenu; - activeMenu = new cRecMenuEditTimer(timer, rmsSaveTimerConflictMenu); -@@ -230,7 +240,12 @@ - recFolder = menu->GetFolder(); - } - delete activeMenu; -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ cChannel *channel = (cChannel *)Channels->GetByChannelID(event->ChannelID()); -+#else - cChannel *channel = Channels.GetByChannelID(event->ChannelID()); -+#endif - activeMenu = new cRecMenuSeriesTimer(channel, event, recFolder); - activeMenu->Display(); - break; } -@@ -606,7 +621,12 @@ - timerConflict = menu->GetTimerConflictIndex(); - } else break; - int timerID = timerConflicts->GetCurrentConflictTimerID(timerConflict); -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ cTimer *timer = (cTimer *)Timers->Get(timerID); -+#else - cTimer *timer = Timers.Get(timerID); -+#endif - if (timer) { - const cEvent *event = timer->Event(); - if (event) { -@@ -648,7 +668,12 @@ - originalConflictIndex = menu->GetTimerConflictIndex(); - } else break; - int originalTimerID = timerConflicts->GetCurrentConflictTimerID(originalConflictIndex); -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ cTimer *timerOriginal = (cTimer *)Timers->Get(originalTimerID); -+#else - cTimer *timerOriginal = Timers.Get(originalTimerID); -+#endif - if (replace && timerOriginal) { - recManager->DeleteTimer(timerOriginal->Event()); - recManager->createTimer(replace); -@@ -820,7 +845,12 @@ - - bool cRecMenuManager::DisplayTimerConflict(cTimer *timer) { - int timerID = 0; -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ for (cTimer *t = (cTimer *)Timers->First(); t; t = (cTimer *)Timers->Next(t)) { -+#else - for (cTimer *t = Timers.First(); t; t = Timers.Next(t)) { -+#endif - if (t == timer) - return DisplayTimerConflict(timerID); - timerID++; -@@ -890,4 +920,4 @@ - } - osdManager.flush(); - return state; --} -\ No newline at end of file -+} -Index: b/recmenus.c -=================================================================== ---- a/recmenus.c -+++ b/recmenus.c -@@ -105,7 +105,12 @@ - // --- cRecMenuConfirmTimer --------------------------------------------------------- - cRecMenuConfirmTimer::cRecMenuConfirmTimer(const cEvent *event) { - SetWidthPercent(50); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ cString channelName = Channels->GetByChannelID(event->ChannelID())->Name(); -+#else - cString channelName = Channels.GetByChannelID(event->ChannelID())->Name(); -+#endif - cString message; - bool eventHasTimer = false; - if (tvguideConfig.useRemoteTimers && pRemoteTimers) { -@@ -143,7 +148,12 @@ - // --- cRecMenuConfirmDeleteTimer --------------------------------------------------------- - cRecMenuConfirmDeleteTimer::cRecMenuConfirmDeleteTimer(const cEvent *event) { - SetWidthPercent(50); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ cString channelName = Channels->GetByChannelID(event->ChannelID())->Name(); -+#else - cString channelName = Channels.GetByChannelID(event->ChannelID())->Name(); -+#endif - cString text = cString::sprintf("%s\n%s\n%s %s - %s\n%s", - tr("Timer deleted"), - *channelName, -@@ -165,7 +175,12 @@ - // --- cRecMenuAskDeleteTimer --------------------------------------------------------- - cRecMenuAskDeleteTimer::cRecMenuAskDeleteTimer(const cEvent *event) { - SetWidthPercent(50); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ cString channelName = Channels->GetByChannelID(event->ChannelID())->Name(); -+#else - cString channelName = Channels.GetByChannelID(event->ChannelID())->Name(); -+#endif - cString text = cString::sprintf("%s \"%s, %s\" %s", - tr("Timer"), - *channelName, -@@ -227,8 +242,15 @@ - conflict->overlapStop)); - SetFooter(new cRecMenuItemButton(tr("Ignore Conflict"), rmsIgnoreTimerConflict, false, true)); - int i=0; -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+#endif - for(std::vector::iterator it = conflict->timerIDs.begin(); it != conflict->timerIDs.end(); it++) { -+#if VDRVERSNUM > 20300 -+ const cTimer *timer = Timers->Get(*it); -+#else - const cTimer *timer = Timers.Get(*it); -+#endif - if (timer) { - if (!AddMenuItemInitial(new cRecMenuItemTimer( timer, - rmsTimerConflictShowInfo, -@@ -252,7 +274,12 @@ - - cRecMenuItem *cRecMenuTimerConflict::GetMenuItem(int number) { - if ((number >= 0) && (number < conflict->timerIDs.size())) { -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ const cTimer *timer = Timers->Get(conflict->timerIDs[number]); -+#else - const cTimer *timer = Timers.Get(conflict->timerIDs[number]); -+#endif - cRecMenuItem *result = new cRecMenuItemTimer( timer, - rmsTimerConflictShowInfo, - rmsDeleteTimerConflictMenu, -@@ -353,8 +380,14 @@ - // --- cRecMenuConfirmRerunUsed --------------------------------------------------------- - cRecMenuConfirmRerunUsed::cRecMenuConfirmRerunUsed(const cEvent *original, const cEvent *replace) { - SetWidthPercent(70); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ cString channelOrig = Channels->GetByChannelID(original->ChannelID())->Name(); -+ cString channelReplace = Channels->GetByChannelID(replace->ChannelID())->Name(); -+#else - cString channelOrig = Channels.GetByChannelID(original->ChannelID())->Name(); - cString channelReplace = Channels.GetByChannelID(replace->ChannelID())->Name(); -+#endif - cString message1 = tr("Timer for"); - cString message2 = tr("replaced by rerun"); - cString text = cString::sprintf("%s\n\"%s\", %s %s, %s\n%s\n\"%s\", %s %s, %s", -@@ -508,7 +541,12 @@ - } - - cTimer *cRecMenuSeriesTimer::GetTimer(void) { -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ cChannel *chan = (cChannel *)Channels->GetByNumber(channel); -+#else - cChannel *chan = Channels.GetByNumber(channel); -+#endif - cTimer *seriesTimer = new cTimer(NULL, NULL, chan); - cString fileName = "TITLE EPISODE"; - if (folder.size() > 0) { -@@ -789,8 +827,14 @@ - startChannel = 1; - if (stopChannel == 0) - stopChannel = 1; -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ useChannelSubMenu.push_back(new cRecMenuItemChannelChooser(tr("Start Channel"), (cChannel *)Channels->GetByNumber(startChannel), false, &startChannel, rmsSearchTimerSave)); -+ useChannelSubMenu.push_back(new cRecMenuItemChannelChooser(tr("Stop Channel"), (cChannel *)Channels->GetByNumber(stopChannel), false, &stopChannel, rmsSearchTimerSave)); -+#else - useChannelSubMenu.push_back(new cRecMenuItemChannelChooser(tr("Start Channel"), Channels.GetByNumber(startChannel), false, &startChannel, rmsSearchTimerSave)); - useChannelSubMenu.push_back(new cRecMenuItemChannelChooser(tr("Stop Channel"), Channels.GetByNumber(stopChannel), false, &stopChannel, rmsSearchTimerSave)); -+#endif - - useTimeSubMenu.push_back(new cRecMenuItemTime(tr("Start after"), startTime, false, &startTime, rmsSearchTimerSave)); - useTimeSubMenu.push_back(new cRecMenuItemTime(tr("Start before"), stopTime, false, &stopTime, rmsSearchTimerSave)); -@@ -1214,7 +1258,12 @@ - // --- cRecMenuSearchConfirmTimer --------------------------------------------------------- - cRecMenuSearchConfirmTimer::cRecMenuSearchConfirmTimer(const cEvent *event, eRecMenuState nextAction) { - SetWidthPercent(50); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ cString channelName = Channels->GetByChannelID(event->ChannelID())->Name(); -+#else - cString channelName = Channels.GetByChannelID(event->ChannelID())->Name(); -+#endif - cString message = tr("Timer created"); - cString text = cString::sprintf("%s\n%s\n%s %s - %s\n%s", - *message, -@@ -1363,7 +1412,12 @@ - - void cRecMenuTimeline::GetTimersForDay(void) { - timersToday.clear(); -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ for (cTimer *t = (cTimer *)Timers->First(); t; t = (cTimer *)Timers->Next(t)) { -+#else - for (cTimer *t = Timers.First(); t; t = Timers.Next(t)) { -+#endif - if (((t->StartTime() > timeStart) && (t->StartTime() <= timeStop)) || ((t->StopTime() > timeStart) && (t->StopTime() <= timeStop))) { - timersToday.push_back(t); - } -@@ -1558,4 +1612,4 @@ - cTVGuideSearchTimer cRecMenuFavorites::GetFavorite(void) { - cRecMenuItemFavorite *activeItem = dynamic_cast(GetActiveMenuItem()); - return activeItem->GetFavorite(); --} -\ No newline at end of file -+} -Index: b/searchtimer.c -=================================================================== ---- a/searchtimer.c -+++ b/searchtimer.c -@@ -16,8 +16,14 @@ - startTime = 0000; - stopTime = 2359; - useChannel = false; -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ channelMin = (cChannel *)Channels->GetByNumber(cDevice::CurrentChannel()); -+ channelMax = (cChannel *)Channels->GetByNumber(cDevice::CurrentChannel()); -+#else - channelMin = Channels.GetByNumber(cDevice::CurrentChannel()); - channelMax = Channels.GetByNumber(cDevice::CurrentChannel()); -+#endif - channelGroup = ""; - useCase = false; - mode = 0; -@@ -239,7 +245,12 @@ - char *channelMinbuffer = NULL; - char *channelMaxbuffer = NULL; - int channels = sscanf(values[value].c_str(), "%a[^|]|%a[^|]", &channelMinbuffer, &channelMaxbuffer); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ channelMin = (cChannel *)Channels->GetByChannelID(tChannelID::FromString(channelMinbuffer), true, true); -+#else - channelMin = Channels.GetByChannelID(tChannelID::FromString(channelMinbuffer), true, true); -+#endif - if (!channelMin) { - channelMin = channelMax = NULL; - useChannel = 0; -@@ -247,7 +258,12 @@ - if (channels == 1) - channelMax = channelMin; - else { -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ channelMax = (cChannel *)Channels->GetByChannelID(tChannelID::FromString(channelMaxbuffer), true, true); -+#else - channelMax = Channels.GetByChannelID(tChannelID::FromString(channelMaxbuffer), true, true); -+#endif - if (!channelMax) { - channelMin = channelMax = NULL; - useChannel = 0; -@@ -511,7 +527,12 @@ - int numTimers = 0; - if (ID < 0) - return numTimers; -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ for (cTimer *timer = (cTimer *)Timers->First(); timer; timer = (cTimer *)Timers->Next(timer)) { -+#else - for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) { -+#endif - char* searchID = GetAuxValue(timer, "s-id"); - if (!searchID) continue; - if (ID == atoi(searchID)) -@@ -525,7 +546,12 @@ - int numRecordings = 0; - if (ID < 0) - return numRecordings; -+#if VDRVERSNUM > 20300 -+ LOCK_RECORDINGS_READ; -+ for (cRecording *recording = (cRecording *)Recordings->First(); recording; recording = (cRecording *)Recordings->Next(recording)) { -+#else - for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) { -+#endif - if (recording->IsEdited()) - continue; - if (!recording->Info()) -Index: b/searchtimer.h -=================================================================== ---- a/searchtimer.h -+++ b/searchtimer.h -@@ -106,8 +106,13 @@ - void SetUseSubtitle(bool useSubtitle) { this->useSubtitle = useSubtitle; }; - void SetUseDesription(bool useDescription) { this->useDescription = useDescription; }; - void SetUseChannel(bool useChannel) { this->useChannel = useChannel; }; -+#if VDRVERSNUM > 20300 -+ void SetStartChannel(int startChannel) { LOCK_CHANNELS_READ; channelMin = (cChannel *)Channels->GetByNumber(startChannel); }; -+ void SetStopChannel(int stopChannel) { LOCK_CHANNELS_READ; channelMax = (cChannel *)Channels->GetByNumber(stopChannel); }; -+#else - void SetStartChannel(int startChannel) { channelMin = Channels.GetByNumber(startChannel); }; - void SetStopChannel(int stopChannel) { channelMax = Channels.GetByNumber(stopChannel); }; -+#endif - void SetUseTime(bool useTime) { this->useTime = useTime; }; - void SetStartTime(int startTime) { this->startTime = startTime; }; - void SetStopTime(int stopTime) { this->stopTime = stopTime; }; -Index: b/tvguideosd.c -=================================================================== ---- a/tvguideosd.c -+++ b/tvguideosd.c -@@ -73,11 +73,20 @@ - - void cTvGuideOsd::drawOsd() { - cPixmap::Lock(); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ cChannel *startChannel = (cChannel *)Channels->GetByNumber(cDevice::CurrentChannel()); -+#else - cChannel *startChannel = Channels.GetByNumber(cDevice::CurrentChannel()); -+#endif - int numBack = tvguideConfig.numGrids / 2; - int offset = 0; - const cChannel *newStartChannel = startChannel; -+#if VDRVERSNUM > 20300 -+ for (; newStartChannel ; newStartChannel = Channels->Prev(newStartChannel)) { -+#else - for (; newStartChannel ; newStartChannel = Channels.Prev(newStartChannel)) { -+#endif - if (newStartChannel && !newStartChannel->GroupSep()) { - offset++; - } -@@ -85,7 +94,11 @@ - break; - } - if (!newStartChannel) -+#if VDRVERSNUM > 20300 -+ newStartChannel = Channels->First(); -+#else - newStartChannel = Channels.First(); -+#endif - offset--; - if (offset < 0) - offset = 0; -@@ -122,7 +135,12 @@ - columns.Clear(); - if (!channelStart) - return; -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ for (const cChannel *channel = channelStart; channel; channel = Channels->Next(channel)) { -+#else - for (const cChannel *channel = channelStart; channel; channel = Channels.Next(channel)) { -+#endif - if (!channel->GroupSep()) { - if (channelGroups->IsInLastGroup(channel)) { - break; -@@ -144,7 +162,11 @@ - int numCurrent = columns.Count(); - int numBack = tvguideConfig.numGrids - numCurrent; - int newChannelNumber = columns.First()->getChannel()->Number() - numBack; -+#if VDRVERSNUM > 20300 -+ const cChannel *newStart = Channels->GetByNumber(newChannelNumber); -+#else - const cChannel *newStart = Channels.GetByNumber(newChannelNumber); -+#endif - readChannels(newStart); - } - } -@@ -213,7 +235,12 @@ - bool colAdded = false; - if (!colRight) { - const cChannel *channelRight = activeGrid->column->getChannel(); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ while (channelRight = Channels->Next(channelRight)) { -+#else - while (channelRight = Channels.Next(channelRight)) { -+#endif - if (!channelRight->GroupSep()) { - if (channelGroups->IsInLastGroup(channelRight)) { - break; -@@ -263,7 +290,12 @@ - bool colAdded = false; - if (!colLeft) { - const cChannel *channelLeft = activeGrid->column->getChannel(); -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ while (channelLeft = Channels->Prev(channelLeft)) { -+#else - while (channelLeft = Channels.Prev(channelLeft)) { -+#endif - if (!channelLeft->GroupSep()) { - colLeft = new cChannelColumn(0, channelLeft, myTime); - if (colLeft->readGrids()) { -@@ -431,14 +463,25 @@ - int currentCol = activeGrid->column->GetNum(); - const cChannel *prev = NULL; - -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+#endif - if (tvguideConfig.channelJumpMode == eGroupJump) { - int prevNum = channelGroups->GetPrevGroupChannelNumber(currentChannel); - if (prevNum) { -+#if VDRVERSNUM > 20300 -+ prev = Channels->GetByNumber(prevNum); -+#else - prev = Channels.GetByNumber(prevNum); -+#endif - } - } else if (tvguideConfig.channelJumpMode == eNumJump) { - int i = tvguideConfig.jumpChannels + 1; -+#if VDRVERSNUM > 20300 -+ for (const cChannel *channel = firstChannel; channel; channel = Channels->Prev(channel)) { -+#else - for (const cChannel *channel = firstChannel; channel; channel = Channels.Prev(channel)) { -+#endif - if (!channel->GroupSep()) { - prev = channel; - i--; -@@ -467,14 +510,25 @@ - const cChannel *firstChannel = columns.First()->getChannel(); - const cChannel *next = NULL; - -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+#endif - if (tvguideConfig.channelJumpMode == eGroupJump) { - int nextNum = channelGroups->GetNextGroupChannelNumber(currentChannel); - if (nextNum) { -+#if VDRVERSNUM > 20300 -+ next = Channels->GetByNumber(nextNum); -+#else - next = Channels.GetByNumber(nextNum); -+#endif - } - } else if (tvguideConfig.channelJumpMode == eNumJump) { - int i=0; -+#if VDRVERSNUM > 20300 -+ for (const cChannel *channel = firstChannel; channel; channel = Channels->Next(channel)) { -+#else - for (const cChannel *channel = firstChannel; channel; channel = Channels.Next(channel)) { -+#endif - if (channelGroups->IsInLastGroup(channel)) { - break; - } -@@ -625,7 +679,12 @@ - int newChannelNum = channelJumper->GetChannel(); - delete channelJumper; - channelJumper = NULL; -+#if VDRVERSNUM > 20300 -+ LOCK_CHANNELS_READ; -+ const cChannel *newChannel = Channels->GetByNumber(newChannelNum); -+#else - const cChannel *newChannel = Channels.GetByNumber(newChannelNum); -+#endif - if (newChannel) { - readChannels(newChannel); - if (columns.Count() > 0) { -Index: b/timerconflict.c -=================================================================== ---- a/timerconflict.c -+++ b/timerconflict.c -@@ -85,8 +85,15 @@ - for (int i=0; i < numConflicts; i++) { - cTimeInterval *unionSet = NULL; - int numTimers = conflicts[i]->timerIDs.size(); -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+#endif - for (int j=0; j < numTimers; j++) { -+#if VDRVERSNUM > 20300 -+ const cTimer *timer = Timers->Get(conflicts[i]->timerIDs[j]); -+#else - const cTimer *timer = Timers.Get(conflicts[i]->timerIDs[j]); -+#endif - if (timer) { - if (!unionSet) { - unionSet = new cTimeInterval(timer->StartTime(), timer->StopTime()); -@@ -105,7 +112,11 @@ - - cTimeInterval *intersect = NULL; - for (int j=0; j < numTimers; j++) { -+#if VDRVERSNUM > 20300 -+ const cTimer *timer = Timers->Get(conflicts[i]->timerIDs[j]); -+#else - const cTimer *timer = Timers.Get(conflicts[i]->timerIDs[j]); -+#endif - if (timer) { - if (!intersect) { - intersect = new cTimeInterval(timer->StartTime(), timer->StopTime()); -@@ -174,4 +185,4 @@ - conflictsFound.push_back(conflicts[i]); - } - return conflictsFound; --} -\ No newline at end of file -+} -Index: b/view.c -=================================================================== ---- a/view.c -+++ b/view.c -@@ -130,7 +130,12 @@ - timerMatch = (eTimerMatch)rtMatch.timerMatch; - ti = rtMatch.timer; - } else { -+#if VDRVERSNUM > 20300 -+ LOCK_TIMERS_READ; -+ ti=(cTimer *)Timers->GetMatch(event, &timerMatch); -+#else - ti=Timers.GetMatch(event, &timerMatch); -+#endif - } - if (timerMatch == tmFull) { - cString recIconText(" REC "); -@@ -1043,4 +1048,4 @@ - } - DrawScrollbar(); - osdManager.flush(); --} -\ No newline at end of file -+} diff --git a/vdr-2.3.5-tvguide.diff b/vdr-2.3.5-tvguide.diff deleted file mode 100644 index 7b5e32e..0000000 --- a/vdr-2.3.5-tvguide.diff +++ /dev/null @@ -1,154 +0,0 @@ -Index: b/epggrid.c -=================================================================== ---- a/epggrid.c -+++ b/epggrid.c -@@ -20,7 +20,7 @@ - void cEpgGrid::SetViewportHeight() { - int viewportHeightOld = viewportHeight; - if ( column->Start() > StartTime() ) { -- viewportHeight = (min((int)EndTime(), column->Stop()) - column->Start()) /60; -+ viewportHeight = (std::min((int)EndTime(), column->Stop()) - column->Start()) /60; - } else if ( column->Stop() < EndTime() ) { - viewportHeight = (column->Stop() - StartTime()) /60; - if (viewportHeight < 0) viewportHeight = 0; -Index: b/imagecache.c -=================================================================== ---- a/imagecache.c -+++ b/imagecache.c -@@ -460,7 +460,7 @@ - } - if (!cornerLeft || !cornerRight) - return; -- int maxX = min(cornerWidth, imgWidth); -+ int maxX = std::min(cornerWidth, imgWidth); - for (int row = 0; row < cornerHeight; row++) { - for (int col = 0; col < maxX; ++col) { - img->SetPixel(cPoint(col, row), cornerLeft->GetPixel(cPoint(col, row))); -@@ -482,7 +482,7 @@ - } - if (!cornerHead || !cornerBottom) - return; -- int maxY = min(cornerHeight, imgHeight); -+ int maxY = std::min(cornerHeight, imgHeight); - for (int row = 0; row < maxY; row++) { - for (int col = 0; col < cornerWidth; ++col) { - img->SetPixel(cPoint(col, row), cornerHead->GetPixel(cPoint(col, row))); -@@ -527,7 +527,7 @@ - int imgWidth = img->Width(); - int imgHeight = img->Height(); - int heightHeadBottom = groupsHead->Height(); -- int maxY = min(heightHeadBottom, imgHeight); -+ int maxY = std::min(heightHeadBottom, imgHeight); - for (int row = 0; row < maxY; row++) { - for (int col = 0; col < imgWidth; ++col) { - img->SetPixel(cPoint(col, row), groupsHead->GetPixel(cPoint(col, row))); -@@ -542,7 +542,7 @@ - int imgWidth = img->Width(); - int imgHeight = img->Height(); - int widthLeftRight = groupsLeft->Width(); -- int maxX = min(widthLeftRight, imgWidth); -+ int maxX = std::min(widthLeftRight, imgWidth); - for (int row = 0; row < imgHeight; row++) { - for (int col = 0; col < maxX; ++col) { - img->SetPixel(cPoint(col, row), groupsLeft->GetPixel(cPoint(col, row))); -Index: b/recmenuitem.c -=================================================================== ---- a/recmenuitem.c -+++ b/recmenuitem.c -@@ -543,7 +543,7 @@ - void cRecMenuItemSelect::DrawValue(void) { - pixmapVal->Fill(clrTransparent); - std::string textVal = strings[currentVal]; -- int iconSize = min(128, height); -+ int iconSize = std::min(128, height); - int textX = width - font->Width(textVal.c_str()) - iconSize; - int textY = (height - font->Height()) / 2; - pixmapVal->DrawText(cPoint(textX, textY), textVal.c_str(), colorText, clrTransparent, font); -@@ -644,7 +644,7 @@ - - void cRecMenuItemSelectDirectory::DrawValue(void) { - pixmapVal->Fill(clrTransparent); -- int iconSize = min(128, height); -+ int iconSize = std::min(128, height); - int textX = width - font->Width(folders[currentVal].c_str()) - iconSize; - int textY = (height - font->Height()) / 2; - pixmapVal->DrawText(cPoint(textX, textY), folders[currentVal].c_str(), colorText, clrTransparent, font); -@@ -948,7 +948,7 @@ - if (specialChar) - addition = 1; - Utf8FromArray(startCharUtf8, p, numChars+addition); -- int maxChars = min(numChars+1+addition, 8); -+ int maxChars = std::min(numChars+1+addition, 8); - char *smskey = new char[maxChars]; - Utf8Strn0Cpy(smskey, p, maxChars); - return smskey; -@@ -2161,7 +2161,7 @@ - if (charWidth > maxWidth) - maxWidth = charWidth; - } -- daysSize = min(maxWidth + 15, height-4); -+ daysSize = std::min(maxWidth + 15, height-4); - daysX = width - 10 - 7*daysSize; - daysY = (height - daysSize) / 2; - } -Index: b/statusheader.c -=================================================================== ---- a/statusheader.c -+++ b/statusheader.c -@@ -82,7 +82,7 @@ - int lineHeight = fontManager.FontStatusHeader->Height(); - int textLines = description.Lines(); - int maxLines = heightText / lineHeight; -- int lines = min(textLines, maxLines); -+ int lines = std::min(textLines, maxLines); - for (int i = 0; i < lines-1; i++) { - pixmapText->DrawText(cPoint(x,y), description.GetLine(i), theme.Color(clrFont), colorTextBack, fontManager.FontStatusHeader); - y += lineHeight; -@@ -139,4 +139,4 @@ - pixmapTVFrame->DrawEllipse(cRect(frame, height - radius - frame, radius, radius), theme.Color(clrBackgroundOSD), -3); - pixmapTVFrame->DrawRectangle(cRect(0, height - frame, tvFrameWidth, frame), theme.Color(clrBackgroundOSD)); - pixmapTVFrame->DrawEllipse(cRect(tvFrameWidth - radius - frame, height - radius - frame, radius, radius), theme.Color(clrBackgroundOSD), -4); --} -\ No newline at end of file -+} -Index: b/switchtimer.c -=================================================================== ---- a/switchtimer.c -+++ b/switchtimer.c -@@ -20,6 +20,23 @@ - } - } - -+cSwitchTimer::cSwitchTimer(const cSwitchTimer &SwitchTimer) { -+ eventID = 0; -+ startTime = 0; -+ switchMinsBefore = 0; -+ announceOnly = 0; -+ *this = SwitchTimer; -+} -+ -+cSwitchTimer& cSwitchTimer::operator= (const cSwitchTimer &SwitchTimer) { -+ this->eventID = SwitchTimer.eventID; -+ this->startTime = SwitchTimer.startTime; -+ this->channelID = SwitchTimer.channelID; -+ this->switchMinsBefore = SwitchTimer.switchMinsBefore; -+ this->announceOnly = SwitchTimer.announceOnly; -+ return *this; -+} -+ - bool cSwitchTimer::Parse(const char *s) { - char *line; - char *pos; -Index: b/switchtimer.h -=================================================================== ---- a/switchtimer.h -+++ b/switchtimer.h -@@ -12,6 +12,8 @@ - int announceOnly; - cSwitchTimer(void); - cSwitchTimer(const cEvent* Event); -+ cSwitchTimer(const cSwitchTimer &SwitchTimer); -+ cSwitchTimer& operator= (const cSwitchTimer &SwitchTimer); - bool Parse(const char *s); - void SetEventID(tEventID eventID) { this->eventID = eventID; }; - void SetStartTime(time_t startTime) { this->startTime = startTime; }; diff --git a/vdr-2.3.7-tvguide.diff b/vdr-2.3.7-tvguide.diff deleted file mode 100644 index 1a5eca5..0000000 --- a/vdr-2.3.7-tvguide.diff +++ /dev/null @@ -1,14 +0,0 @@ -Index: b/channelcolumn.h -=================================================================== ---- a/channelcolumn.h -+++ b/channelcolumn.h -@@ -20,7 +20,9 @@ - const cChannel *channel; - cHeaderGrid *header; - cList grids; -+#if VDRVERSNUM < 20300 - cSchedulesLock *schedulesLock; -+#endif - const cSchedules *schedules; - bool hasTimer; - bool hasSwitchTimer; diff --git a/vdr-tvguide.conf b/vdr-tvguide.conf index b3f5188..85ba963 100644 --- a/vdr-tvguide.conf +++ b/vdr-tvguide.conf @@ -3,4 +3,4 @@ # Add command line options to pass to the tvguide plugin to PLUGIN_OPTIONS. # See /usr/share/doc/vdr-tvguide/README for info about available options. -PLUGIN_OPTIONS="--logodir=/usr/share/vdr/plugins/tvguide/channellogos/ --epgimages=/usr/share/vdr/plugins/tvguide/epgimages/ --icons=/usr/share/vdr/plugins/tvguide/epgimages/" +PLUGIN_OPTIONS="--logopath=/usr/share/vdr/plugins/tvguide/channellogos/ --epgimages=/usr/share/vdr/plugins/tvguide/epgimages/ --iconpath=/usr/share/vdr/plugins/tvguide/epgimages/" diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 14bd935..dbc0f27 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,15 +1,12 @@ Name: vdr-tvguide -Version: 1.2.2 -Release: 18%{?dist} +Version: 1.2.8 +Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide -Source0: http://projects.vdr-developer.org/attachments/download/1624/%{name}-%{version}.tgz +Source0: https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git/snapshot/vdr-plugin-tvguide-%{version}.tar.bz2 # Configuration files for plugin parameters. These are Fedora specific and not in upstream. Source1: %{name}.conf -Patch1: vdr-2.3.1-tvguide.diff -Patch2: vdr-2.3.5-tvguide.diff -Patch3: vdr-2.3.7-tvguide.diff BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: GraphicsMagick-c++-devel @@ -20,12 +17,9 @@ Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} VDR plugin: tvguide - %{summary} %prep -%autosetup -p1 -n tvguide-%{version} +%autosetup -p1 -n vdr-plugin-tvguide-%{version} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README -# std::auto_ptr deprecation warning in libstdc++ 5.1 -sed -i -e 's| std::auto_ptr| std::unique_ptr|g' services/epgsearch.h - %build make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=graphicsmagick %{?_smp_mflags} all @@ -50,6 +44,10 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Jun 22 2019 Martin Gansser - 1.2.8-1 +- Update to 1.2.8 +- Spec file cleanup + * Tue Jun 18 2019 Martin Gansser - 1.2.2-18 - Rebuilt for new VDR API version From e438dea7bc6a5f9145b41e1027c884589f121753 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 2 Jul 2019 21:14:44 +0200 Subject: [PATCH 10/69] Use Imagemagick due segfault with Graphicsmagick --- vdr-tvguide.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index dbc0f27..529f661 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide Version: 1.2.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -9,7 +9,7 @@ Source0: https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git/sn Source1: %{name}.conf BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: GraphicsMagick-c++-devel +BuildRequires: ImageMagick-c++-devel BuildRequires: vdr-devel >= 2.0.0 Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} @@ -21,7 +21,7 @@ VDR plugin: tvguide - %{summary} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=graphicsmagick %{?_smp_mflags} all +make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=imagemagick %{?_smp_mflags} all %install # make install would install the themes under /etc, let's not use that @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Tue Jul 02 2019 Martin Gansser - 1.2.8-2 +- Use Imagemagick due segfault with Graphicsmagick + * Sat Jun 22 2019 Martin Gansser - 1.2.8-1 - Update to 1.2.8 - Spec file cleanup From 5040029a643df4a187b1114c2c646d259db3619d Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 5 Jul 2019 22:24:07 +0200 Subject: [PATCH 11/69] Update to 1.2.9 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 314e7cf..cf831cd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /vdr-tvguide-1.2.2.tgz /vdr-tvguide.conf /vdr-plugin-tvguide-1.2.8.tar.bz2 +/vdr-plugin-tvguide-1.2.9.tar.bz2 diff --git a/sources b/sources index 99e67ba..c0c0a59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-tvguide-1.2.8.tar.bz2) = 65e0de6609675ca46296a71a95d579d83c3096e3bdcab7659641050778529e1574ea36e33104d244f29bc8933e2b4b8d1132229b47c380c913dd1438bc541980 +SHA512 (vdr-plugin-tvguide-1.2.9.tar.bz2) = f2f02e564d7dd181d861320062a47cc620b88bc9c64bad52599448d27e4a03b7aeb39888f38ec60f88498bcff7d8e55ab60e5900948dac48caab077f63bb9cf8 diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 529f661..6502044 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide -Version: 1.2.8 -Release: 2%{?dist} +Version: 1.2.9 +Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Fri Jul 05 2019 Martin Gansser - 1.2.9-1 +- Update to 1.2.9 + * Tue Jul 02 2019 Martin Gansser - 1.2.8-2 - Use Imagemagick due segfault with Graphicsmagick From 820302f6522bc67e24dea8b65761e286d2adb0ae Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 22 Jul 2019 08:45:57 +0200 Subject: [PATCH 12/69] Update to 1.2.10 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cf831cd..ae51c12 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /vdr-tvguide.conf /vdr-plugin-tvguide-1.2.8.tar.bz2 /vdr-plugin-tvguide-1.2.9.tar.bz2 +/vdr-plugin-tvguide-1.2.10.tar.bz2 diff --git a/sources b/sources index c0c0a59..e7d4849 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-tvguide-1.2.9.tar.bz2) = f2f02e564d7dd181d861320062a47cc620b88bc9c64bad52599448d27e4a03b7aeb39888f38ec60f88498bcff7d8e55ab60e5900948dac48caab077f63bb9cf8 +SHA512 (vdr-plugin-tvguide-1.2.10.tar.bz2) = 542a22531d2b702a054edc69ffde39bbd60cf0ad50466ba191e49a6d5a5a6514ffbb9a82c99ada5a9ecac73809968a843f664063bedf59be473928c8bb7d2bcf diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 6502044..64e8bc1 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,5 +1,5 @@ Name: vdr-tvguide -Version: 1.2.9 +Version: 1.2.10 Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Mon Jul 22 2019 Martin Gansser - 1.2.10-1 +- Update to 1.2.10 + * Fri Jul 05 2019 Martin Gansser - 1.2.9-1 - Update to 1.2.9 From d2bf6ad3aee532b73e08a4d5b33c8550dd71af16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:53:07 +0000 Subject: [PATCH 13/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 64e8bc1..5095e93 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide Version: 1.2.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.2.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Jul 22 2019 Martin Gansser - 1.2.10-1 - Update to 1.2.10 From 6a093ee59dc99afd4fd02886fe91c6a0e5df0adb Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 11 Sep 2019 21:35:17 +0200 Subject: [PATCH 14/69] Update to 1.2.11 Use Graphicsmagick again, fixed segfault with graphicsmagick > 1.3.31 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ae51c12..4bb2c33 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /vdr-plugin-tvguide-1.2.8.tar.bz2 /vdr-plugin-tvguide-1.2.9.tar.bz2 /vdr-plugin-tvguide-1.2.10.tar.bz2 +/vdr-plugin-tvguide-1.2.11.tar.bz2 diff --git a/sources b/sources index e7d4849..1c8e43b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-tvguide-1.2.10.tar.bz2) = 542a22531d2b702a054edc69ffde39bbd60cf0ad50466ba191e49a6d5a5a6514ffbb9a82c99ada5a9ecac73809968a843f664063bedf59be473928c8bb7d2bcf +SHA512 (vdr-plugin-tvguide-1.2.11.tar.bz2) = dff0d0cad600a8008d119d2472fe832fba30bca78bf63b0b0907de8ee8ad94da445c8a664b8977ae0fcfb427b0e802818a4139edda3ac0629de4e60730845de8 diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 5095e93..7bdb69a 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide -Version: 1.2.10 -Release: 2%{?dist} +Version: 1.2.11 +Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -9,7 +9,7 @@ Source0: https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git/sn Source1: %{name}.conf BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: ImageMagick-c++-devel +BuildRequires: GraphicsMagick-c++-devel BuildRequires: vdr-devel >= 2.0.0 Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} @@ -21,7 +21,7 @@ VDR plugin: tvguide - %{summary} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=imagemagick %{?_smp_mflags} all +make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=graphicsmagick %{?_smp_mflags} all %install # make install would install the themes under /etc, let's not use that @@ -44,6 +44,10 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Wed Sep 11 2019 Martin Gansser - 1.2.11-1 +- Update to 1.2.11 +- Use Graphicsmagick again, fixed segfault with graphicsmagick > 1.3.31 + * Sat Jul 27 2019 Fedora Release Engineering - 1.2.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From c6b389ea2cf435b746e93713e3e70da5816a015b Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 14 Oct 2019 15:35:08 +0200 Subject: [PATCH 15/69] Update to 1.2.12 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4bb2c33..269e4cd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /vdr-plugin-tvguide-1.2.9.tar.bz2 /vdr-plugin-tvguide-1.2.10.tar.bz2 /vdr-plugin-tvguide-1.2.11.tar.bz2 +/vdr-plugin-tvguide-1.2.12.tar.bz2 diff --git a/sources b/sources index 1c8e43b..ccd96d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-tvguide-1.2.11.tar.bz2) = dff0d0cad600a8008d119d2472fe832fba30bca78bf63b0b0907de8ee8ad94da445c8a664b8977ae0fcfb427b0e802818a4139edda3ac0629de4e60730845de8 +SHA512 (vdr-plugin-tvguide-1.2.12.tar.bz2) = e58f05c11aeb992008a61302a999640e908496c11e78487a17c20c5d94617a04a3c39e9299496cc43dea3cafc5ad3175841d5bdf241ab7caf338497b85dd760d diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 7bdb69a..2d3dd0b 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,5 +1,5 @@ Name: vdr-tvguide -Version: 1.2.11 +Version: 1.2.12 Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Mon Oct 14 2019 Martin Gansser - 1.2.12-1 +- Update to 1.2.12 + * Wed Sep 11 2019 Martin Gansser - 1.2.11-1 - Update to 1.2.11 - Use Graphicsmagick again, fixed segfault with graphicsmagick > 1.3.31 From 68a0729a1be0e18a5c67b7f4c64f6026acc0c57e Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 15 Oct 2019 09:13:37 +0200 Subject: [PATCH 16/69] Update to 1.2.13 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 269e4cd..f45a29f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /vdr-plugin-tvguide-1.2.10.tar.bz2 /vdr-plugin-tvguide-1.2.11.tar.bz2 /vdr-plugin-tvguide-1.2.12.tar.bz2 +/vdr-plugin-tvguide-1.2.13.tar.bz2 diff --git a/sources b/sources index ccd96d2..ff93715 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-tvguide-1.2.12.tar.bz2) = e58f05c11aeb992008a61302a999640e908496c11e78487a17c20c5d94617a04a3c39e9299496cc43dea3cafc5ad3175841d5bdf241ab7caf338497b85dd760d +SHA512 (vdr-plugin-tvguide-1.2.13.tar.bz2) = 3de937ad3e5a035cd2be60a10a5bfd1ee6823978ebcd1eb2efbeba28ac495cbcdab9c5fdd0d6d8a4ce804af1ff9dc4be7e17e680d879b24908848dc1dbeaea36 diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 2d3dd0b..a811365 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,5 +1,5 @@ Name: vdr-tvguide -Version: 1.2.12 +Version: 1.2.13 Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Tue Oct 15 2019 Martin Gansser - 1.2.13-1 +- Update to 1.2.13 + * Mon Oct 14 2019 Martin Gansser - 1.2.12-1 - Update to 1.2.12 From fc7a2ff5aec58d3007904a6d77f77341b7a92d13 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 20 Oct 2019 20:03:33 +0200 Subject: [PATCH 17/69] Update to 1.2.14 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f45a29f..1c59a30 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /vdr-plugin-tvguide-1.2.11.tar.bz2 /vdr-plugin-tvguide-1.2.12.tar.bz2 /vdr-plugin-tvguide-1.2.13.tar.bz2 +/vdr-plugin-tvguide-1.2.14.tar.bz2 diff --git a/sources b/sources index ff93715..b157b4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-tvguide-1.2.13.tar.bz2) = 3de937ad3e5a035cd2be60a10a5bfd1ee6823978ebcd1eb2efbeba28ac495cbcdab9c5fdd0d6d8a4ce804af1ff9dc4be7e17e680d879b24908848dc1dbeaea36 +SHA512 (vdr-plugin-tvguide-1.2.14.tar.bz2) = cdd8ca017af8eb375cf63f3f46ea8540d1777bd275e1a7cd5f0bfe970927a3f689f5578769121c94240e552f42052f05ce9450231d82f9be7f0c664397b9b52d diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index a811365..22120cb 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,5 +1,5 @@ Name: vdr-tvguide -Version: 1.2.13 +Version: 1.2.14 Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sun Oct 20 2019 Martin Gansser - 1.2.14-1 +- Update to 1.2.14 + * Tue Oct 15 2019 Martin Gansser - 1.2.13-1 - Update to 1.2.13 From 93aa363724e1ff6194d3a66cb8b5ebe5eb5948bd Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 4 Nov 2019 13:00:45 +0100 Subject: [PATCH 18/69] Update to 1.2.15 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1c59a30..c48b616 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /vdr-plugin-tvguide-1.2.12.tar.bz2 /vdr-plugin-tvguide-1.2.13.tar.bz2 /vdr-plugin-tvguide-1.2.14.tar.bz2 +/vdr-plugin-tvguide-1.2.15.tar.bz2 diff --git a/sources b/sources index b157b4d..cbefa16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-tvguide-1.2.14.tar.bz2) = cdd8ca017af8eb375cf63f3f46ea8540d1777bd275e1a7cd5f0bfe970927a3f689f5578769121c94240e552f42052f05ce9450231d82f9be7f0c664397b9b52d +SHA512 (vdr-plugin-tvguide-1.2.15.tar.bz2) = 7f1381a86e68dd6937d130755bf67704374d24b32a4197e1a6b1fe9a7d10625810d57dd3401705604da9575b9e4ee108c179d250286ff2ebeda661272c798f07 diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 22120cb..64365e2 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,5 +1,5 @@ Name: vdr-tvguide -Version: 1.2.14 +Version: 1.2.15 Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Mon Nov 04 2019 Martin Gansser - 1.2.15-1 +- Update to 1.2.15 + * Sun Oct 20 2019 Martin Gansser - 1.2.14-1 - Update to 1.2.14 From e3c57d7b987538df3962e776a06dc9771ebe126a Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 10 Jan 2020 15:24:34 +0100 Subject: [PATCH 19/69] Update to 1.2.16 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c48b616..c993599 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /vdr-plugin-tvguide-1.2.13.tar.bz2 /vdr-plugin-tvguide-1.2.14.tar.bz2 /vdr-plugin-tvguide-1.2.15.tar.bz2 +/vdr-plugin-tvguide-1.2.16.tar.bz2 diff --git a/sources b/sources index cbefa16..7ead142 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-tvguide-1.2.15.tar.bz2) = 7f1381a86e68dd6937d130755bf67704374d24b32a4197e1a6b1fe9a7d10625810d57dd3401705604da9575b9e4ee108c179d250286ff2ebeda661272c798f07 +SHA512 (vdr-plugin-tvguide-1.2.16.tar.bz2) = 7777008dbe193d7a2b3561010da2b22ed90f99e6db5649e80d74eb1583f6da6f3041c40a79d11a97a15b214f82c299a5f7bdbe2396e993ef9065170bf1713025 diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 64365e2..efe362c 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,5 +1,5 @@ Name: vdr-tvguide -Version: 1.2.15 +Version: 1.2.16 Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Fri Jan 10 2020 Martin Gansser - 1.2.16-1 +- Update to 1.2.16 + * Mon Nov 04 2019 Martin Gansser - 1.2.15-1 - Update to 1.2.15 From 4a45914c8645aa2024a89cf438fa33bbbe6d0c8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:02:38 +0000 Subject: [PATCH 20/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index efe362c..219e431 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide Version: 1.2.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.2.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 10 2020 Martin Gansser - 1.2.16-1 - Update to 1.2.16 From 27059ae6b16e382125d8f4b299b3397c4c6ebf9d Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 18 Feb 2020 11:14:04 +0100 Subject: [PATCH 21/69] Update to 1.2.17 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c993599..408e6bb 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /vdr-plugin-tvguide-1.2.14.tar.bz2 /vdr-plugin-tvguide-1.2.15.tar.bz2 /vdr-plugin-tvguide-1.2.16.tar.bz2 +/vdr-plugin-tvguide-1.2.17.tar.bz2 diff --git a/sources b/sources index 7ead142..3c544d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-tvguide-1.2.16.tar.bz2) = 7777008dbe193d7a2b3561010da2b22ed90f99e6db5649e80d74eb1583f6da6f3041c40a79d11a97a15b214f82c299a5f7bdbe2396e993ef9065170bf1713025 +SHA512 (vdr-plugin-tvguide-1.2.17.tar.bz2) = 8fc1a1caf5f1a8c4a008082adb6f2c18085e3d293e15f7635302992b6f803b328c05a8368b68afa80cfb9deb36b4d2c7554a02a6ed856347d727cb2a175049d3 diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 219e431..f0aa2ec 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide -Version: 1.2.16 -Release: 2%{?dist} +Version: 1.2.17 +Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -44,8 +44,8 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog -* Fri Jan 31 2020 Fedora Release Engineering - 1.2.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Feb 18 2020 Martin Gansser - 1.2.17-1 +- Update to 1.2.17 * Fri Jan 10 2020 Martin Gansser - 1.2.16-1 - Update to 1.2.16 From daa246b43aed64569e15d9e5093cee37736e5629 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 18 Feb 2020 11:18:43 +0100 Subject: [PATCH 22/69] Update to 1.2.17 --- vdr-tvguide.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index f0aa2ec..4bcac30 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -47,6 +47,9 @@ install -Dpm 644 %{SOURCE1} \ * Tue Feb 18 2020 Martin Gansser - 1.2.17-1 - Update to 1.2.17 +* Fri Jan 31 2020 Fedora Release Engineering - 1.2.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 10 2020 Martin Gansser - 1.2.16-1 - Update to 1.2.16 From c688242139f5757b87acf67efba27c6cb25c10b3 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 8 Mar 2020 10:40:20 +0100 Subject: [PATCH 23/69] Update to 1.3.0 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 408e6bb..b47d807 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /vdr-plugin-tvguide-1.2.15.tar.bz2 /vdr-plugin-tvguide-1.2.16.tar.bz2 /vdr-plugin-tvguide-1.2.17.tar.bz2 +/vdr-plugin-tvguide-1.3.0.tar.bz2 diff --git a/sources b/sources index 3c544d5..d05aced 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-tvguide-1.2.17.tar.bz2) = 8fc1a1caf5f1a8c4a008082adb6f2c18085e3d293e15f7635302992b6f803b328c05a8368b68afa80cfb9deb36b4d2c7554a02a6ed856347d727cb2a175049d3 +SHA512 (vdr-plugin-tvguide-1.3.0.tar.bz2) = e5ce99d002e6106e7cb9819a4fd4e267b03501f97da680ca755e76afef75891320b06fbe2d71670815fb69235da44905cf363ee4b70c50d5eeae3a96d228832b diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 4bcac30..16e8f80 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,5 +1,5 @@ Name: vdr-tvguide -Version: 1.2.17 +Version: 1.3.0 Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sun Mar 08 2020 Martin Gansser - 1.3.0-1 +- Update to 1.3.0 + * Tue Feb 18 2020 Martin Gansser - 1.2.17-1 - Update to 1.2.17 From c7e3db148740762c943089e2b514adf11dbaa83a Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 12 Mar 2020 12:13:09 +0100 Subject: [PATCH 24/69] Update to 1.3.1 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b47d807..bf48c9f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /vdr-plugin-tvguide-1.2.16.tar.bz2 /vdr-plugin-tvguide-1.2.17.tar.bz2 /vdr-plugin-tvguide-1.3.0.tar.bz2 +/vdr-plugin-tvguide-1.3.1.tar.bz2 diff --git a/sources b/sources index d05aced..0ea78b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-tvguide-1.3.0.tar.bz2) = e5ce99d002e6106e7cb9819a4fd4e267b03501f97da680ca755e76afef75891320b06fbe2d71670815fb69235da44905cf363ee4b70c50d5eeae3a96d228832b +SHA512 (vdr-plugin-tvguide-1.3.1.tar.bz2) = a41a5bb098250c72325a57f96375a2af613e19fff59d4949815f0e80548108f8c5dc032a7a70a611ec3f01abe9aae0a3ecad40ef1ce067010d36239b85997b63 diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 16e8f80..d16e377 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,5 +1,5 @@ Name: vdr-tvguide -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Thu Mar 12 2020 Martin Gansser - 1.3.1-1 +- Update to 1.3.1 + * Sun Mar 08 2020 Martin Gansser - 1.3.0-1 - Update to 1.3.0 From 4c16dd56d0882ccc480607868dd2cb8b05f27284 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:37:41 +0000 Subject: [PATCH 25/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index d16e377..4ef95f5 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Mar 12 2020 Martin Gansser - 1.3.1-1 - Update to 1.3.1 From 8b85d7c0913772a5d5bc7dfd0b957ea32ec78f43 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 7 Aug 2020 10:57:11 +0200 Subject: [PATCH 26/69] Update to 1.3.3 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bf48c9f..0e24b9c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /vdr-plugin-tvguide-1.2.17.tar.bz2 /vdr-plugin-tvguide-1.3.0.tar.bz2 /vdr-plugin-tvguide-1.3.1.tar.bz2 +/vdr-plugin-tvguide-1.3.3.tar.bz2 diff --git a/sources b/sources index 0ea78b8..8999d4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-tvguide-1.3.1.tar.bz2) = a41a5bb098250c72325a57f96375a2af613e19fff59d4949815f0e80548108f8c5dc032a7a70a611ec3f01abe9aae0a3ecad40ef1ce067010d36239b85997b63 +SHA512 (vdr-plugin-tvguide-1.3.3.tar.bz2) = be4b1d4fbffac3856a01e0c127e26b30b886766f845619b170659bd170898c83b940f2de44ee378e3e28ac48928b06615656994341d272c6e61e2bf739497a11 diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 4ef95f5..4c0c2fd 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide -Version: 1.3.1 -Release: 2%{?dist} +Version: 1.3.3 +Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Fri Aug 07 2020 Martin Gansser - 1.3.3-1 +- Update to 1.3.3 + * Wed Jul 29 2020 Fedora Release Engineering - 1.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ef1f39ddbacea5691faa86f3797086e5784fb37f Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 18 Aug 2020 14:42:19 -0600 Subject: [PATCH 27/69] Force C++14 as this code is not C++17 ready --- vdr-tvguide.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 4c0c2fd..eb211e0 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide Version: 1.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -21,7 +21,7 @@ VDR plugin: tvguide - %{summary} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=graphicsmagick %{?_smp_mflags} all +make CFLAGS="%{optflags} -fPIC" CXXFLAGS="-std=c++14 %{optflags} -fPIC" IMAGELIB=graphicsmagick %{?_smp_mflags} all %install # make install would install the themes under /etc, let's not use that @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Tue Aug 18 2020 Jeff Law - 1.3.3-2 +- Force C++14 as this code is not C++17 ready + * Fri Aug 07 2020 Martin Gansser - 1.3.3-1 - Update to 1.3.3 From d3a3677dad400239c7d97d0da9f0bf4224d714d8 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 28 Aug 2020 11:16:43 +0200 Subject: [PATCH 28/69] Rebuilt for new VDR API version --- vdr-tvguide.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index eb211e0..75d5d78 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -21,7 +21,7 @@ VDR plugin: tvguide - %{summary} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -make CFLAGS="%{optflags} -fPIC" CXXFLAGS="-std=c++14 %{optflags} -fPIC" IMAGELIB=graphicsmagick %{?_smp_mflags} all +make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=graphicsmagick %{?_smp_mflags} all %install # make install would install the themes under /etc, let's not use that @@ -44,8 +44,8 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog -* Tue Aug 18 2020 Jeff Law - 1.3.3-2 -- Force C++14 as this code is not C++17 ready +* Fri Aug 28 2020 Martin Gansser - 1.3.3-2 +- Rebuilt for new VDR API version * Fri Aug 07 2020 Martin Gansser - 1.3.3-1 - Update to 1.3.3 From 3f5670f457f1a57579f2dd0569555df186c5917a Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 28 Aug 2020 11:21:20 +0200 Subject: [PATCH 29/69] Rebuilt for new VDR API version --- vdr-tvguide.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 75d5d78..fa7f572 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide Version: 1.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -21,7 +21,7 @@ VDR plugin: tvguide - %{summary} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=graphicsmagick %{?_smp_mflags} all +make CFLAGS="%{optflags} -fPIC" CXXFLAGS="-std=c++14 %{optflags} -fPIC" IMAGELIB=graphicsmagick %{?_smp_mflags} all %install # make install would install the themes under /etc, let's not use that @@ -44,9 +44,12 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog -* Fri Aug 28 2020 Martin Gansser - 1.3.3-2 +* Fri Aug 28 2020 Martin Gansser - 1.3.3-3 - Rebuilt for new VDR API version +* Tue Aug 18 2020 Jeff Law - 1.3.3-2 +- Force C++14 as this code is not C++17 ready + * Fri Aug 07 2020 Martin Gansser - 1.3.3-1 - Update to 1.3.3 From b9218f9af078163693ea56835b20a5742452e189 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 14 Nov 2020 11:12:14 +0100 Subject: [PATCH 30/69] Use Imagemagick due segfault with Graphicsmagick fix (BZ#1897776) --- vdr-tvguide.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index fa7f572..70151e1 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide Version: 1.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -9,7 +9,7 @@ Source0: https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git/sn Source1: %{name}.conf BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: GraphicsMagick-c++-devel +BuildRequires: ImageMagick-c++-devel BuildRequires: vdr-devel >= 2.0.0 Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} @@ -21,7 +21,7 @@ VDR plugin: tvguide - %{summary} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -make CFLAGS="%{optflags} -fPIC" CXXFLAGS="-std=c++14 %{optflags} -fPIC" IMAGELIB=graphicsmagick %{?_smp_mflags} all +make CFLAGS="%{optflags} -fPIC" CXXFLAGS="-std=c++14 %{optflags} -fPIC" IMAGELIB=imagemagick %{?_smp_mflags} all %install # make install would install the themes under /etc, let's not use that @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Nov 14 2020 Martin Gansser - 1.3.3-4 +- Use Imagemagick due segfault with Graphicsmagick fix (BZ#1897776) + * Fri Aug 28 2020 Martin Gansser - 1.3.3-3 - Rebuilt for new VDR API version From 2f2dc85d28ae8f12793d530292084c5104e99925 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 3 Jan 2021 18:28:11 +0100 Subject: [PATCH 31/69] Rebuilt for new VDR API version --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 70151e1..bc6c151 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,6 @@ Name: vdr-tvguide Version: 1.3.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-tvguide @@ -44,6 +44,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sun Jan 03 2021 Martin Gansser - 1.3.3-5 +- Rebuilt for new VDR API version + * Sat Nov 14 2020 Martin Gansser - 1.3.3-4 - Use Imagemagick due segfault with Graphicsmagick fix (BZ#1897776) From 904b49f27806eb99661bc9ce2b3359c242b5d5df Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:39:59 +0000 Subject: [PATCH 32/69] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vdr-tvguide.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index bc6c151..6cd3aa3 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -7,6 +7,7 @@ URL: http://projects.vdr-developer.org/projects/plg-tvguide Source0: https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git/snapshot/vdr-plugin-tvguide-%{version}.tar.bz2 # Configuration files for plugin parameters. These are Fedora specific and not in upstream. Source1: %{name}.conf +BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: ImageMagick-c++-devel From d4f955a12fd95101ee91bae4f917163803b2de90 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 11 Jan 2021 14:20:12 +0100 Subject: [PATCH 33/69] Update to 1.3.4 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 20 +++++++++++++------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 0e24b9c..fcdb872 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /vdr-plugin-tvguide-1.3.0.tar.bz2 /vdr-plugin-tvguide-1.3.1.tar.bz2 /vdr-plugin-tvguide-1.3.3.tar.bz2 +/tvguide-v1.3.4.tar.bz2 diff --git a/sources b/sources index 8999d4d..3189ac5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-tvguide-1.3.3.tar.bz2) = be4b1d4fbffac3856a01e0c127e26b30b886766f845619b170659bd170898c83b940f2de44ee378e3e28ac48928b06615656994341d272c6e61e2bf739497a11 +SHA512 (tvguide-v1.3.4.tar.bz2) = 6940e0fe69a4ab188b92bdcd4dc417793cdc6ea137ae51b44393b472f5b6ee2696bcef69c5607e3b5498ecab8527e947cbf11d2c14f413ba24d0ee7fc27c83e1 diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 6cd3aa3..b03744c 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,13 +1,16 @@ +%global pname tvguide + Name: vdr-tvguide -Version: 1.3.3 -Release: 5%{?dist} +Version: 1.3.4 +Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ -URL: http://projects.vdr-developer.org/projects/plg-tvguide -Source0: https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git/snapshot/vdr-plugin-tvguide-%{version}.tar.bz2 +URL: https://gitlab.com/kamel5/tvguide +Source0: https://gitlab.com/kamel5/%{pname}/-/archive/v%{version}/%{pname}-v%{version}.tar.bz2 # Configuration files for plugin parameters. These are Fedora specific and not in upstream. Source1: %{name}.conf -BuildRequires: make + +BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: ImageMagick-c++-devel @@ -18,11 +21,11 @@ Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} VDR plugin: tvguide - %{summary} %prep -%autosetup -p1 -n vdr-plugin-tvguide-%{version} +%autosetup -p1 -n %{pname}-v%{version} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -make CFLAGS="%{optflags} -fPIC" CXXFLAGS="-std=c++14 %{optflags} -fPIC" IMAGELIB=imagemagick %{?_smp_mflags} all +make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=imagemagick %{?_smp_mflags} all %install # make install would install the themes under /etc, let's not use that @@ -45,6 +48,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Mon Jan 11 2021 Martin Gansser - 1.3.4-1 +- Update to 1.3.4 + * Sun Jan 03 2021 Martin Gansser - 1.3.3-5 - Rebuilt for new VDR API version From 5cbaa7c4ac91ae634b0364dc9cfa2667f67b2f49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:59:11 +0000 Subject: [PATCH 34/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index b03744c..60d7247 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,7 +2,7 @@ Name: vdr-tvguide Version: 1.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -48,6 +48,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 11 2021 Martin Gansser - 1.3.4-1 - Update to 1.3.4 From 7ccad13d15ba629083e6819f4fb4b999536bec1c Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 28 Apr 2021 12:44:52 +0200 Subject: [PATCH 35/69] Rebuilt for new VDR API version --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 60d7247..46515fd 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,7 +2,7 @@ Name: vdr-tvguide Version: 1.3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -48,6 +48,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Wed Apr 28 2021 Martin Gansser - 1.3.4-3 +- Rebuilt for new VDR API version + * Wed Jan 27 2021 Fedora Release Engineering - 1.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 06129a4a08588f8f108870293efec6e2ec2772d9 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 22 May 2021 17:50:01 +0200 Subject: [PATCH 36/69] Update to 1.3.5 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fcdb872..a3aff7e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /vdr-plugin-tvguide-1.3.1.tar.bz2 /vdr-plugin-tvguide-1.3.3.tar.bz2 /tvguide-v1.3.4.tar.bz2 +/tvguide-v1.3.5.tar.bz2 diff --git a/sources b/sources index 3189ac5..b1ca2c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tvguide-v1.3.4.tar.bz2) = 6940e0fe69a4ab188b92bdcd4dc417793cdc6ea137ae51b44393b472f5b6ee2696bcef69c5607e3b5498ecab8527e947cbf11d2c14f413ba24d0ee7fc27c83e1 +SHA512 (tvguide-v1.3.5.tar.bz2) = 1784c396f40c693d9996ddd3b047c1cf8db2a20b97e4fe9e1cabd09c6fa19efe9f43f7cc136c70b6cdd9cd111011f63be44be0f67282b9fad5e196e51f340f2a diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 46515fd..0fbd744 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,8 +1,8 @@ %global pname tvguide Name: vdr-tvguide -Version: 1.3.4 -Release: 3%{?dist} +Version: 1.3.5 +Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -48,6 +48,10 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat May 22 2021 Martin Gansser - 1.3.5-1 +- Update to 1.3.5 + + * Wed Apr 28 2021 Martin Gansser - 1.3.4-3 - Rebuilt for new VDR API version From af8fb71a9ef6da442f2e0494b45f41934a5f4faa Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 22 May 2021 17:51:14 +0200 Subject: [PATCH 37/69] Update to 1.3.5 --- vdr-tvguide.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 0fbd744..a96fe2d 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -51,7 +51,6 @@ install -Dpm 644 %{SOURCE1} \ * Sat May 22 2021 Martin Gansser - 1.3.5-1 - Update to 1.3.5 - * Wed Apr 28 2021 Martin Gansser - 1.3.4-3 - Rebuilt for new VDR API version From 361e245c7db4a735415e031eda6b2bd141561d07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:23:01 +0000 Subject: [PATCH 38/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index a96fe2d..139b93d 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,7 +2,7 @@ Name: vdr-tvguide Version: 1.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -48,6 +48,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat May 22 2021 Martin Gansser - 1.3.5-1 - Update to 1.3.5 From cac2f40451d11ba41786c3a7ad8b1527b251ba76 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 16 Oct 2021 13:12:55 +0200 Subject: [PATCH 39/69] Rebuilt due FTI in rawhide --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 139b93d..e0604bd 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,7 +2,7 @@ Name: vdr-tvguide Version: 1.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -48,6 +48,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Oct 16 2021 Martin Gansser - 1.3.5-3 +- Rebuilt due FTI in rawhide + * Fri Jul 23 2021 Fedora Release Engineering - 1.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 906fa8de3a9afbe89c26f53169f9e3a2fa27831d Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 30 Dec 2021 19:06:25 +0100 Subject: [PATCH 40/69] Rebuilt for new VDR API version --- vdr-tvguide.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index e0604bd..0b9cf7e 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,7 +2,7 @@ Name: vdr-tvguide Version: 1.3.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -25,7 +25,7 @@ VDR plugin: tvguide - %{summary} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=imagemagick %{?_smp_mflags} all +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=imagemagick %install # make install would install the themes under /etc, let's not use that @@ -48,6 +48,12 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Thu Dec 30 2021 Martin Gansser - 1.3.5-4 +- Rebuilt for new VDR API version + +* Fri Nov 26 2021 Mamoru TASAKA - 1.3.5-1.1 +- rebuild for new ImageMagick + * Sat Oct 16 2021 Martin Gansser - 1.3.5-3 - Rebuilt due FTI in rawhide From ee02d0524f62e9e3f5bff2b694119876f1ede52b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:53:13 +0000 Subject: [PATCH 41/69] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 0b9cf7e..9582c3a 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,7 +2,7 @@ Name: vdr-tvguide Version: 1.3.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -48,6 +48,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.3.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 30 2021 Martin Gansser - 1.3.5-4 - Rebuilt for new VDR API version From 34b26981970b3e2b2a57a7bafa5ae008e1151e4d Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 5 Feb 2022 11:24:13 +0100 Subject: [PATCH 42/69] Rebuilt for new VDR API version --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 9582c3a..06c5d62 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,7 +2,7 @@ Name: vdr-tvguide Version: 1.3.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -48,6 +48,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Feb 05 2022 Martin Gansser - 1.3.5-6 +- Rebuilt for new VDR API version + * Sat Jan 22 2022 Fedora Release Engineering - 1.3.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From e3964f9f486d09cc3a6b3461e43fdb278c1c85b5 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 2 May 2022 09:24:30 +0200 Subject: [PATCH 43/69] Add Fixed-possible-segfault-when-showing-scrollbar.patch --- ...ible-segfault-when-showing-scrollbar.patch | 76 +++++++++++++++++++ vdr-tvguide.spec | 7 +- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 Fixed-possible-segfault-when-showing-scrollbar.patch diff --git a/Fixed-possible-segfault-when-showing-scrollbar.patch b/Fixed-possible-segfault-when-showing-scrollbar.patch new file mode 100644 index 0000000..e3aaf42 --- /dev/null +++ b/Fixed-possible-segfault-when-showing-scrollbar.patch @@ -0,0 +1,76 @@ +From eb259fb96143dccf42f41523093987eb1fcdb739 Mon Sep 17 00:00:00 2001 +From: kamel5 +Date: Thu, 7 Apr 2022 13:31:15 +0200 +Subject: Fixed possible segfault when showing scrollbar in search result lists + +A segfault is possible if numSteps is greater than height in +"cRecMenu::createScrollbar()". + +diff --git a/recmenu.c b/recmenu.c +index 32650c1..3f2916f 100644 +--- a/recmenu.c ++++ b/recmenu.c +@@ -123,8 +123,7 @@ void cRecMenu::InitMenu(bool complete) { + width -= scrollbarWidth + border; + osdManager.releasePixmap(pixmapScrollBar); + pixmapScrollBar = NULL; +- delete imgScrollBar; +- imgScrollBar = NULL; ++ DELETENULL(imgScrollBar); + } + osdManager.releasePixmap(pixmap); + pixmap = NULL; +@@ -592,14 +591,14 @@ void cRecMenu::DrawScrollBar(void) { + if (!pixmapScrollBar) + return; + pixmapScrollBar->Fill(theme.Color(clrBorder)); +- pixmapScrollBar->DrawRectangle(cRect(2,2,pixmapScrollBar->ViewPort().Width()-4, pixmapScrollBar->ViewPort().Height() - 4), theme.Color(clrBackground)); ++ pixmapScrollBar->DrawRectangle(cRect(2, 2, pixmapScrollBar->ViewPort().Width() - 4, pixmapScrollBar->ViewPort().Height() - 4), theme.Color(clrBackground)); + + int totalNumItems = GetTotalNumMenuItems(); + if (!totalNumItems) + return; +- if (imgScrollBar == NULL) { ++ if (!imgScrollBar) { + int scrollBarImgHeight = (pixmapScrollBar->ViewPort().Height() - 8) * numItems / totalNumItems; +- imgScrollBar = createScrollbar(pixmapScrollBar->ViewPort().Width()-8, scrollBarImgHeight, theme.Color(clrHighlight), theme.Color(clrHighlightBlending)); ++ imgScrollBar = createScrollbar(pixmapScrollBar->ViewPort().Width() - 8, scrollBarImgHeight, theme.Color(clrHighlight), theme.Color(clrHighlightBlending)); + } + int offset = (pixmapScrollBar->ViewPort().Height() - 8) * startIndex / totalNumItems; + pixmapScrollBar->DrawImage(cPoint(4, 2 + offset), *imgScrollBar); +@@ -678,25 +677,21 @@ eRecMenuState cRecMenu::ProcessKey(eKeys Key) { + cImage *cRecMenu::createScrollbar(int width, int height, tColor clrBgr, tColor clrBlend) { + cImage *image = new cImage(cSize(width, height)); + image->Fill(clrBgr); +- if (config.style != eStyleFlat) { ++ if (height >= 32 && config.style != eStyleFlat) { + int numSteps = 64; + int alphaStep = 0x03; +- if (height < 30) +- return image; +- else if (height < 100) { ++ if (height < 100) { + numSteps = 32; + alphaStep = 0x06; + } +- int stepY = 0.5*height / numSteps; +- if (stepY == 0) +- stepY = 1; ++ int stepY = std::max(1, (int)(0.5 * height / numSteps)); + int alpha = 0x40; + tColor clr; +- for (int i = 0; iSetPixel(cPoint(x,y), clr); ++ for (int y = i * stepY; y < (i + 1) * stepY; y++) { ++ for (int x = 0; x < width; x++) { ++ image->SetPixel(cPoint(x, y), clr); + } + } + alpha += alphaStep; +-- +cgit v0.10.2 + diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 06c5d62..c5b48c7 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,13 +2,15 @@ Name: vdr-tvguide Version: 1.3.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide Source0: https://gitlab.com/kamel5/%{pname}/-/archive/v%{version}/%{pname}-v%{version}.tar.bz2 # Configuration files for plugin parameters. These are Fedora specific and not in upstream. Source1: %{name}.conf +# https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git/patch/?id=eb259fb96143dccf42f41523093987eb1fcdb739 +Patch0: Fixed-possible-segfault-when-showing-scrollbar.patch BuildRequires: make BuildRequires: gcc @@ -48,6 +50,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Mon May 02 2022 Martin Gansser - 1.3.5-7 +- Add Fixed-possible-segfault-when-showing-scrollbar.patch + * Sat Feb 05 2022 Martin Gansser - 1.3.5-6 - Rebuilt for new VDR API version From 469c400cab00e6904ce2a79ee5e34a73f4c63ed3 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 26 Jun 2022 05:10:21 +0200 Subject: [PATCH 44/69] Update to 1.3.6 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 20 +++++++++++++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a3aff7e..7693084 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /vdr-plugin-tvguide-1.3.3.tar.bz2 /tvguide-v1.3.4.tar.bz2 /tvguide-v1.3.5.tar.bz2 +/tvguide-v1.3.6.tar.bz2 diff --git a/sources b/sources index b1ca2c7..c49ee70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tvguide-v1.3.5.tar.bz2) = 1784c396f40c693d9996ddd3b047c1cf8db2a20b97e4fe9e1cabd09c6fa19efe9f43f7cc136c70b6cdd9cd111011f63be44be0f67282b9fad5e196e51f340f2a +SHA512 (tvguide-v1.3.6.tar.bz2) = 23688e5247e1e3e4c7be3f989acd62ee271406503895324ee50551c8dabe816e25c4d0d63da9c57ce999bfdfd48a5b9a59c785cd8837a4fb778a52f8eab2e917 diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index c5b48c7..a7cf97c 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,22 +1,29 @@ %global pname tvguide +# version we want build against +%global vdr_version 2.4.0 +%if 0%{?fedora} >= 36 +%global vdr_version 2.6.1 +%endif +%if 0%{?fedora} == 35 +%global vdr_version 2.4.7 +%endif + Name: vdr-tvguide -Version: 1.3.5 -Release: 7%{?dist} +Version: 1.3.6 +Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide Source0: https://gitlab.com/kamel5/%{pname}/-/archive/v%{version}/%{pname}-v%{version}.tar.bz2 # Configuration files for plugin parameters. These are Fedora specific and not in upstream. Source1: %{name}.conf -# https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git/patch/?id=eb259fb96143dccf42f41523093987eb1fcdb739 -Patch0: Fixed-possible-segfault-when-showing-scrollbar.patch BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: ImageMagick-c++-devel -BuildRequires: vdr-devel >= 2.0.0 +BuildRequires: vdr-devel >= %{vdr_version} Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} %description @@ -50,6 +57,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sun Jun 26 2022 Martin Gansser - 1.3.6-1 +- Update to 1.3.6 + * Mon May 02 2022 Martin Gansser - 1.3.5-7 - Add Fixed-possible-segfault-when-showing-scrollbar.patch From ad833fc40ed1765115fbe0d095e7654c87ac26c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:47:14 +0000 Subject: [PATCH 45/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index a7cf97c..d4d51fc 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -11,7 +11,7 @@ Name: vdr-tvguide Version: 1.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -57,6 +57,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jun 26 2022 Martin Gansser - 1.3.6-1 - Update to 1.3.6 From 8d56f8a97f48867874e5dbd6e56b67e2688f6744 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 1 Dec 2022 16:06:28 +0100 Subject: [PATCH 46/69] Rebuilt for new VDR API version --- vdr-tvguide.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index d4d51fc..4b8f2a1 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,17 +1,15 @@ %global pname tvguide # version we want build against -%global vdr_version 2.4.0 -%if 0%{?fedora} >= 36 +# version we want build against %global vdr_version 2.6.1 -%endif -%if 0%{?fedora} == 35 -%global vdr_version 2.4.7 +%if 0%{?fedora} >= 38 +%global vdr_version 2.6.2 %endif Name: vdr-tvguide Version: 1.3.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -57,6 +55,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Thu Dec 01 2022 Martin Gansser - 1.3.6-3 +- Rebuilt for new VDR API version + * Sat Jul 23 2022 Fedora Release Engineering - 1.3.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 25fe49c443306564cb22f7ebd580c6dc7efb02a6 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 14 Dec 2022 16:35:49 +0100 Subject: [PATCH 47/69] Rebuilt for new VDR API version --- vdr-tvguide.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 4b8f2a1..5ce2b45 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -3,13 +3,13 @@ # version we want build against %global vdr_version 2.6.1 %if 0%{?fedora} >= 38 -%global vdr_version 2.6.2 +%global vdr_version 2.6.3 %endif Name: vdr-tvguide Version: 1.3.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -55,6 +55,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Wed Dec 14 2022 Martin Gansser - 1.3.6-4 +- Rebuilt for new VDR API version + * Thu Dec 01 2022 Martin Gansser - 1.3.6-3 - Rebuilt for new VDR API version From f7c64e4cec7896da8cc9db412fc276a4b161c130 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 7 Jan 2023 18:07:33 +0100 Subject: [PATCH 48/69] Rebuilt against graphicsmagick due new ImageMagick 7 --- vdr-tvguide.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 5ce2b45..ad03565 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,6 +1,5 @@ %global pname tvguide # version we want build against -# version we want build against %global vdr_version 2.6.1 %if 0%{?fedora} >= 38 %global vdr_version 2.6.3 @@ -9,7 +8,7 @@ Name: vdr-tvguide Version: 1.3.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -20,7 +19,7 @@ Source1: %{name}.conf BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: ImageMagick-c++-devel +BuildRequires: pkgconfig(GraphicsMagick++) BuildRequires: vdr-devel >= %{vdr_version} Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} @@ -32,7 +31,7 @@ VDR plugin: tvguide - %{summary} iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README %build -%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=imagemagick +%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=graphicsmagick %install # make install would install the themes under /etc, let's not use that @@ -55,6 +54,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Jan 07 2023 Martin Gansser - 1.3.6-5 +- Rebuilt against graphicsmagick due new ImageMagick 7 + * Wed Dec 14 2022 Martin Gansser - 1.3.6-4 - Rebuilt for new VDR API version From 404d74935cd805c4458446b0883b34492695d0fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:12:22 +0000 Subject: [PATCH 49/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index ad03565..3c38f25 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -8,7 +8,7 @@ Name: vdr-tvguide Version: 1.3.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -54,6 +54,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.3.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jan 07 2023 Martin Gansser - 1.3.6-5 - Rebuilt against graphicsmagick due new ImageMagick 7 From a2023666c601df941879274fe02ee132391284a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:31:46 +0000 Subject: [PATCH 50/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 3c38f25..e315040 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -8,7 +8,7 @@ Name: vdr-tvguide Version: 1.3.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -54,6 +54,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.3.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.3.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6d34271c67970a72b618a0c89f92ed8c8cd22918 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 26 Aug 2023 10:06:29 +0200 Subject: [PATCH 51/69] Update to 1.3.7 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7693084..958d553 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /tvguide-v1.3.4.tar.bz2 /tvguide-v1.3.5.tar.bz2 /tvguide-v1.3.6.tar.bz2 +/tvguide-v1.3.7.tar.bz2 diff --git a/sources b/sources index c49ee70..5db664b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tvguide-v1.3.6.tar.bz2) = 23688e5247e1e3e4c7be3f989acd62ee271406503895324ee50551c8dabe816e25c4d0d63da9c57ce999bfdfd48a5b9a59c785cd8837a4fb778a52f8eab2e917 +SHA512 (tvguide-v1.3.7.tar.bz2) = b06b2b9bba288d0cda493d6a5495c65506544909ab5dfe6ad13d5edaa4416a262229e4f632b9dcd56f7f37ba552e185ad371117f8912fbf5ed3e3925c6ac821f diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index e315040..4d640e8 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -7,8 +7,8 @@ Name: vdr-tvguide -Version: 1.3.6 -Release: 7%{?dist} +Version: 1.3.7 +Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -54,6 +54,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Aug 26 2023 Martin Gansser - 1.3.7-1 +- Update to 1.3.7 + * Sat Jul 22 2023 Fedora Release Engineering - 1.3.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ba1f6ee8dcab2a5db0a232cee8c22966e4adf1da Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 22 Nov 2023 09:44:16 +0100 Subject: [PATCH 52/69] Update to 1.3.8 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 958d553..03bc63a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /tvguide-v1.3.5.tar.bz2 /tvguide-v1.3.6.tar.bz2 /tvguide-v1.3.7.tar.bz2 +/tvguide-v1.3.8.tar.bz2 diff --git a/sources b/sources index 5db664b..a878977 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tvguide-v1.3.7.tar.bz2) = b06b2b9bba288d0cda493d6a5495c65506544909ab5dfe6ad13d5edaa4416a262229e4f632b9dcd56f7f37ba552e185ad371117f8912fbf5ed3e3925c6ac821f +SHA512 (tvguide-v1.3.8.tar.bz2) = d99399b112148f9206d5a88c4e825330dae107b2d93dc3969d5eaf83011cd1b4fc673d0918090b135f4553838fc4f8438146982bad5b1731d99d71408692e820 diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 4d640e8..92b7ce3 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -7,7 +7,7 @@ Name: vdr-tvguide -Version: 1.3.7 +Version: 1.3.8 Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ @@ -54,6 +54,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Wed Nov 22 2023 Martin Gansser - 1.3.8-1 +- Update to 1.3.8 + * Sat Aug 26 2023 Martin Gansser - 1.3.7-1 - Update to 1.3.7 From b23fea4060d5c93ee90c8d1041f9eecd87213580 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 5 Jan 2024 18:37:17 +0100 Subject: [PATCH 53/69] Rebuilt for new VDR API version --- vdr-tvguide.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 92b7ce3..cf244a2 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,14 +1,14 @@ %global pname tvguide # version we want build against -%global vdr_version 2.6.1 -%if 0%{?fedora} >= 38 %global vdr_version 2.6.3 +%if 0%{?fedora} >= 40 +%global vdr_version 2.6.5 %endif Name: vdr-tvguide Version: 1.3.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -54,6 +54,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Fri Jan 05 2024 Martin Gansser - 1.3.8-2 +- Rebuilt for new VDR API version + * Wed Nov 22 2023 Martin Gansser - 1.3.8-1 - Update to 1.3.8 From be8635ed88e4a26907495f9bd78427b93377f8eb Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 5 Jan 2024 18:51:39 +0100 Subject: [PATCH 54/69] Rebuilt for new VDR API version Add BR gettext for rawhide --- vdr-tvguide.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index cf244a2..0bc91be 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -19,6 +19,7 @@ Source1: %{name}.conf BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: gettext BuildRequires: pkgconfig(GraphicsMagick++) BuildRequires: vdr-devel >= %{vdr_version} Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} @@ -56,6 +57,7 @@ install -Dpm 644 %{SOURCE1} \ %changelog * Fri Jan 05 2024 Martin Gansser - 1.3.8-2 - Rebuilt for new VDR API version +- Add BR gettext for rawhide * Wed Nov 22 2023 Martin Gansser - 1.3.8-1 - Update to 1.3.8 From d0a6be0aa8ad010e4298ca62e96104b86b733f87 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 26 Jan 2024 11:26:34 +0100 Subject: [PATCH 55/69] Rebuilt for new VDR API version --- vdr-tvguide.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 0bc91be..368327c 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,13 +2,12 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.5 +%global vdr_version 2.6.6 %endif - Name: vdr-tvguide Version: 1.3.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -55,6 +54,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Fri Jan 26 2024 Martin Gansser - 1.3.8-3 +- Rebuilt for new VDR API version + * Fri Jan 05 2024 Martin Gansser - 1.3.8-2 - Rebuilt for new VDR API version - Add BR gettext for rawhide From 76bba062f7d5ac14eef6575c9465f26a6b033332 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 12 Apr 2024 16:02:12 +0200 Subject: [PATCH 56/69] Rebuilt for new VDR API version --- vdr-tvguide.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 368327c..3bd4292 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,12 +2,12 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.6 +%global vdr_version 2.6.7 %endif Name: vdr-tvguide Version: 1.3.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -54,6 +54,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Fri Apr 12 2024 Martin Gansser - 1.3.8-4 +- Rebuilt for new VDR API version + * Fri Jan 26 2024 Martin Gansser - 1.3.8-3 - Rebuilt for new VDR API version From e2a44c211c5e0322c790576feb64e09eca041cf7 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Thu, 11 Jul 2024 14:39:35 +0200 Subject: [PATCH 57/69] Rebuilt for new VDR API version 2.6.8 --- vdr-tvguide.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 3bd4292..596604b 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,12 +2,12 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.7 +%global vdr_version 2.6.8 %endif Name: vdr-tvguide Version: 1.3.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -54,6 +54,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Thu Jul 11 2024 Martin Gansser - 1.3.8-5 +- Rebuilt for new VDR API version 2.6.8 + * Fri Apr 12 2024 Martin Gansser - 1.3.8-4 - Rebuilt for new VDR API version From 164df42f9b47e306ccee323eb6a143c9ae49cf69 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Mon, 15 Jul 2024 16:18:54 +0200 Subject: [PATCH 58/69] Rebuilt for new VDR API version 2.6.9 --- vdr-tvguide.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 596604b..f6bd72c 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,12 +2,12 @@ # version we want build against %global vdr_version 2.6.3 %if 0%{?fedora} >= 40 -%global vdr_version 2.6.8 +%global vdr_version 2.6.9 %endif Name: vdr-tvguide Version: 1.3.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -54,6 +54,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Mon Jul 15 2024 Martin Gansser - 1.3.8-6 +- Rebuilt for new VDR API version 2.6.9 + * Thu Jul 11 2024 Martin Gansser - 1.3.8-5 - Rebuilt for new VDR API version 2.6.8 From 4c55ab274cd2eccce6f1d3aa5682f7589429ad5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:40:48 +0000 Subject: [PATCH 59/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index f6bd72c..f9ea04d 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -7,7 +7,7 @@ Name: vdr-tvguide Version: 1.3.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPLv2+ URL: https://gitlab.com/kamel5/tvguide @@ -54,6 +54,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.3.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 15 2024 Martin Gansser - 1.3.8-6 - Rebuilt for new VDR API version 2.6.9 From d10c415348da4b722334b1d203626ac24d918bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:34:11 +0200 Subject: [PATCH 60/69] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vdr-tvguide.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index f9ea04d..4a30d18 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -7,9 +7,10 @@ Name: vdr-tvguide Version: 1.3.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://gitlab.com/kamel5/tvguide Source0: https://gitlab.com/kamel5/%{pname}/-/archive/v%{version}/%{pname}-v%{version}.tar.bz2 # Configuration files for plugin parameters. These are Fedora specific and not in upstream. @@ -54,6 +55,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Fri Jul 26 2024 Miroslav Suchý - 1.3.8-8 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.3.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From fd05d27aee9c734b1e2854ba5a4ca676e1f656a3 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 9 Oct 2024 14:45:18 +0200 Subject: [PATCH 61/69] Rebuilt for new VDR API version 2.7.2 Update to 1.3.9 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 16 +++++++++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 03bc63a..80bb4b5 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /tvguide-v1.3.6.tar.bz2 /tvguide-v1.3.7.tar.bz2 /tvguide-v1.3.8.tar.bz2 +/tvguide-v1.3.9.tar.bz2 diff --git a/sources b/sources index a878977..25cd3b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tvguide-v1.3.8.tar.bz2) = d99399b112148f9206d5a88c4e825330dae107b2d93dc3969d5eaf83011cd1b4fc673d0918090b135f4553838fc4f8438146982bad5b1731d99d71408692e820 +SHA512 (tvguide-v1.3.9.tar.bz2) = 7ab36ceab2e3f69dc3a4bce8da08114f87e84b3aa0577aae870eb7546738451ba01af2eff9863bbc59cac51e4d217d405beb3e974c074af687359ad0ea85f685 diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 4a30d18..55b5824 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,15 +1,17 @@ %global pname tvguide -# version we want build against +# version we want to build against %global vdr_version 2.6.3 -%if 0%{?fedora} >= 40 +# Set vdr_version based on Fedora version +%if 0%{?fedora} >= 42 +%global vdr_version 2.7.2 +%elif 0%{?fedora} >= 40 %global vdr_version 2.6.9 %endif Name: vdr-tvguide -Version: 1.3.8 -Release: 8%{?dist} +Version: 1.3.9 +Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://gitlab.com/kamel5/tvguide Source0: https://gitlab.com/kamel5/%{pname}/-/archive/v%{version}/%{pname}-v%{version}.tar.bz2 @@ -55,6 +57,10 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Wed Oct 09 2024 Martin Gansser - 1.3.9-1 +- Rebuilt for new VDR API version 2.7.2 +- Update to 1.3.9 + * Fri Jul 26 2024 Miroslav Suchý - 1.3.8-8 - convert license to SPDX From ef2b7fdc23f8b01dd046e46a2c065ae23c38dfbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:14:01 +0000 Subject: [PATCH 62/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 55b5824..0241dae 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -10,7 +10,7 @@ Name: vdr-tvguide Version: 1.3.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPL-2.0-or-later URL: https://gitlab.com/kamel5/tvguide @@ -57,6 +57,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.3.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Oct 09 2024 Martin Gansser - 1.3.9-1 - Rebuilt for new VDR API version 2.7.2 - Update to 1.3.9 From b46b00cbf12c5a97aa5920bfa35c7ddd1edc53d5 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Fri, 28 Feb 2025 11:39:58 +0100 Subject: [PATCH 63/69] Rebuilt for new VDR API version 2.7.4 --- vdr-tvguide.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 0241dae..c7c6fb2 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,16 +1,14 @@ %global pname tvguide # version we want to build against -%global vdr_version 2.6.3 +%global vdr_version 2.6.9 # Set vdr_version based on Fedora version %if 0%{?fedora} >= 42 -%global vdr_version 2.7.2 -%elif 0%{?fedora} >= 40 -%global vdr_version 2.6.9 +%global vdr_version 2.7.4 %endif Name: vdr-tvguide Version: 1.3.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPL-2.0-or-later URL: https://gitlab.com/kamel5/tvguide @@ -57,6 +55,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Fri Feb 28 2025 Martin Gansser - 1.3.9-3 +- Rebuilt for new VDR API version 2.7.4 + * Sun Jan 19 2025 Fedora Release Engineering - 1.3.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ad31374d19191fe9e808e545ede43f6a5514c7a3 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Tue, 27 May 2025 17:10:28 +0200 Subject: [PATCH 64/69] Rebuilt for new VDR API version 2.7.5 --- vdr-tvguide.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index c7c6fb2..db80596 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -1,14 +1,17 @@ %global pname tvguide -# version we want to build against -%global vdr_version 2.6.9 + # Set vdr_version based on Fedora version -%if 0%{?fedora} >= 42 +%if 0%{?fedora} >= 43 +%global vdr_version 2.7.5 +%elif 0%{?fedora} == 42 %global vdr_version 2.7.4 +%else +%global vdr_version 2.6.9 %endif Name: vdr-tvguide Version: 1.3.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPL-2.0-or-later URL: https://gitlab.com/kamel5/tvguide @@ -55,6 +58,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Tue May 27 2025 Martin Gansser - 1.3.9-4 +- Rebuilt for new VDR API version 2.7.5 + * Fri Feb 28 2025 Martin Gansser - 1.3.9-3 - Rebuilt for new VDR API version 2.7.4 From 634e582362a9e5f6da3c35a96b1e849491e02ab9 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 22 Jun 2025 12:25:55 +0200 Subject: [PATCH 65/69] Rebuilt for new VDR API version 2.7.6 --- vdr-tvguide.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index db80596..fcfe818 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,7 +2,7 @@ # Set vdr_version based on Fedora version %if 0%{?fedora} >= 43 -%global vdr_version 2.7.5 +%global vdr_version 2.7.6 %elif 0%{?fedora} == 42 %global vdr_version 2.7.4 %else @@ -11,7 +11,7 @@ Name: vdr-tvguide Version: 1.3.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPL-2.0-or-later URL: https://gitlab.com/kamel5/tvguide @@ -58,6 +58,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Jun 21 2025 Martin Gansser - 1.3.9-5 +- Rebuilt for new VDR API version 2.7.6 + * Tue May 27 2025 Martin Gansser - 1.3.9-4 - Rebuilt for new VDR API version 2.7.5 From 6d7f236134048a31adbe82af6908b59110a36f30 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 19 Jul 2025 09:59:54 +0200 Subject: [PATCH 66/69] Update to 1.3.11 --- .gitignore | 1 + sources | 2 +- vdr-tvguide.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 80bb4b5..199c04d 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /tvguide-v1.3.7.tar.bz2 /tvguide-v1.3.8.tar.bz2 /tvguide-v1.3.9.tar.bz2 +/tvguide-v1.3.11.tar.bz2 diff --git a/sources b/sources index 25cd3b1..ede51e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tvguide-v1.3.9.tar.bz2) = 7ab36ceab2e3f69dc3a4bce8da08114f87e84b3aa0577aae870eb7546738451ba01af2eff9863bbc59cac51e4d217d405beb3e974c074af687359ad0ea85f685 +SHA512 (tvguide-v1.3.11.tar.bz2) = 2ba24c92c64eb9e3aacb890419235c0fb53b9c8ccb3a71f6c40e1474055ee5067ba64ae2223958045a6bb2523f7e7b319e2ffec28f03b3bbc78897d4850d4318 diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index fcfe818..34b9883 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -10,8 +10,8 @@ %endif Name: vdr-tvguide -Version: 1.3.9 -Release: 5%{?dist} +Version: 1.3.11 +Release: 1%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPL-2.0-or-later URL: https://gitlab.com/kamel5/tvguide @@ -58,6 +58,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Sat Jul 19 2025 Martin Gansser - 1.3.11-1 +- Update to 1.3.11 + * Sat Jun 21 2025 Martin Gansser - 1.3.9-5 - Rebuilt for new VDR API version 2.7.6 From cd416624af9280cb1084c517bd7d2f47728a8d0b Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sat, 19 Jul 2025 10:01:06 +0200 Subject: [PATCH 67/69] Update to 1.3.11 --- vdr-tvguide.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 34b9883..bc44969 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -59,7 +59,7 @@ install -Dpm 644 %{SOURCE1} \ %changelog * Sat Jul 19 2025 Martin Gansser - 1.3.11-1 -- Update to 1.3.11 +- Update to 1.3.11 * Sat Jun 21 2025 Martin Gansser - 1.3.9-5 - Rebuilt for new VDR API version 2.7.6 From 3a5bdfa84ff38261bea5919b877e44ccb5a33a0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:01:58 +0000 Subject: [PATCH 68/69] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vdr-tvguide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index bc44969..1ebc035 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -11,7 +11,7 @@ Name: vdr-tvguide Version: 1.3.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPL-2.0-or-later URL: https://gitlab.com/kamel5/tvguide @@ -58,6 +58,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.3.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jul 19 2025 Martin Gansser - 1.3.11-1 - Update to 1.3.11 From 9be945634af61747668eda517302adcda56cce08 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Sun, 27 Jul 2025 18:36:05 +0200 Subject: [PATCH 69/69] Rebuilt for new VDR API version 2.7.7 --- vdr-tvguide.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-tvguide.spec b/vdr-tvguide.spec index 1ebc035..60a29a3 100644 --- a/vdr-tvguide.spec +++ b/vdr-tvguide.spec @@ -2,7 +2,7 @@ # Set vdr_version based on Fedora version %if 0%{?fedora} >= 43 -%global vdr_version 2.7.6 +%global vdr_version 2.7.7 %elif 0%{?fedora} == 42 %global vdr_version 2.7.4 %else @@ -11,7 +11,7 @@ Name: vdr-tvguide Version: 1.3.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: TvGuide is a highly customizable 2D EPG viewer plugin License: GPL-2.0-or-later URL: https://gitlab.com/kamel5/tvguide @@ -58,6 +58,9 @@ install -Dpm 644 %{SOURCE1} \ %{vdr_resdir}/plugins/tvguide/ %changelog +* Fri Jul 25 2025 Martin Gansser - 1.3.11-3 +- Rebuilt for new VDR API version 2.7.7 + * Fri Jul 25 2025 Fedora Release Engineering - 1.3.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild