jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-01 15:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4638 from CvH/10.0/vdr-up

Browse Source 
vdr addon update to 2.4.4
This commit is contained in:
Matthias Reichl 2020-11-04 18:59:18 +01:00 committed by GitHub
commit 57711b6fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 54 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-dvbapi"
PKG_VERSION="7d51cc457823156d446d06c6ae40f850958fa735"
PKG_SHA256="b16840574802581950343942559797aeccbc4a8fc216901ad0cea42f420bfd7c"
PKG_VERSION="197e7524e563923d4b86e74a121f7174373818d9"
PKG_SHA256="6eee60d524c185f1f72c4413e79a80619934508b75aa27f213b2f481182ec6fb"
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"

8
packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-01_crosscompiling.patch
View File

@ -1,11 +1,11 @@
--- a/Makefile
+++ b/Makefile
@@ -156,7 +156,7 @@ libdvbapi-dvbufs9xx.so: device-ufs9xx.o
@@ -136,7 +136,7 @@ $(SOFILE): $(OBJS) $(FFDECSA)
ifndef LIBDVBCSA
$(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h
- @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CXXFLAGS) $(LDFLAGS) $(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) all
+ @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CXXFLAGS) $(LDFLAGS) $(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) FFdecsa.o
@echo CC $@
- $(Q)@$(MAKE) COMPILER="$(CXX)" FLAGS="$(CXXFLAGS) $(LDFLAGS) $(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) all
+ $(Q)@$(MAKE) COMPILER="$(CXX)" FLAGS="$(CXXFLAGS) $(LDFLAGS) $(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) FFdecsa.o
endif
install-lib: $(SOFILE)

4
packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-iptv"
PKG_VERSION="5ae793f03048816193003c472d844091f4fd1767"
PKG_SHA256="b7a071ff46e6e06c18e3fbc413e3c8eb2bdb6cae3af953ce93e94ab445bf5cda"
PKG_VERSION="f7369c9578c1437c7a19cf11e21424844f42a341"
PKG_SHA256="9045ec034182d19535ab3478152ef6a7fd2640478c78d697d2f2c93f11482316"
PKG_LICENSE="GPL"
PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/"
PKG_URL="https://github.com/rofafor/vdr-plugin-iptv/archive/$PKG_VERSION.tar.gz"

2
packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk
View File

