Rebuilt for new VDR API version 2.7.4

vdr-epg2vdr-EventID.diff

@@ -0,0 +1,80 @@
+diff --git a/menusched.c b/menusched.c
+index 3e4bbee6..bab904d0 100644
+--- a/menusched.c
++++ b/menusched.c
+@@ -781,7 +781,11 @@ int cMenuEpgWhatsOn::LoadSearch(const cUserTimes::UserTime* userTime)
+       const char* strChannelId = menuDb->useeventsDb->getStrValue("CHANNELID");
+       const cChannel* channel = channels->GetByChannelID(tChannelID::FromString(strChannelId));
+       const cSchedule* schedule = schedules->GetSchedule(channel);
++#if (defined (APIVERSNUM) && (APIVERSNUM >= 20501))
++      const cEvent* event = !schedule ? 0 :  schedule->GetEventById(menuDb->useeventsDb->getIntValue("USEID"));
++#else
+       const cEvent* event = !schedule ? 0 :  schedule->GetEvent(menuDb->useeventsDb->getIntValue("USEID"));
++#endif
+ 
+       if (event)
+          Add(new cMenuEpgScheduleItem(menuDb, event, channel, yes));
+diff --git a/recording.c b/recording.c
+index 64a7cf53..f218aea2 100644
+--- a/recording.c
++++ b/recording.c
+@@ -432,7 +432,11 @@ int cUpdate::updateRecordingTable(int fullReload)
+                cStateKey schedulesKey;
+                const cSchedules* schedules = cSchedules::GetSchedulesRead(schedulesKey, 500/*ms*/);
+                const cSchedule* s = schedules ? (cSchedule*)schedules->GetSchedule(channel) : 0;
++#if (defined (APIVERSNUM) && (APIVERSNUM >= 20501))
++               const cEvent* event = s ? s->GetEventById(eventId) : 0;
++#else
+                const cEvent* event = s ? s->GetEvent(eventId) : 0;
++#endif
+ 
+                if (event && !isEmpty(event->Aux()) && xml.set(event->Aux()) == success)
+                {
+diff --git a/timer.c b/timer.c
+index 13a314c6..e751aadb 100644
+--- a/timer.c
++++ b/timer.c
+@@ -301,7 +301,11 @@ int cUpdate::performTimerJobs()
+             continue;
+          }
+ 
++#if (defined (APIVERSNUM) && (APIVERSNUM >= 20501))
++         if (eventid > 0 && !(event = s->GetEventById(eventid)))
++#else
+          if (eventid > 0 && !(event = s->GetEvent(eventid)))
++#endif
+          {
+             const cChannel* channel = channels->GetByChannelID(channelId);
+ 
+diff --git a/ttools.c b/ttools.c
+index 21530fd4..3e317d7a 100644
+--- a/ttools.c
++++ b/ttools.c
+@@ -466,7 +466,11 @@ cEpgTimer* newTimerObjectFromRow(cDbRow* timerRow, cDbRow* vdrRow)
+          const cSchedule* schedule = schedules->GetSchedule(channel);
+ 
+          if (schedule)
++#if (defined (APIVERSNUM) && (APIVERSNUM >= 20501))
++            event = schedule->GetEventById(timerRow->getIntValue("EVENTID"));
++#else
+             event = schedule->GetEvent(timerRow->getIntValue("EVENTID"));
++#endif
+       }
+ 
+ #if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+diff --git a/update.c b/update.c
+index 32c80317..ef630fa7 100644
+--- a/update.c
++++ b/update.c
+@@ -1646,7 +1646,11 @@ int cUpdate::refreshEpg(const char* forChannelId, int maxTries)
+ 
+             // get event / timer
+ 
++#if APIVERSNUM > 20501
++            if ((event = s->GetEventById(eventsDb->getIntValue("USEID"))))
++#else
+             if ((event = s->GetEvent(eventsDb->getIntValue("USEID"))))
++#endif
+             {
+                if (Us::isRemove(updFlg))
+                   tell(2, "Remove event %uld of channel '%s' due to updflg %c",

vdr-epg2vdr.spec

@@ -1,18 +1,13 @@
+# version we want to build against
+%global vdr_version 2.6.9
 # Set vdr_version based on Fedora version
-# Default
-%global vdr_version 2.7.7
-
-%if 0%{?fedora} == 43
-%global vdr_version 2.7.7
-%elif 0%{?fedora} == 44
-%global vdr_version 2.8.1
-%elif 0%{?fedora} > 44
-%global vdr_version 2.8.2
+%if 0%{?fedora} >= 42
+%global vdr_version 2.7.4
 %endif
 
 Name:           vdr-epg2vdr
 Version:        1.2.17
-Release:        17%{?dist}
+Release:        2%{?dist}
 Summary:        A plugin to retrieve EPG data from a mysql database into VDR
 
 License:        GPL-1.0-or-later
@@ -68,51 +63,6 @@ chmod 0755 %{buildroot}/%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
 %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
 
 %changelog
-* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 1.2.17-17
-- Rebuilt for Python 3.15.0b4 ABI change
-
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.17-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1.2.17-15
-- Rebuilt for openssl 4.0
-
-* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 1.2.17-14
-- Rebuilt for Python 3.15
-
-* Wed Jun 03 2026 Martin Gansser <martinkg@fedoraproject.org> - 1.2.17-13
-- Rebuilt for new VDR 2.8.2 API version 13
-
-* Mon Mar 23 2026 Martin Gansser <martinkg@fedoraproject.org> - 1.2.17-12
-- Rebuilt for new VDR 2.8.1 API version 12
-
-* Mon Feb 09 2026 Martin Gansser <martinkg@fedoraproject.org> - 1.2.17-11
-- Rebuilt for new VDR API version 2.7.9
-
-* Mon Jan 26 2026 Martin Gansser <martinkg@fedoraproject.org> - 1.2.17-10
-- Rebuilt for new VDR API version 2.7.8
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.17-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Sat Aug 23 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.17-8
-- Rebuilt for tinyxml2 11.0.0
-
-* Fri Jul 25 2025 Martin Gansser <martinkg@fedoraproject.org> - 1.2.17-7
-- Rebuilt for new VDR API version 2.7.7
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.17-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sat Jun 21 2025 Martin Gansser <martinkg@fedoraproject.org> - 1.2.17-5
-- Rebuilt for new VDR API version 2.7.6
-
-* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 1.2.17-4
-- Rebuilt for Python 3.14
-
-* Tue May 27 2025 Martin Gansser <martinkg@fedoraproject.org> - 1.2.17-3
-- Rebuilt for new VDR API version 2.7.5
-
 * Fri Feb 28 2025 Martin Gansser <martinkg@fedoraproject.org> - 1.2.17-2
 - Rebuilt for new VDR API version 2.7.4