Merge pull request #8320 from heitbaum/vdr

vdr-addon: update addon to (3)

packages/addons/addon-depends/librepfunc/package.mk

@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="librepfunc"
+PKG_VERSION="1.8.1"
+PKG_SHA256="ea0c68fd698aa4660fe870906ce2128e7925135d5abaaf19cd80f5054d177148"
+PKG_LICENSE="GPL-2.0"
+PKG_SITE="https://github.com/wirbel-at-vdr-portal/librepfunc"
+PKG_URL="https://github.com/wirbel-at-vdr-portal/librepfunc/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="librepfunc - a collection of functions, classes used by wirbel-at-vdr-portal"
+PKG_BUILD_FLAGS="-sysroot"
+
+pre_configure_target() {
+  sed -i -e 's/^install:/install-shared:/' -e 's/^install-static:/install:/' Makefile
+}

packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk

@@ -3,17 +3,21 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-wirbelscan"
-PKG_VERSION="2021.10.09"
-PKG_SHA256="e6f7e38402e0853b0460d723fdc745c110417bfab3c94c9883f49126eca680a8"
+PKG_VERSION="2023.10.15"
+PKG_SHA256="58ab069bf3719053f9601c129607785a89bcf13008ed5c70fa010e815134490f"
 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"
-PKG_DEPENDS_TARGET="toolchain vdr"
+PKG_DEPENDS_TARGET="toolchain vdr librepfunc"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
 PKG_LONGDESC="Performs a channel scans for DVB-T, DVB-C and DVB-S"
 PKG_TOOLCHAIN="manual"
 PKG_BUILD_FLAGS="+pic"
 
+configure_target() {
+  export PKG_CONFIG_PATH="$(get_install_dir librepfunc)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
+}
+
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
   make VDRDIR=${VDR_DIR} \

packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-01-fixes.patch

@@ -4,15 +4,15 @@ diff --git a/wirbelscan.cpp b/wirbelscan.cpp
 index 602e659..aafbec3 100644
 --- a/wirbelscan.cpp
 +++ b/wirbelscan.cpp
-@@ -12,6 +12,7 @@
+@@ -20,6 +20,7 @@
  extern int channelcount;     // menusetup.c
  extern int nextTransponders; // scanfilter.c
  extern cScanner* Scanner;
 +extern TChannels NewChannels;
  
- 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
+ const char* WIRBELSCAN_VERSION        = "2023.10.15"; /* YYYY.MM.DD */
+ const char* WIRBELSCAN_DESCRIPTION    = "DVB channel scan for VDR";
+@@ -218,8 +219,8 @@ bool cPluginWirbelscan::Service(const ch
          strcpy(s->transponder, lTransponder.length()? lTransponder.c_str():"none");
          s->progress = s->status == StatusScanning?lProgress:0;
          s->strength = s->status == StatusScanning?lStrength:0;

packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-03-fixes.patch

@@ -1,10 +0,0 @@
---- 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 {
- 

packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/sources/Makefile

@@ -12,6 +12,12 @@ VDRDIR ?= ../../..
 LIBDIR ?= ../../lib
 TMPDIR ?= /tmp
 
+#/******************************************************************************
+# * dependencies, add variables here, and checks in target check_dependencies
+# *****************************************************************************/
+LIBREPFUNC=librepfunc
+LIBREPFUNC_MINVERSION=1.0.0
+
 include $(VDRDIR)/Make.global
 
 -include $(VDRDIR)/Make.config
@@ -21,9 +27,9 @@ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDI
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
-INCLUDES += -I$(VDRDIR)/include
-
+INCLUDES += -I$(VDRDIR)/include $(shell pkg-config --cflags $(LIBREPFUNC))
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+LDFLAGS += $(shell pkg-config --libs $(LIBREPFUNC))
 
 UNCRUSTIFY_FILES = scanner.cpp scanner.h scanfilter.cpp scanfilter.h statemachine.h statemachine.cpp
 
@@ -66,7 +72,7 @@ $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
 i18n: $(I18Nmsgs) $(I18Npot)
 
 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LDFLAGS)
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 perm:

packages/addons/service/vdr-addon/package.mk

@@ -5,7 +5,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="2.6.4"
-PKG_REV="2"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"