@ -12,7 +12,7 @@ PKG_DEPENDS_TARGET="toolchain vdr tntnet pcre:host pcre"
PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
PKG_LONGDESC="Allows a comfortable operation of VDR and some of its plugins trough a web interface."
PKG_TOOLCHAIN="manual"
PKG_BUILD_FLAGS="+pic"
PKG_BUILD_FLAGS="+pic -parallel"
pre_configure_target() {
export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib/iconv"

4
packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk
View File

@ -2,8 +2,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-robotv"
PKG_VERSION="13b691af63743ce6481e2558dc50ee89dd7a0349"
PKG_SHA256="1bd508383d3b393dd1273af9bef07a1a64ac22c8eada85c96e5aa541c3abf228"
PKG_VERSION="e06dd3942a17bf622f625b6e51f24e95cfa3877e"
PKG_SHA256="4f9d5092107d34b2036d56f858a0a744a21f38df8bf6698532c8dcad0157f316"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/pipelka/roboTV"
PKG_URL="https://github.com/pipelka/vdr-plugin-robotv/archive/$PKG_VERSION.tar.gz"

4
packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-satip"
PKG_VERSION="b697e435d4bf42754309e6b5a9c5f8ff43463077"
PKG_SHA256="9ccb90b4b55848bad738236e07e0feb2af9e78e6c9ee6614b5a1172db3e00fb0"
PKG_VERSION="a7625c028c460b8350a023db495e2b6b0bc93607"
PKG_SHA256="49955757df436393b1ae3ef1ce05a13ea80d5de87dd1222cad9e71045e3ab26e"
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"

4
packages/addons/addon-depends/vdr/package.mk
View File

@ -4,8 +4,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr"
PKG_VERSION="2.4.1"
PKG_SHA256="25c3f835c4f3ff92cd2db10c004439ef22c2e895193c77fbe8cc7eac4858a1dc"
PKG_VERSION="2.4.4"
PKG_SHA256="8a04d12af73d15daed2f9864a9ca0cfb25400da388c41e8476048c61b7ee2c5a"
PKG_LICENSE="GPL"
PKG_SITE="http://www.tvdr.de"
PKG_URL="http://ftp.tvdr.de/vdr-$PKG_VERSION.tar.bz2"

2
packages/addons/addon-depends/vdr/patches/vdr-01-decrease-channels.conf-autosave-delay.patch
View File

@ -3,7 +3,7 @@ Subject: [PATCH] decrease channels.conf autosave delay
--- a/vdr.c
+++ b/vdr.c
@@ -74,7 +74,7 @@
@@ -80,7 +80,7 @@
#define SHUTDOWNCANCELPROMPT 5 // seconds to wait in user prompt to allow canceling shutdown
#define RESTARTCANCELPROMPT 5 // seconds to wait in user prompt before restarting on SIGHUP
#define MANUALSTART 600 // seconds the next timer must be in the future to assume manual start

8
packages/addons/addon-depends/vdr/patches/vdr-02-disable-logspam.patch
View File

@ -3,7 +3,7 @@ ERROR: no OSD provider available - using dummy OSD!
--- a/osd.c
+++ b/osd.c
@@ -2027,8 +2027,6 @@ cOsd *cOsdProvider::NewOsd(int Left, int Top, uint Level)
@@ -2029,8 +2029,6 @@ cOsd *cOsdProvider::NewOsd(int Left, int Top, uint Level)
}
return Osd;
}
@ -14,7 +14,7 @@ ERROR: no OSD provider available - using dummy OSD!
--- a/vdr.c
+++ b/vdr.c
@@ -765,12 +765,6 @@ int main(int argc, char *argv[])
@@ -784,11 +784,6 @@ int main(int argc, char *argv[])
Folders.Load(AddDirectory(ConfigDirectory, "folders.conf"));
CamResponsesLoad(AddDirectory(ConfigDirectory, "camresponses.conf"), true);
@ -23,7 +23,5 @@ ERROR: no OSD provider available - using dummy OSD!
- fprintf(stderr, "vdr: %s\n", msg);
- esyslog("ERROR: %s", msg);
- }
-
// Recordings:
cRecordings::Update();
// Recordings:

28
packages/addons/addon-depends/vdr/patches/vdr-03-glibc-2.31-fix.patch
View File

