diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk
index 01d79d4d95..df208b48d8 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk
@@ -3,11 +3,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="197e7524e563923d4b86e74a121f7174373818d9"
-PKG_SHA256="6eee60d524c185f1f72c4413e79a80619934508b75aa27f213b2f481182ec6fb"
+PKG_VERSION="2.2.6"
+PKG_SHA256="dba435f6d9172189de4059d796d9020109997d51370e49ec0398d40ef8e08f69"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"
-PKG_URL="https://github.com/manio/vdr-plugin-dvbapi/archive/${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/manio/vdr-plugin-dvbapi/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr libdvbcsa"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="VDR dvbapi plugin for use with OSCam"
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk
index a7877cb8e3..b587cb4b56 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-live"
-PKG_VERSION="3.1.6"
-PKG_SHA256="8231f22d397b6cc954615304a12319fb74553aa67fbf12536b1df6727f69b8a2"
+PKG_VERSION="3.2.1"
+PKG_SHA256="858ad3de0fcdc096f576a1eb8ed60c78ae530683b28660b03f7a13dd85c02895"
 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"
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk
index 851bfd9def..0ed7d75354 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-robotv"
-PKG_VERSION="f521e57e947468b54288f696bdcae8e6485c6167"
-PKG_SHA256="3f949fca133bdab690f0a5b4bb7d77a52e1b94c94fc8d815c2c203e9f06a6622"
+PKG_VERSION="0.15.0"
+PKG_SHA256="96ca5136ec8d82e4f8100889f3099f677dffdd0e85a1239d623c66420114dd36"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/pipelka/roboTV"
 PKG_URL="https://github.com/pipelka/vdr-plugin-robotv/archive/${PKG_VERSION}.tar.gz"
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
index 1ac7e48b3d..2e1ff10c47 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
@@ -3,11 +3,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-satip"
-PKG_VERSION="0a216f1cf9d6401b1afbff420f4fa244ec15d299"
-PKG_SHA256="817900c9fa5ade5c52b0391b791f801832c57bdbed5e7501d7e92b4fe29de816"
+PKG_VERSION="2.4.1"
+PKG_SHA256="595317e6905aae7bf93db0beba4ba0ec5a195aface0c13be62f9c3f97a185cfd"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
-PKG_URL="https://github.com/rofafor/vdr-plugin-satip/archive/${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/rofafor/vdr-plugin-satip/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr curl tinyxml"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="This is an SAT>IP plugin for the Video Disk Recorder (VDR)."
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk
index 25872c30c1..2e690a6d7d 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-streamdev"
-PKG_VERSION="e2a9b979d3fb92967c7a6a8221e674eb7e55c813"
-PKG_SHA256="adcc08ac19cf98122576bedf63be3396d8b81ee4196c00df0e25c9fb8b7e11b8"
+PKG_VERSION="0.6.3"
+PKG_SHA256="a678653dfb2641bc9dea9a1bd3b2400f3edbe697953364cf597f76d93cfaea2c"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-streamdev"
 PKG_URL="https://github.com/vdr-projects/vdr-plugin-streamdev/archive/${PKG_VERSION}.tar.gz"
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-01_4k_hevc_support.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-01_4k_hevc_support.patch
deleted file mode 100644
index 45b97824f6..0000000000
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-01_4k_hevc_support.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://www.vdr-portal.de/board17-developer/board97-vdr-core/p1272182-rfc-h-265-frame-parser/#post1272182
-
---- a/server/livestreamer.c
-+++ b/server/livestreamer.c
-@@ -143,6 +143,8 @@
- 	"ISO/IEC 14496-3 Audio with LATM transport syntax",
- 	"0x12", "0x13", "0x14", "0x15", "0x16", "0x17", "0x18", "0x19", "0x1a",
- 	"ISO/IEC 14496-10 Video (MPEG-4 part 10/AVC, aka H.264)",
-+	"0x1c", "0x1d", "0x1e", "0x1f", "0x20", "0x21", "0x22","0x23",
-+	"HEVC aka H.265",
- 	"",
- };
- 
-@@ -171,6 +173,7 @@
- 	case 0x10: // ISO/IEC 14496-2 Visual (MPEG-4)
- 	case 0x11: // ISO/IEC 14496-3 Audio with LATM transport syntax
- 	case 0x1b: // ISO/IEC 14496-10 Video (MPEG-4 part 10/AVC, aka H.264)
-+	case 0x24: // HEVC aka H.265
- 		Dprintf("cStreamdevPatFilter PMT scanner adding PID %d (%s)\n",
- 			stream.getPid(), psStreamTypes[stream.getStreamType()]);
- 		return stream.getPid();
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-02_2.3.9_lock_fix.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-02_2.3.9_lock_fix.patch
deleted file mode 100644
index fe42f9f226..0000000000
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-02_2.3.9_lock_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-https://www.vdr-portal.de/forum/index.php?thread/131708-gel%C3%B6st-vdr-2-3-9-h%C3%A4ngt-bei-der-wiedergabe-von-aufnahmen-mit-rpihddevice/&postID=1303098#post1303098
-
-diff --git a/client/device.c b/client/device.c
-index a810f53..2e54e34 100644
---- a/client/device.c
-+++ b/client/device.c
-@@ -190,7 +190,6 @@ bool cStreamdevDevice::SetChannelDevice(const cChannel *Channel,
- 
- bool cStreamdevDevice::SetPid(cPidHandle *Handle, int Type, bool On) {
- 	Dprintf("SetPid, Pid=%d, Type=%d, On=%d, used=%d\n", Handle->pid, Type, On, Handle->used);
--	LOCK_THREAD;
- 
- 	bool res = true; 
- 	if (Handle->pid && (On || !Handle->used)) {
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-04_fix_vdr_2.6.x_build_error.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-04_fix_vdr_2.6.x_build_error.patch
deleted file mode 100644
index aa6235ba72..0000000000
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-04_fix_vdr_2.6.x_build_error.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -r -Bc a/server/connectionVTP.c b/server/connectionVTP.c
-*** a/server/connectionVTP.c	2021-05-22 10:33:01.633332698 +0200
---- b/server/connectionVTP.c	2021-05-22 10:27:50.000000000 +0200
-***************
-*** 1882,1888 ****
-  #endif
-  									}
-  									else {
-! 										cDevice::SetCurrentChannel(CurrentChannel);
-  									}
-  								}
-  								isyslog("channel %d moved to %d", FromNumber, ToNumber);
---- 1882,1888 ----
-  #endif
-  									}
-  									else {
-! 										cDevice::SetCurrentChannel(CurrentChannel->Number());
-  									}
-  								}
-  								isyslog("channel %d moved to %d", FromNumber, ToNumber);
-***************
-*** 1983,1989 ****
-  							Channels.SwitchTo(CurrentChannel->Number());
-  #endif
-  						else
-! 							cDevice::SetCurrentChannel(CurrentChannel);
-  					}
-  					Reply(250, "Channel \"%s\" deleted", Option);
-  				}
---- 1983,1989 ----
-  							Channels.SwitchTo(CurrentChannel->Number());
-  #endif
-  						else
-! 							cDevice::SetCurrentChannel(CurrentChannel->Number());
-  					}
-  					Reply(250, "Channel \"%s\" deleted", Option);
-  				}
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk
index 0ad3239fd8..c68d27647a 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-wirbelscan"
-PKG_VERSION="2021.03.07"
-PKG_SHA256="9267ebd12a3a58e0ae453f6e311782262ae0782b25721cc8d7e5048a76cb3759"
+PKG_VERSION="2021.10.09"
+PKG_SHA256="e6f7e38402e0853b0460d723fdc745c110417bfab3c94c9883f49126eca680a8"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.gen2vdr.de/wirbel/wirbelscan/index2.html"
 PKG_URL="https://www.gen2vdr.de/wirbel/wirbelscan/vdr-wirbelscan-${PKG_VERSION}.tgz"
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-01-fixes.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-01-fixes.patch
index d3e0449b68..0ea5970455 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-01-fixes.patch
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-01-fixes.patch
@@ -1,16 +1,16 @@
 Subject: [PATCH] interface channel count
 
-diff --git a/wirbelscan.c b/wirbelscan.c
+diff --git a/wirbelscan.cpp b/wirbelscan.cpp
 index 602e659..aafbec3 100644
---- a/wirbelscan.c
-+++ b/wirbelscan.c
+--- a/wirbelscan.cpp
++++ b/wirbelscan.cpp
 @@ -12,6 +12,7 @@
- #include "menusetup.h"
- #include "countries.h"
- #include "satellites.h"
+ extern int channelcount;     // menusetup.c
+ extern int nextTransponders; // scanfilter.c
+ extern cScanner* Scanner;
 +extern TChannels NewChannels;
  
- static const char *WIRBELSCAN_VERSION        = "2021.03.07";
+ static const char *WIRBELSCAN_VERSION        = "2023.10.15"; /* YYYY.MM.DD */
  static const char *WIRBELSCAN_DESCRIPTION    = "DVB channel scan for VDR";
 @@ -202,8 +203,8 @@ bool cPluginWirbelscan::Service(const ch
          strcpy(s->transponder, lTransponder.length()? lTransponder.c_str():"none");
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-02-countries_utf8.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-02-countries_utf8.patch
deleted file mode 100644
index 64dda8898c..0000000000
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-02-countries_utf8.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/countries.c	2016-07-31 10:25:01.000000000 +0200
-+++ b/countries.c	2021-01-21 18:02:54.336375432 +0100
-@@ -557,7 +557,7 @@ int atsc_is_qam(int atsc) {
- struct cCountry country_list[] = {
- /*- ISO 3166-1 - unique id - long country name                 alpha-3 numeric */
-        {"AF", AF, "AFGHANISTAN"},                                  /*AFG, 4  },*/
--       {"AX", AX, "ÅLAND ISLANDS"},                                /*ALA, 248},*/
-+       {"AX", AX, "Ã…LAND ISLANDS"},                                /*ALA, 248},*/
-        {"AL", AL, "ALBANIA"},                                      /*ALB, 8  },*/
-        {"DZ", DZ, "ALGERIA"},                                      /*DZA, 12 },*/
-        {"AS", AS, "AMERICAN SAMOA"},                               /*ASM, 16 },*/
-@@ -610,10 +610,10 @@ struct cCountry country_list[] = {
-        {"CD", CD, "CONGO, THE DEMOCRATIC REPUBLIC OF THE"},        /*COD, 180},*/
-        {"CK", CK, "COOK ISLANDS"},                                 /*COK, 184},*/
-        {"CR", CR, "COSTA RICA"},                                   /*CRI, 188},*/
--       {"CI", CI, "CÔTE D'IVOIRE"},                                /*CIV, 384},*/
-+       {"CI", CI, "CÔTE D'IVOIRE"},                                /*CIV, 384},*/
-        {"HR", HR, "CROATIA"},                                      /*HRV, 191},*/
-        {"CU", CU, "CUBA"},                                         /*CUB, 192},*/
--       {"CW", CW, "CURAÇAO"},                                      /*CUW, 531},*/
-+       {"CW", CW, "CURAÇAO"},                                      /*CUW, 531},*/
-        {"CY", CY, "CYPRUS"},                                       /*CYP, 196},*/
-        {"CZ", CZ, "CZECH REPUBLIC"},                               /*CZE, 203},*/
-        {"DK", DK, "DENMARK"},                                      /*DNK, 208},*/
-@@ -736,11 +736,11 @@ struct cCountry country_list[] = {
-        {"PT", PT, "PORTUGAL"},                                     /*PRT, 620},*/
-        {"PR", PR, "PUERTO RICO"},                                  /*PRI, 630},*/
-        {"QA", QA, "QATA"},                                         /*QAT, 634},*/
--       {"RE", RE, "RÉUNION"},                                      /*REU, 638},*/
-+       {"RE", RE, "RÉUNION"},                                      /*REU, 638},*/
-        {"RO", RO, "ROMANIA"},                                      /*ROU, 642},*/
-        {"RU", RU, "RUSSIAN FEDERATION"},                           /*RUS, 643},*/
-        {"RW", RW, "RWANDA"},                                       /*RWA, 646},*/
--       {"BL", BL, "SAINT BARTHÉLEMY"},                             /*BLM, 652},*/
-+       {"BL", BL, "SAINT BARTHÉLEMY"},                             /*BLM, 652},*/
-        {"SH", SH, "SAINT HELENA"},                                 /*SHN, 654},*/
-        {"KN", KN, "SAINT KITTS AND NEVIS"},                        /*KNA, 659},*/
-        {"LC", LC, "SAINT LUCIA"},                                  /*LCA, 662},*/
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-03-fixes.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-03-fixes.patch
new file mode 100644
index 0000000000..8e56fb241d
--- /dev/null
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-03-fixes.patch
@@ -0,0 +1,10 @@
+--- wirbelscan-2021.10.09/countries.h	2021-10-03 08:28:04.000000000 +0000
++++ build.LibreELEC-Generic.x86_64-12.0-devel/build/vdr-plugin-wirbelscan-2021.10.09/countries.h	2023-11-10 11:20:15.870289849 +0000
+@@ -4,6 +4,7 @@
+  ******************************************************************************/
+ #pragma once
+ #include <string>
++#include <cstdint>
+ 
+ namespace COUNTRY {
+ 
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/sources/Makefile b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/sources/Makefile
index 9f20a9b30b..2b2c61c604 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/sources/Makefile
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/sources/Makefile
@@ -3,7 +3,7 @@
 
 PLUGIN = wirbelscan
 
-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).cpp | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
 CXX      ?= g++
 CXXFLAGS ?= -g -O3 -Wall -Wextra -Werror=overloaded-virtual -Wformat=2 -Wswitch-default -fstack-protector-all -D_FORTIFY_SOURCE=2
@@ -25,14 +25,14 @@ INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
-UNCRUSTIFY_FILES = scanner.c scanner.h scanfilter.c scanfilter.h statemachine.h statemachine.c
+UNCRUSTIFY_FILES = scanner.cpp scanner.h scanfilter.cpp scanfilter.h statemachine.h statemachine.cpp
 
-OBJS = $(PLUGIN).o common.o menusetup.o satellites.o scanner.o dvb_wrapper.o
+OBJS = $(PLUGIN).o common.o menusetup.o satellites.o scanner.o
 OBJS += scanfilter.o statemachine.o countries.o
 
 all: libvdr-$(PLUGIN).so i18n
 
-%.o: %.c
+%.o: %.cpp
 	$(CXX) -std=c++11 $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
 MAKEDEP = $(CXX) -MM -MG
@@ -51,7 +51,7 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 %.mo: %.po
 	@msgfmt -c -o $@ $<
 
-$(I18Npot): $(wildcard *.c)
+$(I18Npot): $(wildcard *.cpp)
 	@xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ $^
 
 %.po: $(I18Npot)
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk
index 71512bf7d1..33da793dd2 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-wirbelscancontrol"
-PKG_VERSION="0.0.2"
-PKG_SHA256="178c5768dd47355a42409a2cb2629f0762da1297865e3a84963684649145cb13"
+PKG_VERSION="0.0.3"
+PKG_SHA256="93418d31bb757cccea9f81edd13a3e84ca0cf239c30252afbf0ced68e9ef6bd5"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.gen2vdr.de/wirbel/wirbelscancontrol/index2.html"
 PKG_URL="https://www.gen2vdr.de/wirbel/wirbelscancontrol/${PKG_NAME/-plugin/}-${PKG_VERSION}.tgz"
@@ -17,11 +17,13 @@ PKG_BUILD_FLAGS="+pic"
 pre_build_target() {
   WIRBELSCAN_DIR=$(get_build_dir vdr-plugin-wirbelscan)
   ln -sf ${WIRBELSCAN_DIR}/wirbelscan_services.h ${PKG_BUILD}
+  ln -sf $(get_build_dir vdr) ${PKG_BUILD}/vdr
 }
 
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
   make VDRDIR=${VDR_DIR} \
+    INCLUDES="-I." \
     LIBDIR="." \
     LOCALEDIR="./locale"
 }
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/patches/vdr-plugin-wirbelscancontrol-02-vdr_2.3.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/patches/vdr-plugin-wirbelscancontrol-02-vdr_2.3.patch
deleted file mode 100644
index 1c2f0379ec..0000000000
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/patches/vdr-plugin-wirbelscancontrol-02-vdr_2.3.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/scanmenu.c
-+++ b/scanmenu.c
-@@ -255,6 +255,9 @@
- {
-    eOSState state = cOsdMenu::ProcessKey(Key);
-    int direction = 0;
-+#if APIVERSNUM >= 20301
-+   LOCK_CHANNELS_READ;
-+#endif
-    switch (Key) {
-       case kLeft:    direction = -1;
-                      break;
-@@ -268,7 +271,11 @@
-                         case SETSCAN:
-                           osdstatus = SCANNING;
-                           start = time(NULL);
-+#if APIVERSNUM < 20301
-                           channelcount0 = Channels.Count();
-+#else
-+                          channelcount0 = Channels->Count();
-+#endif
-                           SetHelp(tr("Stop"), NULL, NULL, NULL);
-                           TransferSetup();
-                           PutCommand(CmdStartScan);
-@@ -655,7 +662,8 @@
-   sbuf = cString::sprintf("%s (%d%% transponders from scan list + %u queued)", buf, status.progress, status.nextTransponders);
-   ProgressBar->SetText(*sbuf);
- 
--  if (TV1 && TV2 && TV3 && TV4 && TV5)
-+#if APIVERSNUM < 20301
-+  if (TV1 && TV2 && TV3 && TV4 && TV5) {
-      switch (Channels.Count() - channelcount0) {
-          default:;
-          case 5: TV5->SetText(Channels.GetByNumber(Channels.Count()-4)->Name());
-@@ -665,8 +673,23 @@
-          case 1: TV1->SetText(Channels.GetByNumber(Channels.Count()-0)->Name());
-          case 0:; 
-          }
--
-+  }
-   sbuf = cString::sprintf("%s%d", tr("New channels: "), Channels.Count() - channelcount0);
-+#else
-+  LOCK_CHANNELS_READ;
-+  if (TV1 && TV2 && TV3 && TV4 && TV5) {
-+     switch (Channels->Count() - channelcount0) {
-+         default:;
-+         case 5: TV5->SetText(Channels->GetByNumber(Channels->Count()-4)->Name());
-+         case 4: TV4->SetText(Channels->GetByNumber(Channels->Count()-3)->Name());
-+         case 3: TV3->SetText(Channels->GetByNumber(Channels->Count()-2)->Name());
-+         case 2: TV2->SetText(Channels->GetByNumber(Channels->Count()-1)->Name());
-+         case 1: TV1->SetText(Channels->GetByNumber(Channels->Count()-0)->Name());
-+         case 0:; 
-+         }
-+  }
-+  sbuf = cString::sprintf("%s%d", tr("New channels: "), Channels->Count() - channelcount0);
-+#endif
-   if (CH) CH->SetText(*sbuf);
- 
-   Display();
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 8830133152..c93bb92a16 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="ec7bd920d94e55f2d21bfa076b7e900b7b2b7537"
-PKG_SHA256="eacc91062095563d8adc93873b373ddb34b076a8c0a9e5a86f6220d1d5d892e9"
+PKG_VERSION="0.2.2"
+PKG_SHA256="f12a1af9b3cd5aa6eaa46b81721efa3a0495393378bd766e2449593226076e1e"
 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-01-fix-makefile.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01-fix-makefile.patch
new file mode 100644
index 0000000000..3c455a2404
--- /dev/null
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01-fix-makefile.patch
@@ -0,0 +1,11 @@
+--- vdr-plugin-xmltv2vdr-0.2.2/Makefile	2023-09-29 18:10:08.000000000 +0000
++++ vdr-plugin-xmltv2vdr-0.2.2/Makefile	2023-11-08 14:02:23.031530482 +0000
+@@ -53,6 +53,8 @@
+ PKG-LIBS += libxml-2.0 libpcrecpp sqlite3
+ PKG-INCLUDES += libxml-2.0 libpcrecpp sqlite3
+ 
++INCLUDES += -I$(VDRDIR)/include
++
+ DEFINES += -D_GNU_SOURCE -D_XOPEN_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+ CXXFLAGS += $(shell $(PKG_CONFIG) --cflags $(PKG-INCLUDES))
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-02_gcc721_fixes.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-02_gcc721_fixes.patch
deleted file mode 100644
index 91d784ec8e..0000000000
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-02_gcc721_fixes.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-taken from https://github.com/VDR4Arch/vdr4arch/blob/vdr-stable/plugins/vdr-xmltv2vdr/xmltv2vdr_gcc721_fixes.diff
-fixes 
-
-event.cpp: In member function 'void cXMLTVEvent::GetSQL(const char*, int, const char*, char**, char**)':
-event.cpp:531:5: error: 'string' was not declared in this scope
-     string si=sql_insert;
-     ^~~~~~
-
-diff --git a/dist/epgdata2xmltv/epgdata2xmltv.cpp b/dist/epgdata2xmltv/epgdata2xmltv.cpp
-index de6fb26..ec465fb 100644
---- a/dist/epgdata2xmltv/epgdata2xmltv.cpp
-+++ b/dist/epgdata2xmltv/epgdata2xmltv.cpp
-@@ -561,7 +561,7 @@ int cepgdata2xmltv::Process(int argc, char *argv[])
-                 enca_analyser_free(analyser);
-             }
- 
--            string s = xmlmem;
-+            std::string s = xmlmem;
-             int reps=pcrecpp::RE("&(?![a-zA-Z]{1,8};)").GlobalReplace("%amp;",&s);
-             if (reps) {
-                 xmlmem = (char *)realloc(xmlmem, s.size()+1);
-diff --git a/event.cpp b/event.cpp
-index ae33002..1df43ec 100644
---- a/event.cpp
-+++ b/event.cpp
-@@ -528,7 +528,7 @@ void cXMLTVEvent::GetSQL(const char *Source, int SrcIdx, const char *ChannelID,
-         return;
-     }
- 
--    string si=sql_insert;
-+    std::string si=sql_insert;
-     int ireps;
-     ireps=pcrecpp::RE("'").GlobalReplace("''",&si);
-     ireps+=pcrecpp::RE("\\^").GlobalReplace("'",&si);
-@@ -540,7 +540,7 @@ void cXMLTVEvent::GetSQL(const char *Source, int SrcIdx, const char *ChannelID,
-     }
-     *Insert=sql_insert;
- 
--    string su=sql_update;
-+    std::string su=sql_update;
-     int ureps;
-     ureps=pcrecpp::RE("'").GlobalReplace("''",&su);
-     ureps+=pcrecpp::RE("\\^").GlobalReplace("'",&su);
-diff --git a/import.cpp b/import.cpp
-index 0d6f7bf..e417c59 100644
---- a/import.cpp
-+++ b/import.cpp
-@@ -1401,7 +1401,7 @@ bool cImport::UpdateXMLTVEvent(cEPGSource *Source, sqlite3 *Db, cXMLTVEvent *xEv
-             return false;
-         }
- 
--        string ed=shortdesc;
-+        std::string ed=shortdesc;
- 
-         int reps;
-         reps=pcrecpp::RE("'").GlobalReplace("''",&ed);
-@@ -1511,7 +1511,7 @@ bool cImport::UpdateXMLTVEvent(cEPGSource *Source, sqlite3 *Db, const cEvent *Ev
-             return false;
-         }
- 
--        string ed=eitdescription;
-+        std::string ed=eitdescription;
- 
-         int reps;
-         reps=pcrecpp::RE("'").GlobalReplace("''",&ed);
-@@ -1649,7 +1649,7 @@ cXMLTVEvent *cImport::SearchXMLTVEvent(sqlite3 **Db,const char *ChannelID, const
-             return NULL;
-         }
- 
--        string st=sqltitle;
-+        std::string st=sqltitle;
- 
-         int reps;
-         reps=pcrecpp::RE("'").GlobalReplace("''",&st);
diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk
index fd6ca5444a..5c0b07657b 100644
--- a/packages/addons/service/vdr-addon/package.mk
+++ b/packages/addons/service/vdr-addon/package.mk
@@ -5,7 +5,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="2.6.4"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
@@ -50,11 +50,11 @@ addon() {
 
   # copy binaries
   for pkg in ddci2 dummydevice dvbapi eepg epgfixer epgsearch iptv live restfulapi robotv satip vnsiserver wirbelscan wirbelscancontrol xmltv2vdr; do
-    cp -PR $(get_build_dir vdr-plugin-${pkg})/libvdr*.so.* ${ADDON_BUILD}/${PKG_ADDON_ID}/plugin
+    cp -PR $(get_build_dir vdr-plugin-${pkg})/libvdr*.so* ${ADDON_BUILD}/${PKG_ADDON_ID}/plugin
   done
 
-  # copy locale (omit ddci, dummydevice, robotv)
-  for pkg in dvbapi eepg epgfixer epgsearch iptv live restfulapi satip vnsiserver wirbelscan wirbelscancontrol xmltv2vdr; do
+  # copy locale (omit ddci, dummydevice, robotv, wirbelscancontrol, xmltv2vdr)
+  for pkg in dvbapi eepg epgfixer epgsearch iptv live restfulapi satip vnsiserver wirbelscan; do
     cp -PR $(get_build_dir vdr-plugin-${pkg})/locale/* ${ADDON_BUILD}/${PKG_ADDON_ID}/locale
   done