From a206097250586ab96fb7a99f5d2578fd990c4a4d Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Mon, 13 Nov 2023 18:45:36 +0100
Subject: [PATCH 1/4] vdr-plugin-wirbelscancontrol: create so with apiversion
 and locale

---
 .../vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 33da793dd2..f3ad5b79db 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
@@ -25,5 +25,6 @@ make_target() {
   make VDRDIR=${VDR_DIR} \
     INCLUDES="-I." \
     LIBDIR="." \
-    LOCALEDIR="./locale"
+    LOCALEDIR="./locale" \
+    install
 }

From c94e84e778da54837b67d0805331ddd88b212376 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Mon, 13 Nov 2023 18:45:37 +0100
Subject: [PATCH 2/4] vdr-plugin-xmltv2vdr: create so with apiversion and
 locale

---
 .../addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 c93bb92a16..21716ecabc 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
@@ -23,7 +23,8 @@ make_target() {
   VDR_DIR=$(get_build_dir vdr)
   make VDRDIR=${VDR_DIR} \
     LIBDIR="." \
-    LOCALEDIR="./locale"
+    LOCALEDIR="./locale" \
+    install
 }
 
 post_make_target() {

From 72a55daa743751796a29d8a606596a7f36d76ca0 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Mon, 13 Nov 2023 18:45:39 +0100
Subject: [PATCH 3/4] vdr-plugin-wirbelscan: add missing object file

---
 .../vdr-plugins/vdr-plugin-wirbelscan/sources/Makefile          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b4e8ac7204..af2920cdc0 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
@@ -34,7 +34,7 @@ LDFLAGS += $(shell pkg-config --libs $(LIBREPFUNC))
 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
-OBJS += scanfilter.o statemachine.o countries.o
+OBJS += scanfilter.o statemachine.o countries.o si_ext.o
 
 all: libvdr-$(PLUGIN).so i18n
 

From c32d3f63da232cb56878ddc1205e3968a5086856 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Mon, 13 Nov 2023 18:45:40 +0100
Subject: [PATCH 4/4] vdr-addon: update addon to (4)

- fix buiding wirbelscancontrol, wirbelscan and xltv2vdr
- only copy so's with apiversion
- install wirbelscancontrol and xmltv2vdr locale
---
 packages/addons/service/vdr-addon/package.mk | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk
index 964123fc55..0958213e7b 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="3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
@@ -49,12 +49,14 @@ addon() {
   cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv.dist ${ADDON_BUILD}/${PKG_ADDON_ID}/config/epgsources/epgdata2xmltv
 
   # 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
+  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
   done
 
-  # copy locale (omit ddci, dummydevice, robotv, wirbelscancontrol, xmltv2vdr)
-  for pkg in dvbapi eepg epgfixer epgsearch iptv live restfulapi satip vnsiserver wirbelscan; do
+  # copy locale (omit ddci, dummydevice, robotv)
+  for pkg in dvbapi eepg epgfixer epgsearch iptv live restfulapi satip vnsiserver wirbelscan \
+             wirbelscancontrol xmltv2vdr; do
     cp -PR $(get_build_dir vdr-plugin-${pkg})/locale/* ${ADDON_BUILD}/${PKG_ADDON_ID}/locale
   done