From ee37194e7511d29b1b18d04100db260fc85c38fe Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 11 Nov 2023 11:06:57 +0000 Subject: [PATCH 1/3] vdr-plugin-xmltv2vdr: update to githash 089976d and drop reliance on pcre --- .../vdr-plugin-xmltv2vdr/package.mk | 8 +++--- ...lErrorPtr-to-compile-with-libxml2.12.patch | 25 ------------------- 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-05-use-const-xmlErrorPtr-to-compile-with-libxml2.12.patch 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 21716ecabc..f4ffd3e06a 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,12 +3,12 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr-plugin-xmltv2vdr" -PKG_VERSION="0.2.2" -PKG_SHA256="f12a1af9b3cd5aa6eaa46b81721efa3a0495393378bd766e2449593226076e1e" +PKG_VERSION="089976d4950c2641714be599766f0534825165ca" +PKG_SHA256="6e108a833dbd2ec3b1d812bc4e29e2ebfa1014bf21157a3168b3af759af7b4d5" 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" -PKG_DEPENDS_TARGET="toolchain vdr sqlite openssl curl libzip libxml2 libxslt enca pcre" +PKG_DEPENDS_TARGET="toolchain vdr sqlite openssl curl libzip libxml2 libxslt enca" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="xmltv2vdr imports data in xmltv format" PKG_TOOLCHAIN="manual" @@ -16,7 +16,7 @@ PKG_BUILD_FLAGS="+pic" pre_configure_target() { export CXXFLAGS="${CXXFLAGS} -Wno-narrowing" - export LIBS="-L${SYSROOT_PREFIX}/usr/lib/iconv -lpcre -lpcrecpp -lssl -lcrypto -lbz2" + export LIBS="-L${SYSROOT_PREFIX}/usr/lib/iconv -lssl -lcrypto -lbz2" } make_target() { diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-05-use-const-xmlErrorPtr-to-compile-with-libxml2.12.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-05-use-const-xmlErrorPtr-to-compile-with-libxml2.12.patch deleted file mode 100644 index ccf1139427..0000000000 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-05-use-const-xmlErrorPtr-to-compile-with-libxml2.12.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8286d585d6177c3c3a0321459bfaa9e1e5d8122c Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Fri, 1 Dec 2023 12:34:41 +0000 -Subject: [PATCH] use const xmlErrorPtr to compile with libxml2.12 - ---- - parse.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parse.cpp b/parse.cpp -index a2ab767..87d8f16 100644 ---- a/parse.cpp -+++ b/parse.cpp -@@ -1070,7 +1070,7 @@ int cParse::Process(cEPGExecutor &myExecutor,char *buffer, int bufsize) - skipped++; - continue; - } -- xmlErrorPtr xmlerr=xmlGetLastError(); -+ const xmlError* xmlerr=xmlGetLastError(); - if (xmlerr && xmlerr->code) - { - esyslogs(source,"%s",xmlerr->message); --- -2.34.1 - From ae6e8573cc512f2cc05cc0b194af8f6fac9ab2c3 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 6 Jan 2024 20:07:11 +0000 Subject: [PATCH 2/3] vdr-plugin-live: update to 3.3.4 --- .../addon-depends/vdr-plugins/vdr-plugin-live/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 266983bfa8..8ce7150529 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.3.3" -PKG_SHA256="efd0215f7f9b751599a52de4a9cf24dae24c2eb7cfaf12ea15b5ec6becd799dd" +PKG_VERSION="3.3.4" +PKG_SHA256="9ffa4716c028cc4c1883ceedcdd2b0c4dff5cb84993287ced23b639b3f8779e4" 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" From 96315cee5aa913edbdf3743b92fdbb33c4a7288a Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 7 Jan 2024 01:01:46 +0000 Subject: [PATCH 3/3] vdr-addon: update addon (2) - vdr-plugin-live: update to 3.3.4 - vdr-plugin-xmltv2vdr: update to githash 089976d and drop reliance on pcre --- packages/addons/service/vdr-addon/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk index e71af2dd88..05959148c3 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.5" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv"