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 new file mode 100644 index 0000000000..aa6235ba72 --- /dev/null +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-04_fix_vdr_2.6.x_build_error.patch @@ -0,0 +1,37 @@ +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/package.mk b/packages/addons/addon-depends/vdr/package.mk index 36f74f916f..bf880b2745 100644 --- a/packages/addons/addon-depends/vdr/package.mk +++ b/packages/addons/addon-depends/vdr/package.mk @@ -4,8 +4,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr" -PKG_VERSION="2.4.8" -PKG_SHA256="4dce19d99c0ab04c032ce33e7b27a84c73b004d520c28baef572466f43b066d5" +PKG_VERSION="2.6.0" +PKG_SHA256="111a862ba52caaf5d74ec1374135047137c1a01071390f5e14632916c3c3540b" PKG_LICENSE="GPL" PKG_SITE="http://www.tvdr.de" PKG_URL="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PKG_VERSION};sf=tbz2" diff --git a/packages/addons/service/vdr-addon/changelog.txt b/packages/addons/service/vdr-addon/changelog.txt index 0dedd1c878..d60612a3a0 100644 --- a/packages/addons/service/vdr-addon/changelog.txt +++ b/packages/addons/service/vdr-addon/changelog.txt @@ -1,3 +1,6 @@ +118 +- update VDR to 2.6.0 + 117 - update VDR to 2.4.8 - update libzip to 1.8.0 diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk index e7d91d7df4..5e6ed2d51d 100644 --- a/packages/addons/service/vdr-addon/package.mk +++ b/packages/addons/service/vdr-addon/package.mk @@ -4,8 +4,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr-addon" -PKG_VERSION="2.4.8" -PKG_REV="117" +PKG_VERSION="2.6.0" +PKG_REV="118" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" @@ -15,7 +15,7 @@ PKG_DEPENDS_TARGET="toolchain vdr vdr-plugin-ddci2 vdr-plugin-dummydevice vdr-pl vdr-plugin-streamdev vdr-plugin-vnsiserver vdr-plugin-wirbelscan vdr-plugin-wirbelscancontrol vdr-plugin-xmltv2vdr" PKG_SECTION="service.multimedia" PKG_SHORTDESC="VDR: a TV streaming server for Linux" -PKG_LONGDESC="VDR (2.4.x) is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV and SAT>IP" +PKG_LONGDESC="VDR (2.6.x) is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV and SAT>IP" PKG_TOOLCHAIN="manual" PKG_IS_ADDON="yes"