@ -1,28 +0,0 @@
From 0cf5d433583ead5a634f7bea9e08236bc1805318 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 3 Feb 2020 23:41:55 +0000
Subject: [PATCH] replace obsolete stime after glibc-2.31
---
eit.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/eit.c b/eit.c
index 50d8229..60c295d 100644
--- a/eit.c
+++ b/eit.c
@@ -391,7 +391,10 @@ cTDT::cTDT(const u_char *Data)
if (abs(diff) > MAX_TIME_DIFF) {
mutex.Lock();
if (abs(diff) > MAX_ADJ_DIFF) {
- if (stime(&dvbtim) == 0)
+ struct timespec ts;
+ ts.tv_sec = dvbtim;
+ ts.tv_nsec = 0;
+ if (clock_settime(CLOCK_REALTIME, &ts) == 0)
isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
else
esyslog("ERROR while setting system time: %m");
--
2.20.1

7
packages/addons/service/vdr-addon/changelog.txt
View File

@ -1,3 +1,10 @@
112
- update VDR to 2.4.4
- update dvbapi to 2019-07-27
- update iptv to 2020-01-03
- update robotv to 2020-05-04
- update satip to 2020-02-18
111
- update VDR to 2.4.1
- update epgsearch to 2019-04-11

85
packages/addons/service/vdr-addon/package.mk
View File

@ -4,8 +4,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-addon"
PKG_VERSION="2.4.1"
PKG_REV="111"
PKG_VERSION="2.4.4"
PKG_REV="112"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://libreelec.tv"
@ -24,71 +24,42 @@ PKG_ADDON_TYPE="xbmc.service"
PKG_ADDON_REQUIRES="pvr.vdr.vnsi:0.0.0 script.config.vdr:0.0.0"
addon() {
VDR_DIR="$(get_build_dir vdr)"
VDR_PLUGIN_LIVE_DIR="$(get_build_dir vdr-plugin-live)"
VDR_PLUGIN_VNSISERVER_DIR="$(get_build_dir vdr-plugin-vnsiserver)"
VDR_PLUGIN_STREAMVEV_DIR="$(get_build_dir vdr-plugin-streamdev)"
VDR_PLUGIN_XMLTV2VDR="$(get_build_dir vdr-plugin-xmltv2vdr)"
VDR_PLUGIN_EPGFIXER_DIR="$(get_build_dir vdr-plugin-epgfixer)"
VDR_PLUGIN_RESTFULAPI_DIR="$(get_build_dir vdr-plugin-restfulapi)"
# create dirs
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/{bin,lib,plugin}
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/{eepg,epgfixer,epgsearch,streamdev-server,vnsiserver}
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/{live,restfulapi}
# configs
cp -P $(get_build_dir vdr)/{diseqc.conf,keymacros.conf,scr.conf,sources.conf,svdrphosts.conf} $ADDON_BUILD/$PKG_ADDON_ID/config
cp -P $(get_build_dir vdr-plugin-epgfixer)/epgfixer/*.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer
cp -P $(get_build_dir vdr-plugin-streamdev)/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
cp -P $(get_build_dir vdr-plugin-vnsiserver)/vnsiserver/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
touch $ADDON_BUILD/$PKG_ADDON_ID/config/channels.conf
cp $VDR_DIR/diseqc.conf $ADDON_BUILD/$PKG_ADDON_ID/config
cp $VDR_DIR/keymacros.conf $ADDON_BUILD/$PKG_ADDON_ID/config
cp $VDR_DIR/scr.conf $ADDON_BUILD/$PKG_ADDON_ID/config
cp $VDR_DIR/sources.conf $ADDON_BUILD/$PKG_ADDON_ID/config
cp $VDR_DIR/svdrphosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config
echo '0.0.0.0/0' >> $ADDON_BUILD/$PKG_ADDON_ID/config/svdrphosts.conf
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgsearch
# copy static files
cp -PR $(get_build_dir vdr-plugin-restfulapi)/web/* \
$(get_build_dir vdr-plugin-restfulapi)/API.html \
$ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
cp -PR $VDR_PLUGIN_LIVE_DIR/live/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
cp -PR $(get_build_dir vdr-plugin-live)/live/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/
cp $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
done
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $VDR_PLUGIN_VNSISERVER_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $(get_build_dir vdr-plugin-iptv)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $(get_build_dir vdr-plugin-wirbelscan)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $(get_build_dir vdr-plugin-wirbelscancontrol)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $(get_build_dir vdr-plugin-dvbapi)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $(get_build_dir vdr-plugin-eepg)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $VDR_PLUGIN_STREAMVEV_DIR/server/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $VDR_PLUGIN_STREAMVEV_DIR/client/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $VDR_PLUGIN_LIVE_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $(get_build_dir vdr-plugin-epgsearch)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $VDR_PLUGIN_XMLTV2VDR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $(get_build_dir vdr-plugin-dummydevice)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $(get_build_dir vdr-plugin-satip)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $VDR_PLUGIN_EPGFIXER_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $VDR_PLUGIN_RESTFULAPI_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $(get_build_dir vdr-plugin-robotv)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $(get_build_dir vdr-plugin-ddci2)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -P $(get_build_dir vdr-plugin-streamdev)/client/libvdr*.so.* \
$(get_build_dir vdr-plugin-streamdev)/server/libvdr*.so.* \
$ADDON_BUILD/$PKG_ADDON_ID/plugin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/eepg
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
cp -PR $VDR_PLUGIN_VNSISERVER_DIR/vnsiserver/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
cp -P $VDR_DIR/vdr $ADDON_BUILD/$PKG_ADDON_ID/bin/vdr.bin
cp -P $VDR_PLUGIN_XMLTV2VDR/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -PL $(get_install_dir tntnet)/usr/lib/libtntnet.so.12 $ADDON_BUILD/$PKG_ADDON_ID/lib
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
cp -PR $VDR_PLUGIN_STREAMVEV_DIR/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
cp -P $(get_build_dir vdr)/vdr $ADDON_BUILD/$PKG_ADDON_ID/bin/vdr.bin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer
cp -PR $VDR_PLUGIN_EPGFIXER_DIR/epgfixer/*.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
cp -P $VDR_PLUGIN_RESTFULAPI_DIR/web/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
cp -P $VDR_PLUGIN_RESTFULAPI_DIR/API.html $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
}