Rebuilt for new VDR API version 2.7.7

Add vdr-scraper2vdr-EventID.patch for vdr-2.7.x

.gitignore

@@ -20,3 +20,8 @@
 /vdr-scraper2vdr-ef448e1.tar.gz
 /vdr-scraper2vdr-a412d52.tar.gz
 /vdr-scraper2vdr-d9f6cb4.tar.gz
+/vdr-scraper2vdr-1.0.12.tar.gz
+/vdr-scraper2vdr-1.1.0.tar.gz
+/vdr-scraper2vdr-1.1.1.tar.gz
+/vdr-scraper2vdr-1.1.2.tar.gz
+/vdr-scraper2vdr-1.1.3.tar.gz

scraper2vdr_serienposter_statt_banner.diff

@@ -0,0 +1,15 @@
+--- a/scrapmanager.c	2020-12-28 18:38:53.850634334 +0100
++++ b/scrapmanager.c.new	2020-12-28 18:44:09.536615518 +0100
+@@ -698,11 +698,7 @@ bool cScrapManager::GetPosterBannerV2(Sc
+ 		if (hitSeries == series.end())
+ 			return false;
+ 		cTVDBSeries *s = hitSeries->second;
+-		bool found = s->GetRandomBanner(&call->banner);
+-		if (v.episodeId > 0) {
+-			s->GetSeasonPoster(v.episodeId, &call->poster);
+-		}
+-		return found;
++		return s->GetPoster(&call->banner);
+ 	} else if (v.movieId > 0) {
+ 		call->type = tMovie;
+ 		map<int, cMovieDbMovie*>::iterator hitMovies = movies.find(v.movieId);

sources

@@ -1 +1 @@
-SHA512 (vdr-scraper2vdr-d9f6cb4.tar.gz) = 57fcd3b955e0c5a7d98da5f658cf167bc0b0b224c2a4b5e3c33535888a89f1d531548ab802285c53afca5c5b419f0fd27528abaf877314c2921c64f86681da44
+SHA512 (vdr-scraper2vdr-1.1.3.tar.gz) = a634074df8da023ece31b73c71e0da6b769662e7859d248e08ac06d6d9543317ff8ebe4e343c289092622fbdb5613ff4002ec3c97d6bca6c8e2a0c267f6432dc

vdr-scraper2vdr-EventID.patch

@@ -0,0 +1,20 @@
+--- scraper2vdr-1.1.2/scrapmanager.c.orig	2024-09-30 17:53:05.670275247 +0200
++++ scraper2vdr-1.1.2/scrapmanager.c	2024-09-30 17:54:52.250414105 +0200
+@@ -441,7 +441,7 @@
+ 				const cSchedule *schedule = schedules->GetSchedule(cID);
+ 
+ 				if (schedule)
+-					event = schedule->GetEvent(key.eventId);
++					event = schedule->GetEventById(key.eventId);
+ 			}
+ 
+ 			if (event)
+@@ -497,7 +497,7 @@
+ 				const cSchedule *schedule = schedules->GetSchedule(cID);
+ 
+ 				if (schedule)
+-					event = schedule->GetEvent(key.eventId);
++					event = schedule->GetEventById(key.eventId);
+ 			}
+ 
+ 			if (event)

vdr-scraper2vdr-mariadb-fix-build.patch

