jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9613 from heitbaum/vdr

Browse Source 
vdr-addon: update addon (4)
This commit is contained in:
Christian Hewitt 2024-12-24 12:02:58 +04:00 committed by GitHub
commit 7a70911f0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 7 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-eepg"
PKG_VERSION="6be7f2ee644aa33bd6e6e038548be8a85514272e"
PKG_SHA256="f8698d8e72c4e1239a57ba4a0b2f54020270506d5dce7298f3080fcc8d59f56f"
PKG_VERSION="0.0.7"
PKG_SHA256="7ef5ffb0eb26895561215a7e24e4a33123d626c19d59cc0d1ea013c07209bc40"
PKG_LICENSE="GPL"
PKG_SITE="http://projects.vdr-developer.org/projects/plg-eepg"
PKG_URL="https://github.com/vdr-projects/vdr-plugin-eepg/archive/${PKG_VERSION}.tar.gz"

148
packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/patches/vdr-plugin-eepg-PR2-fix-build-with-vdr-2-7-1.patch
View File

@ -1,148 +0,0 @@
From c958894e6a4fffff58b0dc276fc978616560192d Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 13 Sep 2024 13:22:54 +0000
Subject: [PATCH] fix build with vdr 2.7.1
---
eepg.c | 12 ++++++++++++
eit2.c | 8 ++++++++
epghandler.c | 13 +++++++++++++
equivhandler.c | 9 +++++++++
util.c | 9 +++++++++
5 files changed, 51 insertions(+)
diff --git a/eepg.c b/eepg.c
index a78819d..d39581d 100644
--- a/eepg.c
+++ b/eepg.c
@@ -1324,12 +1324,20 @@ void cFilterEEPG::WriteToSchedule(tChannelID channelID, cSchedules* pSchedules,
cEvent *Event = NULL;
if (ps/*[eq]*/) {
+#if APIVERSNUM >= 20502
+ Event = (cEvent *) ps->GetEventById (EventId); //since Nagra uses consistent EventIds, try this first
+#else
Event = (cEvent *) ps->GetEvent (EventId); //since Nagra uses consistent EventIds, try this first
+#endif
bool TableIdMatches = false;
if (Event)
TableIdMatches = (Event->TableID() == TableId);
if (!Event || !TableIdMatches || abs(Event->StartTime() - (time_t) StartTime) > Duration * 60) //if EventId does not match, or it matched with wrong TableId, then try with StartTime
+#if APIVERSNUM >= 20502
+ Event = (cEvent *) ps->GetEventByTime (StartTime);
+#else
Event = (cEvent *) ps->GetEvent (EventId, StartTime);
+#endif
}
cEvent *newEvent = NULL;
if (!Event) { //event is new
@@ -3477,7 +3485,11 @@ void cFilterEEPG::ProcessPremiere(const u_char *& Data)
}
bool newEvent = false;
+#if APIVERSNUM >= 20502
+ cEvent *pEvent = (cEvent *) pSchedule->GetEventById (EventId);
+#else
cEvent *pEvent = (cEvent *) pSchedule->GetEvent (EventId, -1);
+#endif
if (!pEvent) {
LogI(2, "(new)\n");
pEvent = new cEvent (EventId);
diff --git a/eit2.c b/eit2.c
index 9ee190d..31aa816 100644
--- a/eit2.c
+++ b/eit2.c
@@ -32,7 +32,11 @@ cEvent* cEIT2::ProcessEitEvent(cSchedule* pSchedule,const SI::EIT::Event* EitEve
// int versionNumber = getVersionNumber();
cEvent *newEvent = NULL;
+#if APIVERSNUM >= 20502
+ cEvent *pEvent = (cEvent *) pSchedule->GetEventByTime (EitEvent->getStartTime ());
+#else
cEvent *pEvent = (cEvent *) pSchedule->GetEvent (EitEvent->getEventId (), EitEvent->getStartTime ());
+#endif
if (!pEvent) {
if (OnlyRunningStatus)
return NULL;
@@ -243,7 +247,11 @@ void cEIT2::ProcessEventDescriptors(bool ExternalData, int Source, u_char Tid,
tChannelID(Source, channel->Nid(), channel->Tid(), tsed->getReferenceServiceId()));
if (!rSchedule)
break;
+#if APIVERSNUM >= 20502
+ rEvent = rSchedule->GetEventById(tsed->getReferenceEventId());
+#else
rEvent = rSchedule->GetEvent(tsed->getReferenceEventId());
+#endif
if (!rEvent)
break;
pEvent->SetTitle(rEvent->Title());
diff --git a/epghandler.c b/epghandler.c
index 1e2db9f..a81bc86 100644
--- a/epghandler.c
+++ b/epghandler.c
@@ -66,10 +66,23 @@ bool cEEpgHandler::HandleEitEvent(cSchedule* Schedule,
modified = false;
//VDR creates new event if the EitEvent StartTime is different than EEPG time so
//the EPG event has to be deleted but the data should be kept
+#if APIVERSNUM >= 20502
+ const cEvent *ev;
+ if (EitEvent->getStartTime() > 0){
+ ev = schedule->GetEventByTime(EitEvent->getStartTime());
+ } else {
+ ev = schedule->GetEventById(EitEvent->getEventId());
+ }
+#else
const cEvent* ev = schedule->GetEvent(EitEvent->getEventId(),EitEvent->getStartTime());
+#endif
searchDuplicates = !ev; //if the event exist with a same start time, it is handled by SetShortText/SetDescription
if (!ev){
+#if APIVERSNUM >= 20502
+ ev = schedule->GetEventById(EitEvent->getEventId());
+#else
ev = schedule->GetEvent(EitEvent->getEventId());
+#endif
// remove shifted duplicates with same ID
if (ev && ((ev->StartTime()>EitEvent->getStartTime() && ev->StartTime() < EitEvent->getStartTime()+EitEvent->getDuration())
|| (EitEvent->getStartTime() > ev->StartTime() && EitEvent->getStartTime() < ev->EndTime()))) {
diff --git a/equivhandler.c b/equivhandler.c
index 75007ec..cd23d38 100644
--- a/equivhandler.c
+++ b/equivhandler.c
@@ -143,7 +143,16 @@ void cEquivHandler::updateEquivalent(cSchedules * Schedules, tChannelID channelI
if (equChannel) {
LogD(2, prep("found Equivalent channel %s"), *equChannelID.ToString());
cSchedule *pSchedule = (cSchedule *) Schedules->GetSchedule (equChannel, true);
+#if APIVERSNUM >= 20502
+ cEvent *pEqvEvent;
+ if (pEvent->StartTime() > 0){
+ pEqvEvent = (cEvent *) pSchedule->GetEventByTime (pEvent->StartTime());
+ } else {
+ pEqvEvent = (cEvent *) pSchedule->GetEventById (pEvent->EventID());
+ }
+#else
cEvent *pEqvEvent = (cEvent *) pSchedule->GetEvent (pEvent->EventID(), pEvent->StartTime());
+#endif
if (pEqvEvent) {
LogD(3, prep("equivalent event exists"));
if (pEqvEvent == pEvent) {
diff --git a/util.c b/util.c
index 1109181..029fcc6 100644
--- a/util.c
+++ b/util.c
@@ -214,7 +214,16 @@ void cAddEventThread::Action(void)
while (((*it).second->First()) != NULL) {
cEvent* event = (*it).second->First();
+#if APIVERSNUM >= 20502
+ cEvent *pEqvEvent;
+ if (event->StartTime() > 0){
+ pEqvEvent = (cEvent *) schedule->GetEventByTime (event->StartTime());
+ } else {
+ pEqvEvent = (cEvent *) schedule->GetEventById (event->EventID());
+ }
+#else
cEvent *pEqvEvent = (cEvent *) schedule->GetEvent (event->EventID(), event->StartTime());
+#endif
if (pEqvEvent){
(*it).second->Del(event);
} else {

4
packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-live"
PKG_VERSION="3.3.11"
PKG_SHA256="330d47a60999ac5fa398ee269135a15f3d6cdfa68d3248779a2b456aed23ca65"
PKG_VERSION="3.3.12"
PKG_SHA256="59a9ebf70b5d66827276388b1fe4608a039ab1c78e7e4e866602e54c9339a1ce"
PKG_LICENSE="GPL"
PKG_SITE="http://live.vdr-developer.org/en/index.php"
PKG_URL="https://github.com/MarkusEh/vdr-plugin-live/archive/v${PKG_VERSION}.tar.gz"

4
packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-xmltv2vdr"
PKG_VERSION="0.2.3"
PKG_SHA256="e543f2ce175960a6664d6c06dd3c9dc89c15599e144c0c8551efd66368293579"
PKG_VERSION="0.2.4"
PKG_SHA256="6ed8886f5f6fc97b136cbe26e380ed3a8083300318db934e001a4918617a9785"
PKG_LICENSE="GPL"
PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr"
PKG_URL="https://github.com/vdr-projects/vdr-plugin-xmltv2vdr/archive/${PKG_VERSION}.tar.gz"

44
packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-04-fixed-import-for-vdr-2-7-1.patch
View File

@ -1,44 +0,0 @@
From 4ee9769b5746240247c3a01f4000afdf8fc56857 Mon Sep 17 00:00:00 2001
From: joed74 <gh@dolze.de>
Date: Tue, 10 Sep 2024 15:57:59 +0200
Subject: [PATCH] Fixed import for vdr 2.7.1
---
import.cpp | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/import.cpp b/import.cpp
index 1bb1849..8c73024 100644
--- a/import.cpp
+++ b/import.cpp
@@ -86,7 +86,11 @@ cEvent *cImport::SearchVDREventByTitle(cEPGSource *source, cSchedule* schedule,
const char *cxTitle=conv->Convert(Title);
// 2nd with StartTime
+#if VDRVERSNUM >= 20701
+ cEvent *f=(cEvent *) schedule->GetEventByTime(StartTime+hint);
+#else
cEvent *f=(cEvent *) schedule->GetEvent((tEventID) 0,StartTime+hint);
+#endif
if (f)
{
if (!strcasecmp(f->Title(),cxTitle))
@@ -188,10 +192,18 @@ cEvent *cImport::SearchVDREvent(cEPGSource *source, cSchedule* schedule, cXMLTVE
// try to find an event,
// 1st with our own EventID
+#if VDRVERSNUM >= 20701
+ if (xevent->EITEventID()) f=(cEvent *) schedule->GetEventById(xevent->EITEventID());
+#else
if (xevent->EITEventID()) f=(cEvent *) schedule->GetEvent(xevent->EITEventID());
+#endif
if (f) return f;
+#if VDRVERSNUM >= 20701
+ if (xevent->EventID() && append) f=(cEvent *) schedule->GetEventById(xevent->EITEventID());
+#else
if (xevent->EventID() && append) f=(cEvent *) schedule->GetEvent(xevent->EventID());
+#endif
if (f) return f;
f=SearchVDREventByTitle(source, schedule, xevent->Title(), xevent->StartTime(),

2
packages/addons/service/vdr-addon/package.mk
View File

@ -5,7 +5,7 @@
PKG_NAME="vdr-addon"
PKG_VERSION="2.7.3"
PKG_REV="3"
PKG_REV="4"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://libreelec.tv"