mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
vdr-plugin-wirbelscan: update to 2021.10.09
last version before migrating to librepfunc
This commit is contained in:
Rudi Heitbaum
parent
e1eeee31c4
commit
5a4db493ff
@ -3,8 +3,8 @@
|
|||||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="vdr-plugin-wirbelscan"
|
PKG_NAME="vdr-plugin-wirbelscan"
|
||||||
PKG_VERSION="2021.07.14"
|
PKG_VERSION="2021.10.09"
|
||||||
PKG_SHA256="cd1ce8c8b2b57ce4043fcfcfc0775a18353444ff8a2010810b6d97c1cb47ab1d"
|
PKG_SHA256="e6f7e38402e0853b0460d723fdc745c110417bfab3c94c9883f49126eca680a8"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="https://www.gen2vdr.de/wirbel/wirbelscan/index2.html"
|
PKG_SITE="https://www.gen2vdr.de/wirbel/wirbelscan/index2.html"
|
||||||
PKG_URL="https://www.gen2vdr.de/wirbel/wirbelscan/vdr-wirbelscan-${PKG_VERSION}.tgz"
|
PKG_URL="https://www.gen2vdr.de/wirbel/wirbelscan/vdr-wirbelscan-${PKG_VERSION}.tgz"
|
||||||
|
|||||||
@ -1,16 +1,16 @@
|
|||||||
Subject: [PATCH] interface channel count
|
Subject: [PATCH] interface channel count
|
||||||
|
|
||||||
diff --git a/wirbelscan.c b/wirbelscan.c
|
diff --git a/wirbelscan.cpp b/wirbelscan.cpp
|
||||||
index 602e659..aafbec3 100644
|
index 602e659..aafbec3 100644
|
||||||
--- a/wirbelscan.c
|
--- a/wirbelscan.cpp
|
||||||
+++ b/wirbelscan.c
|
+++ b/wirbelscan.cpp
|
||||||
@@ -12,6 +12,7 @@
|
@@ -12,6 +12,7 @@
|
||||||
#include "menusetup.h"
|
extern int channelcount; // menusetup.c
|
||||||
#include "countries.h"
|
extern int nextTransponders; // scanfilter.c
|
||||||
#include "satellites.h"
|
extern cScanner* Scanner;
|
||||||
+extern TChannels NewChannels;
|
+extern TChannels NewChannels;
|
||||||
|
|
||||||
static const char *WIRBELSCAN_VERSION = "2021.03.07";
|
static const char *WIRBELSCAN_VERSION = "2023.10.15"; /* YYYY.MM.DD */
|
||||||
static const char *WIRBELSCAN_DESCRIPTION = "DVB channel scan for VDR";
|
static const char *WIRBELSCAN_DESCRIPTION = "DVB channel scan for VDR";
|
||||||
@@ -202,8 +203,8 @@ bool cPluginWirbelscan::Service(const ch
|
@@ -202,8 +203,8 @@ bool cPluginWirbelscan::Service(const ch
|
||||||
strcpy(s->transponder, lTransponder.length()? lTransponder.c_str():"none");
|
strcpy(s->transponder, lTransponder.length()? lTransponder.c_str():"none");
|
||||||
|
|||||||
@ -1,38 +0,0 @@
|
|||||||
--- a/countries.c 2016-07-31 10:25:01.000000000 +0200
|
|
||||||
+++ b/countries.c 2021-01-21 18:02:54.336375432 +0100
|
|
||||||
@@ -557,7 +557,7 @@ int atsc_is_qam(int atsc) {
|
|
||||||
struct cCountry country_list[] = {
|
|
||||||
/*- ISO 3166-1 - unique id - long country name alpha-3 numeric */
|
|
||||||
{"AF", AF, "AFGHANISTAN"}, /*AFG, 4 },*/
|
|
||||||
- {"AX", AX, "ÅLAND ISLANDS"}, /*ALA, 248},*/
|
|
||||||
+ {"AX", AX, "Ã…LAND ISLANDS"}, /*ALA, 248},*/
|
|
||||||
{"AL", AL, "ALBANIA"}, /*ALB, 8 },*/
|
|
||||||
{"DZ", DZ, "ALGERIA"}, /*DZA, 12 },*/
|
|
||||||
{"AS", AS, "AMERICAN SAMOA"}, /*ASM, 16 },*/
|
|
||||||
@@ -610,10 +610,10 @@ struct cCountry country_list[] = {
|
|
||||||
{"CD", CD, "CONGO, THE DEMOCRATIC REPUBLIC OF THE"}, /*COD, 180},*/
|
|
||||||
{"CK", CK, "COOK ISLANDS"}, /*COK, 184},*/
|
|
||||||
{"CR", CR, "COSTA RICA"}, /*CRI, 188},*/
|
|
||||||
- {"CI", CI, "CÔTE D'IVOIRE"}, /*CIV, 384},*/
|
|
||||||
+ {"CI", CI, "CÔTE D'IVOIRE"}, /*CIV, 384},*/
|
|
||||||
{"HR", HR, "CROATIA"}, /*HRV, 191},*/
|
|
||||||
{"CU", CU, "CUBA"}, /*CUB, 192},*/
|
|
||||||
- {"CW", CW, "CURAÇAO"}, /*CUW, 531},*/
|
|
||||||
+ {"CW", CW, "CURAÇAO"}, /*CUW, 531},*/
|
|
||||||
{"CY", CY, "CYPRUS"}, /*CYP, 196},*/
|
|
||||||
{"CZ", CZ, "CZECH REPUBLIC"}, /*CZE, 203},*/
|
|
||||||
{"DK", DK, "DENMARK"}, /*DNK, 208},*/
|
|
||||||
@@ -736,11 +736,11 @@ struct cCountry country_list[] = {
|
|
||||||
{"PT", PT, "PORTUGAL"}, /*PRT, 620},*/
|
|
||||||
{"PR", PR, "PUERTO RICO"}, /*PRI, 630},*/
|
|
||||||
{"QA", QA, "QATA"}, /*QAT, 634},*/
|
|
||||||
- {"RE", RE, "RÉUNION"}, /*REU, 638},*/
|
|
||||||
+ {"RE", RE, "RÉUNION"}, /*REU, 638},*/
|
|
||||||
{"RO", RO, "ROMANIA"}, /*ROU, 642},*/
|
|
||||||
{"RU", RU, "RUSSIAN FEDERATION"}, /*RUS, 643},*/
|
|
||||||
{"RW", RW, "RWANDA"}, /*RWA, 646},*/
|
|
||||||
- {"BL", BL, "SAINT BARTHÉLEMY"}, /*BLM, 652},*/
|
|
||||||
+ {"BL", BL, "SAINT BARTHÉLEMY"}, /*BLM, 652},*/
|
|
||||||
{"SH", SH, "SAINT HELENA"}, /*SHN, 654},*/
|
|
||||||
{"KN", KN, "SAINT KITTS AND NEVIS"}, /*KNA, 659},*/
|
|
||||||
{"LC", LC, "SAINT LUCIA"}, /*LCA, 662},*/
|
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
--- 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 {
|
||||||
|
|
||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
PLUGIN = wirbelscan
|
PLUGIN = wirbelscan
|
||||||
|
|
||||||
VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
|
VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).cpp | awk '{ print $$6 }' | sed -e 's/[";]//g')
|
||||||
|
|
||||||
CXX ?= g++
|
CXX ?= g++
|
||||||
CXXFLAGS ?= -g -O3 -Wall -Wextra -Werror=overloaded-virtual -Wformat=2 -Wswitch-default -fstack-protector-all -D_FORTIFY_SOURCE=2
|
CXXFLAGS ?= -g -O3 -Wall -Wextra -Werror=overloaded-virtual -Wformat=2 -Wswitch-default -fstack-protector-all -D_FORTIFY_SOURCE=2
|
||||||
@ -25,14 +25,14 @@ INCLUDES += -I$(VDRDIR)/include
|
|||||||
|
|
||||||
DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
|
DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
|
||||||
|
|
||||||
UNCRUSTIFY_FILES = scanner.c scanner.h scanfilter.c scanfilter.h statemachine.h statemachine.c
|
UNCRUSTIFY_FILES = scanner.cpp scanner.h scanfilter.cpp scanfilter.h statemachine.h statemachine.cpp
|
||||||
|
|
||||||
OBJS = $(PLUGIN).o common.o menusetup.o satellites.o scanner.o dvb_wrapper.o
|
OBJS = $(PLUGIN).o common.o menusetup.o satellites.o scanner.o
|
||||||
OBJS += scanfilter.o statemachine.o countries.o
|
OBJS += scanfilter.o statemachine.o countries.o
|
||||||
|
|
||||||
all: libvdr-$(PLUGIN).so i18n
|
all: libvdr-$(PLUGIN).so i18n
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.cpp
|
||||||
$(CXX) -std=c++11 $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
|
$(CXX) -std=c++11 $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
|
||||||
|
|
||||||
MAKEDEP = $(CXX) -MM -MG
|
MAKEDEP = $(CXX) -MM -MG
|
||||||
@ -51,7 +51,7 @@ I18Npot = $(PODIR)/$(PLUGIN).pot
|
|||||||
%.mo: %.po
|
%.mo: %.po
|
||||||
@msgfmt -c -o $@ $<
|
@msgfmt -c -o $@ $<
|
||||||
|
|
||||||
$(I18Npot): $(wildcard *.c)
|
$(I18Npot): $(wildcard *.cpp)
|
||||||
@xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ $^
|
@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)
|
%.po: $(I18Npot)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user