@@ -1,23 +0,0 @@
-diff -Naur scraper2vdr-254122b25833980410f6373b397dd3459cb642e9-ORIG/lib/db.c scraper2vdr-254122b25833980410f6373b397dd3459cb642e9/lib/db.c
---- scraper2vdr-254122b25833980410f6373b397dd3459cb642e9-ORIG/lib/db.c	2017-07-14 18:30:56.958885292 +0200
-+++ scraper2vdr-254122b25833980410f6373b397dd3459cb642e9/lib/db.c	2017-07-14 18:51:03.581320730 +0200
-@@ -1344,11 +1344,19 @@
- 
-    if (error == CR_SERVER_LOST ||
-        error == CR_SERVER_GONE_ERROR ||
-+// for compatibility with newer versions of MariaDB library
-+#ifdef CR_INVALID_CONN_HANDLE
-        error == CR_INVALID_CONN_HANDLE ||
-+#endif
-        error == CR_COMMANDS_OUT_OF_SYNC ||
-        error == CR_SERVER_LOST_EXTENDED ||
-        error == CR_STMT_CLOSED ||
-+// for compatibility with newer versions of MariaDB library
-+#ifdef CR_CONN_UNKNOW_PROTOCOL
-        error == CR_CONN_UNKNOW_PROTOCOL ||
-+#else
-+       error == CR_CONN_UNKNOWN_PROTOCOL ||
-+#endif
-        error == CR_UNSUPPORTED_PARAM_TYPE ||
-        error == CR_NO_PREPARE_STMT ||
-        error == CR_SERVER_HANDSHAKE_ERR ||

vdr-scraper2vdr.spec

@@ -1,32 +1,41 @@
 # https://github.com/horchi/scraper2vdr/commit/d9f6cb454ebbc951af5d1a4aa7fcc31e772f3bca
 %global commit0 d9f6cb454ebbc951af5d1a4aa7fcc31e772f3bca
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-
 %global pname   scraper2vdr
 %global gitdate 20190128
 
-Name:           vdr-scraper2vdr
-Version:        1.0.11
-Release:        9.%{gitdate}git%{shortcommit0}%{?dist}
-Summary:        A client plugin which provides scraped metadata from EPGD to other plugins
-License:        GPL+
-URL:            https://github.com/horchi/scraper2vdr
-Source0:        https://github.com/horchi/scraper2vdr/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
-Source1:        %{name}.conf
-
-BuildRequires: make
-BuildRequires:  gcc-c++
-BuildRequires:  libuuid-devel
-BuildRequires:  ImageMagick-c++-devel
-BuildRequires:  openssl-devel
-%if 0%{?fedora} <= 27
-BuildRequires:  mariadb-devel
+# Set vdr_version based on Fedora version
+%if 0%{?fedora} >= 43
+%global vdr_version 2.7.7
+%elif 0%{?fedora} == 42
+%global vdr_version 2.7.4
 %else
-BuildRequires:  mariadb-connector-c-devel
+%global vdr_version 2.6.9
 %endif
+
+Name:           vdr-scraper2vdr
+Version:        1.1.3
+#Release:        15.%%{gitdate}git%%{shortcommit0}%%{?dist}
+Release:        15%{?dist}
+Summary:        A client plugin which provides scraped metadata from EPGD to other plugins
+License:        GPL-1.0-or-later
+URL:            https://github.com/horchi/scraper2vdr
+#Source0:        https://github.com/horchi/scraper2vdr/archive/%%{commit0}/%%{name}-%%{commit0}.tar.gz#/%%{name}-%%{shortcommit0}.tar.gz
+Source0:        https://github.com/horchi/scraper2vdr/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source1:        %{name}.conf
+# https://www.vdr-portal.de/index.php?attachment/44795-scraper2vdr-serienposter-statt-banner-diff/
+Patch0:         scraper2vdr_serienposter_statt_banner.diff
+
+BuildRequires:  make
+BuildRequires:  gcc-c++
+BuildRequires:  gettext
+BuildRequires:  libuuid-devel
+BuildRequires:  pkgconfig(GraphicsMagick++)
+BuildRequires:  openssl-devel
+BuildRequires:  mariadb-connector-c-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  imlib2-devel
-BuildRequires:  vdr-devel >= 1.7.34
+BuildRequires:  vdr-devel >= %{vdr_version}
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 
 %description 
@@ -40,14 +49,16 @@ themoviedb.org API for movies. Check the websites of both services for
 the terms of use.
 
 %prep
-%setup -qn %{pname}-%{commit0}
+#%%autosetup -p0 -n %%{pname}-%%{commit0}
+%autosetup -p1 -n %{pname}-%{version}
 iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README
 
 # fedora specific
 sed -i -e 's|#include <errmsg.h>|#include <mysql/errmsg.h>|' lib/db.c
+sed -i -e 's|#include <mysql.h>|#include <mysql/mysql.h>|' lib/db.h
 
 %build
-make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
+%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=graphicsmagick
 
 %install
 %make_install
@@ -65,6 +76,110 @@ install -Dpm 644 %{SOURCE1} \
 %config(noreplace) %{vdr_configdir}/plugins/%{pname}/epg.dat
 
 %changelog
+* Fri Jul 25 2025 Martin Gansser <martinkg@fedoraproject.org> - 1.1.3-15
+- Rebuilt for new VDR API version 2.7.7
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Jun 21 2025 Martin Gansser <martinkg@fedoraproject.org> - 1.1.3-13
+- Rebuilt for new VDR API version 2.7.6
+
+* Tue May 27 2025 Martin Gansser <martinkg@fedoraproject.org> - 1.1.3-12
+- Rebuilt for new VDR API version 2.7.5
+
+* Fri Feb 28 2025 Martin Gansser <martinkg@fedoraproject.org> - 1.1.3-11
+- Rebuilt for new VDR API version 2.7.4
+
+* Fri Feb 14 2025 Martin Gansser <martinkg@fedoraproject.org> - 1.1.3-1
+- Update to 1.1.3
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Oct 09 2024 Martin Gansser <martinkg@fedoraproject.org> - 1.1.2-10
+- Rebuilt for new VDR API version 2.7.2
+- Add vdr-scraper2vdr-EventID.patch for vdr-2.7.x
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jul 15 2024 Martin Gansser <martinkg@fedoraproject.org> - 1.1.2-8
+- Rebuilt for new VDR API version 2.6.9
+
+* Thu Jul 11 2024 Martin Gansser <martinkg@fedoraproject.org> - 1.1.2-7
+- Rebuilt for new VDR API version 2.6.8
+
+* Mon Jun 17 2024 Miroslav Suchý <msuchy@redhat.com> - 1.1.2-6
+- convert license to SPDX
+
+* Fri Apr 12 2024 Martin Gansser <martinkg@fedoraproject.org> - 1.1.2-5
+- Rebuilt for new VDR API version
+
+* Fri Jan 26 2024 Martin Gansser <martinkg@fedoraproject.org> - 1.1.2-4
+- Rebuilt for new VDR API version
+
+* Fri Jan 05 2024 Martin Gansser <martinkg@fedoraproject.org> - 1.1.2-3
+- Rebuilt for new VDR API version
+- Add BR gettext for rawhide
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Mar 21 2023 Martin Gansser <martinkg@fedoraproject.org> - 1.1.2-1
+- Update to 1.1.2
+
+* Wed Feb 08 2023 Martin Gansser <martinkg@fedoraproject.org> - 1.1.1-1
+- Update to 1.1.1
+
+* Thu Jan 26 2023 Martin Gansser <martinkg@fedoraproject.org> - 1.1.0-1
+- Update to 1.1.0
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.12-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jan 07 2023 Martin Gansser <martinkg@fedoraproject.org> - 1.0.12-7
+- Rebuilt against graphicsmagick due new ImageMagick 7
+
+* Wed Dec 14 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.0.12-6
+- Rebuilt for new VDR API version
+
+* Thu Dec 01 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.0.12-5
+- Rebuilt for new VDR API version
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.0.12-3
+- Rebuilt for new VDR API version
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jan 05 2022 Martin Gansser <martinkg@fedoraproject.org> - 1.0.12-1
+- Update to 1.0.12
+
+* Thu Dec 30 2021 Martin Gansser <martinkg@fedoraproject.org> - 1.0.11-15.20190128gitd9f6cb4
+- Rebuilt for new VDR API version
+
+* Fri Nov 26 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.11-14.20190128gitd9f6cb4.1
+- rebuild for new ImageMagick
+
+* Fri Oct 29 2021 Martin Gansser <martinkg@fedoraproject.org> - 1.0.11-14.20190128gitd9f6cb4
+- Add scraper2vdr_serienposter_statt_banner.diff
+
+* Sat Oct 16 2021 Martin Gansser <martinkg@fedoraproject.org> - 1.0.11-13.20190128gitd9f6cb4
+- Rebuilt due FTI in rawhide
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.0.11-12.20190128gitd9f6cb4
+- Rebuilt with OpenSSL 3.0.0
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.11-11.20190128gitd9f6cb4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Apr 28 2021 Martin Gansser <martinkg@fedoraproject.org> - 1.0.11-10.20190128gitd9f6cb4
+- Rebuilt for new VDR API version
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.11-9.20190128gitd9f6cb4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild