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

Merge pull request #3112 from CvH/9.0/vdr-add

Browse Source 
vdr-addon: several fixes
This commit is contained in:
MilhouseVH 2018-11-25 19:01:22 +00:00 committed by GitHub
commit 048c44b131
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 158 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-ddci2"
PKG_VERSION="05dd988"
PKG_VERSION="05dd98824092859afd2aa7a4996c8f258affd975"
PKG_SHA256="b8ed2787e9140eb00a68397eaeb14862ba88a6e73480dc3220a098faffb14833"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/jasmin-j/vdr-plugin-ddci2"

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

@ -3,7 +3,7 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-dvbapi"
PKG_VERSION="7d51cc4"
PKG_VERSION="7d51cc457823156d446d06c6ae40f850958fa735"
PKG_SHA256="b16840574802581950343942559797aeccbc4a8fc216901ad0cea42f420bfd7c"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"

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

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-eepg"
PKG_VERSION="584d766"
PKG_SHA256="0ad19af6bcfb5f7de05814dfcb4ab18bb4f705fdbe60b11ab7dbf72cf0d85231"
PKG_VERSION="c46be443988489780f993a47d23a42936b49d6c0"
PKG_SHA256="08b343caa392bddefeb6e8cfe6f341b4e11e120046dce05961a335a06e9bee6c"
PKG_LICENSE="GPL"
PKG_SITE="http://projects.vdr-developer.org/projects/plg-eepg"
PKG_URL="https://github.com/vdr-projects/vdr-plugin-eepg/archive/$PKG_VERSION.tar.gz"

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

@ -3,7 +3,7 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-epgfixer"
PKG_VERSION="354f28b"
PKG_VERSION="354f28b0112ba27f08f6509243b410899f74b6ed"
PKG_SHA256="15bd73116f3bda9afc274bee97eff829b98f38b13043be32d7bb7f81af294715"
PKG_LICENSE="GPL"
PKG_SITE="http://projects.vdr-developer.org/projects/plg-epgfixer"

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

@ -3,7 +3,7 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-epgsearch"
PKG_VERSION="84b59b8"
PKG_VERSION="84b59b81137887a48533cc897551bccf2e9e10f6"
PKG_SHA256="d6c4a9136588a7cdf2eb43b6b9643a5bb81a44c542c6e6fcf7448b2383901914"
PKG_LICENSE="GPL"
PKG_SITE="http://winni.vdr-developer.org/epgsearch/"

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

@ -3,7 +3,7 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-iptv"
PKG_VERSION="5ae793f"
PKG_VERSION="5ae793f03048816193003c472d844091f4fd1767"
PKG_SHA256="b7a071ff46e6e06c18e3fbc413e3c8eb2bdb6cae3af953ce93e94ab445bf5cda"
PKG_LICENSE="GPL"
PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/"

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

@ -3,7 +3,7 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-live"
PKG_VERSION="e582514"
PKG_VERSION="e582514ede475574842b44ca6792335ff141172d"
PKG_SHA256="74deb2ca43ffb5779b3f9ff6f34c8b53898a226fcf92605d7ede0401cb62601c"
PKG_LICENSE="GPL"
PKG_SITE="http://live.vdr-developer.org/en/index.php"

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

@ -2,7 +2,7 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-robotv"
PKG_VERSION="50d4bdc"
PKG_VERSION="50d4bdcdbe3bdb6e85fe02de4c4086ca1f8db94d"
PKG_SHA256="062489e55111f0ba2420463cc506865ac59b1c1d080b318cb81d58ec3f4fbd3f"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/pipelka/roboTV"

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="299296b"
PKG_SHA256="a6416619e0c57e4e0f3379ccde52a92cebeeec080805f0e7121e599a45e0c0df"
PKG_VERSION="a4051bf88c1f3c86cfe5133fd703517296f7f590"
PKG_SHA256="ea9f930b829e4c333f8401e64b5e03a82efb88a4c6db3320463b295d297b0035"
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"

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

