From 2a22f5379cc22c8abee07671992c16fe1a6523e8 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 18 Dec 2024 10:03:44 +0000 Subject: [PATCH] vdr-plugin-xmltv2vdr: update to 0.2.4 --- .../vdr-plugin-xmltv2vdr/package.mk | 4 +- ...tv2vdr-04-fixed-import-for-vdr-2-7-1.patch | 44 ------------------- 2 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-04-fixed-import-for-vdr-2-7-1.patch diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk index 9b563c2058..dcf13af746 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk @@ -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" diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-04-fixed-import-for-vdr-2-7-1.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-04-fixed-import-for-vdr-2-7-1.patch deleted file mode 100644 index 6e5879c2c8..0000000000 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-04-fixed-import-for-vdr-2-7-1.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4ee9769b5746240247c3a01f4000afdf8fc56857 Mon Sep 17 00:00:00 2001 -From: joed74 -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(),