Merge branch 'master' into f31

vdr-epg2vdr-gcc10-include.patch

@@ -1,11 +0,0 @@
-diff -Nrup a/service.h b/service.h
---- a/service.h	2018-10-15 12:42:08.000000000 -0600
-+++ b/service.h	2019-09-23 10:15:16.089840039 -0600
-@@ -13,6 +13,7 @@
- 
- #include <list>
- #include <map>
-+#include <string>
- 
- //***************************************************************************
- // Timer - Skin Interface

vdr-epg2vdr-mariadb-fix-build.patch

@@ -1,23 +0,0 @@
-diff -Naur vdr-plugin-epg2vdr-1.1.73-ORIG/lib/db.c vdr-plugin-epg2vdr-1.1.73/lib/db.c
---- vdr-plugin-epg2vdr-1.1.73-ORIG/lib/db.c	2017-07-14 17:23:56.366839376 +0200
-+++ vdr-plugin-epg2vdr-1.1.73/lib/db.c	2017-07-14 17:59:34.634451604 +0200
-@@ -1379,11 +1379,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-epg2vdr-py38.patch

@@ -1,15 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 1403938..d772309 100644
---- a/Makefile
-+++ b/Makefile
-@@ -72,6 +72,10 @@ LIBS += $(shell pkg-config --libs uuid)
- LIBS += $(shell pkg-config --libs tinyxml2)
- LIBS += $(shell mysql_config --libs_r) $(shell python-config --libs) $(shell pkg-config --libs jansson)
- 
-+ifeq ($(shell python -c 'import sys; sys.exit(0) if sys.version_info[:2] < (3,8) else print(1)'), 1)
-+       LIBS += $(shell python-config --embed)
-+endif
-+
- EPG2VDR_DATA_DIR = "/var/cache/vdr"
- 
- ifdef WITH_GTFT