@ -3,7 +3,7 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-streamdev"
PKG_VERSION="e2a9b97"
PKG_VERSION="e2a9b979d3fb92967c7a6a8221e674eb7e55c813"
PKG_SHA256="adcc08ac19cf98122576bedf63be3396d8b81ee4196c00df0e25c9fb8b7e11b8"
PKG_LICENSE="GPL"
PKG_SITE="http://projects.vdr-developer.org/projects/plg-streamdev"

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

@ -3,11 +3,11 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-wirbelscan"
PKG_VERSION="2017.06.04"
PKG_SHA256="c7a792c794fb98dd7f665e1be2271f4a1a957a26c017043fcd4dd8d8b7fd582b"
PKG_VERSION="2018.11.04"
PKG_SHA256="62c2848aefdb768c165310f70b3746665f57b96a95ebae96761febbb07e942e3"
PKG_LICENSE="GPL"
PKG_SITE="http://wirbel.htpc-forum.de/wirbelscan/index2.html"
PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/${PKG_NAME/-plugin/}-dev-$PKG_VERSION.tgz"
PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-$PKG_VERSION.tgz"
PKG_DEPENDS_TARGET="toolchain vdr"
PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
PKG_LONGDESC="Performs a channel scans for DVB-T, DVB-C and DVB-S"
@ -16,7 +16,6 @@ PKG_BUILD_FLAGS="+pic"
make_target() {
VDR_DIR=$(get_build_dir vdr)
cp backup/Makefile.old Makefile
make VDRDIR=$VDR_DIR \
LIBDIR="." \
LOCALEDIR="./locale"

12
packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-001-fix_segv.patch
View File

@ -1,12 +0,0 @@
--- a/statemachine.c
+++ b/statemachine.c
@@ -309,7 +309,8 @@ void cStateMachine::Action(void) {
else
newState = eAddChannels;
if (time(0) != tm) {
- MenuScanning->SetProgress(lProgress);
+ if (MenuScanning)
+ MenuScanning->SetProgress(lProgress);
tm = time(0);
}
}

22
packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-002-channel_count.patch
View File

@ -1,22 +0,0 @@
--- a/wirbelscan.c
+++ b/wirbelscan.c
@@ -13,6 +13,8 @@
#include "countries.h"
#include "satellites.h"
+extern TChannels NewChannels;
+
static const char *VERSION = "2017.06.04";
static const char *DESCRIPTION = "DVB channel scan for VDR";
static const char *MAINMENUENTRY = NULL; /* main menu -> use wirbelscancontrol plugin */
@@ -201,8 +203,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;
- s->numChannels = 0; // Channels.Count(); // not possible any longer.
- s->newChannels = channelcount; // ((Channels.Count() - channelcount) > 0) && channelcount?Channels.Count() - channelcount:0;
+ s->numChannels = cChannels::MaxNumber();
+ s->newChannels = (NewChannels.Count() > cChannels::MaxNumber()) ? NewChannels.Count() - cChannels::MaxNumber():0;
s->nextTransponders = nextTransponders;
return true;
}

29
packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-003-detect.patch → packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-01-fixes.patch
View File

@ -1,3 +1,32 @@
Subject: [PATCH 1/2] interface channel count
diff --git a/wirbelscan.c b/wirbelscan.c
index 602e659..aafbec3 100644
--- a/wirbelscan.c
+++ b/wirbelscan.c
@@ -12,6 +12,7 @@
#include "menusetup.h"
#include "countries.h"
#include "satellites.h"
+extern TChannels NewChannels;
static const char *VERSION = "2018.11.04";
static const char *DESCRIPTION = "DVB channel scan for VDR";
@@ -201,8 +202,8 @@ bool cPluginWirbelscan::Service(const char* id, void* Data) {
strcpy(s->transponder, lTransponder.length()? lTransponder.c_str():"none");
s->progress = s->status == StatusScanning?lProgress:0;
s->strength = s->status == StatusScanning?lStrength:0;
- s->numChannels = 0; // Channels.Count(); // not possible any longer.
- s->newChannels = channelcount; // ((Channels.Count() - channelcount) > 0) && channelcount?Channels.Count() - channelcount:0;
+ s->numChannels = cChannels::MaxNumber();
+ s->newChannels = (NewChannels.Count() > cChannels::MaxNumber()) ? NewChannels.Count() - cChannels::MaxNumber():0;
s->nextTransponders = nextTransponders;
return true;
}
Subject: [PATCH 2/2] device detection
diff --git a/common.c b/common.c
index 0ba4656..1ea8e51 100644
--- a/common.c
+++ b/common.c
@@ -46,20 +46,10 @@ void cMySetup::InitSystems(void) {

84
packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/sources/Makefile Normal file
View File

@ -0,0 +1,84 @@
# taken from wirbelscan-2017.06.04 backup/Makefile.old
# -- v20120526, Winfried Koehler --
PLUGIN = wirbelscan
VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
CXX ?= g++
CXXFLAGS ?= -g -O3 -Wall -Wextra -Werror=overloaded-virtual -Wformat=2 -Wswitch-default -fstack-protector-all -D_FORTIFY_SOURCE=2
VDRDIR ?= ../../..
LIBDIR ?= ../../lib
TMPDIR ?= /tmp
include $(VDRDIR)/Make.global
-include $(VDRDIR)/Make.config
APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
ARCHIVE = $(PLUGIN)-$(VERSION)
PACKAGE = vdr-$(ARCHIVE)
INCLUDES += -I$(VDRDIR)/include
DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
UNCRUSTIFY_FILES = scanner.c scanner.h scanfilter.c scanfilter.h statemachine.h statemachine.c
OBJS = $(PLUGIN).o common.o menusetup.o satellites.o scanner.o dvb_wrapper.o
OBJS += scanfilter.o statemachine.o countries.o
all: libvdr-$(PLUGIN).so i18n
%.o: %.c
$(CXX) -std=c++11 $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
MAKEDEP = $(CXX) -MM -MG
DEPFILE = .dependencies
$(DEPFILE): Makefile
@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
-include $(DEPFILE)
PODIR = po
LOCALEDIR = $(VDRDIR)/locale
I18Npo = $(wildcard $(PODIR)/*.po)
I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
I18Npot = $(PODIR)/$(PLUGIN).pot
%.mo: %.po
@msgfmt -c -o $@ $<
$(I18Npot): $(wildcard *.c)
@xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ $^
%.po: $(I18Npot)
@msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
@touch $@
$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
@mkdir -p $(dir $@)
@cp $< $@
.PHONY: i18n
i18n: $(I18Nmsgs) $(I18Npot)
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
perm:
@chmod 644 *.{c,h,html} COPYING HISTORY README TODO Makefile
@chmod 755 po/
dist: $(I18Npo) clean perm
@-rm -rf $(TMPDIR)/$(ARCHIVE)
@mkdir $(TMPDIR)/$(ARCHIVE)
@cp -a * $(TMPDIR)/$(ARCHIVE)
@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
@-rm -rf $(TMPDIR)/$(ARCHIVE)
@echo Distribution package created as $(PACKAGE).tgz

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

@ -3,7 +3,7 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-xmltv2vdr"
PKG_VERSION="ec7bd92"
PKG_VERSION="ec7bd920d94e55f2d21bfa076b7e900b7b2b7537"
PKG_SHA256="eacc91062095563d8adc93873b373ddb34b076a8c0a9e5a86f6220d1d5d892e9"
PKG_LICENSE="GPL"
PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr"

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

@ -1,9 +1,12 @@
109
- Fix script.config.vdr scan:
- fix script.config.vdr scan:
. reststfulapi: use header from current wirbelscan
. wirbelscan: fix segv, interface channel counts and device detection
- update VNSI to 1.8.0
- update EEPG plugin to c46be44
- update Sat>IP plugin to a4051bf
- update VNSI plugin to 1.8.0
- update VDR 2.4.0 upstream patches
- update Wirbelscan plugin to 2018.11.04
108
- update VDR to 2.4.0