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

Merge pull request #5463 from mglae/le10_vdr-116

Browse Source 
vdr-addon: REV 116, update vdr (2.4.7) and plugins / fix $PKG_NAME-config scripts
This commit is contained in:
CvH 2021-07-10 11:02:02 +02:00 committed by GitHub
commit ded9079630
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 110 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,9 @@ post_makeinstall_host() {
}
post_makeinstall_target() {
sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/cxxtools-config
cp ${PKG_NAME}-config ${TOOLCHAIN}/bin
sed -e "s:\(['= ]\)/usr:\\1${PKG_ORIG_SYSROOT_PREFIX}/usr:g" -i ${TOOLCHAIN}/bin/${PKG_NAME}-config
chmod +x ${TOOLCHAIN}/bin/${PKG_NAME}-config
rm -rf ${INSTALL}/usr/bin
}

6
packages/addons/addon-depends/tntnet/package.mk
View File

@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="tntnet"
PKG_VERSION="2.2.1"
@ -29,7 +30,10 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-unittest \
--with-stressjob=no"
post_makeinstall_target() {
sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/tntnet-config
rm -rf ${INSTALL}/usr/bin/${PKG_NAME}-config
cp ${PKG_NAME}-config ${TOOLCHAIN}/bin
sed -e "s:\(['= ]\)/usr:\\1${PKG_ORIG_SYSROOT_PREFIX}/usr:g" -i ${TOOLCHAIN}/bin/${PKG_NAME}-config
chmod +x ${TOOLCHAIN}/bin/${PKG_NAME}-config
rm -rf ${INSTALL}/usr/bin
rm -rf ${INSTALL}/usr/share

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="c46be443988489780f993a47d23a42936b49d6c0"
PKG_SHA256="08b343caa392bddefeb6e8cfe6f341b4e11e120046dce05961a335a06e9bee6c"
PKG_VERSION="6be7f2ee644aa33bd6e6e038548be8a85514272e"
PKG_SHA256="f8698d8e72c4e1239a57ba4a0b2f54020270506d5dce7298f3080fcc8d59f56f"
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"

13
packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/patches/vdr-plugin-epgfixer-01-pkgconfig.patch
View File

@ -1,13 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -70,8 +70,8 @@
OBJS = $(PLUGIN).o blacklist.o charset.o config.o epgclone.o epghandler.o regexp.o setup_menu.o tools.o
ifeq ($(REGEXLIB), pcre)
-LIBS += $(shell pcre-config --libs-posix)
-INCLUDES += $(shell pcre-config --cflags)
+LIBS += $(shell pkg-config --libs libpcreposix libpcre)
+INCLUDES += $(shell pkg-config --cflags libpcre)
DEFINES += -DHAVE_PCREPOSIX
endif

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

@ -3,12 +3,12 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-epgsearch"
PKG_VERSION="770de32f1908b1f9c60f66bf288a4c8a03f97d52"
PKG_SHA256="8b6144ee3d22b0c13ba81be94920b421b05fd9b921dfe8245ed582db407acac8"
PKG_VERSION="cff8dfe58853aa0cc4f6e9a8896104a920b98730"
PKG_SHA256="ad6521003ab41b76ba22cac3b086901700ed2b46ea3d48f71d28b0545cf17e94"
PKG_LICENSE="GPL"
PKG_SITE="http://winni.vdr-developer.org/epgsearch/"
PKG_URL="https://github.com/vdr-projects/vdr-plugin-epgsearch/archive/${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain vdr"
PKG_DEPENDS_TARGET="toolchain vdr pcre"
PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
PKG_LONGDESC="EPGSearch is a plugin for the Video-Disc-Recorder (VDR)."
PKG_TOOLCHAIN="manual"

14
packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/patches/vdr-plugin-epgsearch-01-pkgconfig.patch
View File

@ -1,14 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -130,9 +130,8 @@
OBJS = afuzzy.o blacklist.o changrp.o confdloader.o conflictcheck.o conflictcheck_thread.o distance.o $(PLUGIN).o epgsearchcats.o epgsearchcfg.o epgsearchext.o epgsearchsetup.o epgsearchsvdrp.o epgsearchtools.o mail.o md5.o menu_announcelist.o menu_blacklistedit.o menu_blacklists.o menu_commands.o menu_conflictcheck.o menu_deftimercheckmethod.o menu_dirselect.o menu_event.o menu_favorites.o menu_main.o menu_myedittimer.o menu_quicksearch.o menu_recsdone.o menu_search.o menu_searchactions.o menu_searchedit.o menu_searchresults.o menu_searchtemplate.o menu_switchtimers.o menu_templateedit.o menu_timersdone.o menu_whatson.o noannounce.o pending_notifications.o rcfile.o recdone.o recstatus.o searchtimer_thread.o services.o switchtimer.o switchtimer_thread.o templatefile.o timer_thread.o timerdone.o timerstatus.o uservars.o varparser.o
ifeq ($(REGEXLIB), pcre)
-LIBS += $(shell pcre-config --libs-posix)
-#LIBS += -L/usr/lib -lpcreposix -lpcre
-INCLUDE += $(shell pcre-config --cflags)
+LIBS += $(shell pkg-config --libs libpcreposix libpcre)
+INCLUDES += $(shell pkg-config --cflags libpcre)
DEFINES += -DHAVE_PCREPOSIX
else ifeq ($(REGEXLIB), tre)
LIBS += -L$(shell pkg-config --variable=libdir tre) $(shell pkg-config --libs tre)

11
packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/patches/vdr-plugin-iptv-pkgconfig.patch
View File

@ -1,11 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@
### Libraries
-LIBS = $(shell curl-config --libs)
+LIBS = $(shell pkg-config --libs libcurl)
### Includes and Defines (add further entries here):

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

@ -3,11 +3,11 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr-plugin-live"
PKG_VERSION="e582514ede475574842b44ca6792335ff141172d"
PKG_SHA256="74deb2ca43ffb5779b3f9ff6f34c8b53898a226fcf92605d7ede0401cb62601c"
PKG_VERSION="b2938deb061a83454d14aeb149c18a87e38e8b25"
PKG_SHA256="f74844fad4f0c3fd828816fd3f094ff740d82d31a164b0cd6384aff9fb7e33b8"
PKG_LICENSE="GPL"
PKG_SITE="http://live.vdr-developer.org/en/index.php"
PKG_URL="https://github.com/vdr-projects/vdr-plugin-live/archive/${PKG_VERSION}.tar.gz"
PKG_URL="https://github.com/MarkusEh/vdr-plugin-live/archive/${PKG_VERSION}.tar.gz"
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."

36
packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-01-makefile.patch
View File

@ -1,36 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ PLUGIN := live
VERSION := $(shell grep '\#define LIVEVERSION ' setup.h | awk '{ print $$3 }' | sed -e 's/[";]//g')
### Check for libpcre c++ wrapper
-HAVE_LIBPCRECPP := $(shell pcre-config --libs-cpp)
+HAVE_LIBPCRECPP := $(shell pkg-config --libs libpcrecpp libpcre)
### The directory environment:
# Use package data if installed...otherwise assume we're under the VDR source directory:
@@ -37,18 +37,18 @@ APIVERSION := $(call PKGCFG,apiversion)
include global.mk
### Determine tntnet and cxxtools versions:
-TNTVERSION = $(shell tntnet-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
-CXXTOOLVER = $(shell cxxtools-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
+TNTVERSION = $(shell pkg-config --modversion tntnet | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
+CXXTOOLVER = $(shell pkg-config --modversion cxxtools | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
-CXXFLAGS += $(shell tntnet-config --cxxflags)
-LIBS += $(shell tntnet-config --libs)
+CXXFLAGS += $(shell pkg-config --cflags tntnet)
+LIBS += $(shell pkg-config --libs tntnet)
### Optional configuration features
PLUGINFEATURES :=
ifneq ($(HAVE_LIBPCRECPP),)
PLUGINFEATURES += -DHAVE_LIBPCRECPP
- CXXFLAGS += $(shell pcre-config --cflags)
- LIBS += $(HAVE_LIBPCRECPP)
+ CXXFLAGS += $(shell pkg-config --cflags libpcreposix libpcre)
+ LIBS += -Wl,-Bstatic $(HAVE_LIBPCRECPP) -Wl,-Bdynamic
endif
# -Wno-deprecated-declarations .. get rid of warning: ‘template<class> class std::auto_ptr’ is deprecated

8
packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-01-pkgconfig.patch → packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-01-static-lib-order.patch
View File

@ -1,11 +1,11 @@
--- a/Makefile
+++ b/Makefile
--- a/Makefile 2016-10-16 11:52:25.000000000 +0200
+++ b/Makefile 2021-06-23 22:49:33.447650255 +0200
@@ -51,7 +51,7 @@ SOFILE = libvdr-$(PLUGIN).so
DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-LIBS += $(shell cxxtools-config --libs) -lcxxtools-http
+LIBS += $(shell pkg-config --libs cxxtools-http cxxtools)
+LIBS += -lcxxtools-http $(shell cxxtools-config --libs)
CONFDIR = $(call PKGCFG,configdir)
PLGCONFDIR = $(CONFDIR)/plugins/$(PLUGIN)

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="e06dd3942a17bf622f625b6e51f24e95cfa3877e"
PKG_SHA256="4f9d5092107d34b2036d56f858a0a744a21f38df8bf6698532c8dcad0157f316"
PKG_VERSION="f521e57e947468b54288f696bdcae8e6485c6167"
PKG_SHA256="3f949fca133bdab690f0a5b4bb7d77a52e1b94c94fc8d815c2c203e9f06a6622"
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="a7625c028c460b8350a023db495e2b6b0bc93607"
PKG_SHA256="49955757df436393b1ae3ef1ce05a13ea80d5de87dd1222cad9e71045e3ab26e"
PKG_VERSION="0a216f1cf9d6401b1afbff420f4fa244ec15d299"
PKG_SHA256="817900c9fa5ade5c52b0391b791f801832c57bdbed5e7501d7e92b4fe29de816"
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"

11
packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/patches/vdr-plugin-satip-01-pkgconfig.patch
View File

@ -1,11 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@
### Libraries
-LIBS = $(shell curl-config --libs)
+LIBS = $(shell pkg-config --libs libcurl)
### Includes and Defines (add further entries here):

8
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="2018.11.04"
PKG_SHA256="62c2848aefdb768c165310f70b3746665f57b96a95ebae96761febbb07e942e3"
PKG_VERSION="2021.03.07"
PKG_SHA256="9267ebd12a3a58e0ae453f6e311782262ae0782b25721cc8d7e5048a76cb3759"
PKG_LICENSE="GPL"
PKG_SITE="http://wirbel.htpc-forum.de/wirbelscan/index2.html"
PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-${PKG_VERSION}.tgz"
PKG_SITE="https://www.gen2vdr.de/wirbel/wirbelscan/index2.html"
PKG_URL="https://www.gen2vdr.de/wirbel/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"

69
packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-01-fixes.patch
View File

@ -1,56 +1,25 @@
Subject: [PATCH 1/2] interface channel count
Subject: [PATCH] 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) {
for(int i = 0; i < cDevice::NumDevices(); i++) {
cDevice* device = cDevice::GetDevice(i);
if (device == NULL) continue;
- std::string t = *device->DeviceType();
- if (t == "DVB-C" ) systems[SCAN_CABLE ] = 1;
- if (t == "DVB-T" ) systems[SCAN_TERRESTRIAL ] = 1;
- if (t == "DSS" ) systems[SCAN_SATELLITE ] = 1;
- if (t == "DVB-S" ) systems[SCAN_SATELLITE ] = 1;
- if (t == "DVB-S2") systems[SCAN_SATELLITE ] = 1;
- if (t == "ATSC" ) systems[SCAN_TERRCABLE_ATSC] = 1;
- if (t == "DVB-T2") systems[SCAN_TERRESTRIAL ] = 1;
- if (t == "TURBO" ) systems[SCAN_SATELLITE ] = 1;
- if (t == "SAT>IP") {
- if (device->ProvidesSource(cSource::FromString("S"))) systems[SCAN_SATELLITE ] = 1;
- if (device->ProvidesSource(cSource::FromString("T"))) systems[SCAN_TERRESTRIAL ] = 1;
- if (device->ProvidesSource(cSource::FromString("C"))) systems[SCAN_CABLE ] = 1;
- }
+ if (device->ProvidesSource(cSource::stSat)) systems[SCAN_SATELLITE] = 1;
+ if (device->ProvidesSource(cSource::stTerr)) systems[SCAN_TERRESTRIAL] = 1;
+ if (device->ProvidesSource(cSource::stCable)) systems[SCAN_CABLE] = 1;
+ if (device->ProvidesSource(cSource::stAtsc)) systems[SCAN_TERRCABLE_ATSC] = 1;
}
if (DVB_Type >= SCAN_NO_DEVICE || ! systems[DVB_Type]) {
#include "menusetup.h"
#include "countries.h"
#include "satellites.h"
+extern TChannels NewChannels;
static const char *WIRBELSCAN_VERSION = "2021.03.07";
static const char *WIRBELSCAN_DESCRIPTION = "DVB channel scan for VDR";
@@ -202,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;
}

66
packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/patches/vdr-plugin-wirbelscan-02-countries_utf8.patch
View File

@ -1,38 +1,38 @@
--- 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 },*/
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},*/
{"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},*/
{"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},*/

6
packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk
View File

@ -6,9 +6,9 @@ PKG_NAME="vdr-plugin-wirbelscancontrol"
PKG_VERSION="0.0.2"
PKG_SHA256="178c5768dd47355a42409a2cb2629f0762da1297865e3a84963684649145cb13"
PKG_LICENSE="GPL"
PKG_SITE="http://wirbel.htpc-forum.de/wirbelscancontrol/index2.html"
PKG_URL="http://wirbel.htpc-forum.de/wirbelscancontrol/${PKG_NAME/-plugin/}-${PKG_VERSION}.tgz"
PKG_DEPENDS_TARGET="toolchain vdr vdr-plugin-wirbelscan"
PKG_SITE="https://www.gen2vdr.de/wirbel/wirbelscancontrol/index2.html"
PKG_URL="https://www.gen2vdr.de/wirbel/wirbelscancontrol/${PKG_NAME/-plugin/}-${PKG_VERSION}.tgz"
PKG_DEPENDS_TARGET="toolchain vdr gettext:host vdr-plugin-wirbelscan"
PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
PKG_LONGDESC="Adds menu entry for wirbelscan at VDR."
PKG_TOOLCHAIN="manual"

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

@ -4,11 +4,12 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vdr"
PKG_VERSION="2.4.6"
PKG_SHA256="c8993babf2a878a0fba84558de1e35f042c3c66f7c1ec569eea00a3af1014e4b"
PKG_VERSION="2.4.7"
PKG_SHA256="8d2b34ea3b1139d1d92826477c4afe8db7c7bf4a0cc67ab34062480aaca443cf"
PKG_LICENSE="GPL"
PKG_SITE="http://www.tvdr.de"
PKG_URL="http://ftp.tvdr.de/vdr-${PKG_VERSION}.tar.bz2"
PKG_URL="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PKG_VERSION};sf=tbz2"
PKG_SOURCE_NAME="${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_DEPENDS_TARGET="toolchain bzip2 fontconfig freetype libcap libiconv libjpeg-turbo"
PKG_LONGDESC="A DVB TV server application."
PKG_TOOLCHAIN="manual"

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

@ -1,3 +1,13 @@
116
- update VDR to 2.4.7
- update eepg to f8698d8
- update epgsearch to cff8dfe
- update iptv to 7369c95
- update live to b2938de
- update robotv to f521e57
- update satip to 0a216f1
- update wirbelscan 2021.03.07
115
- add locale. Install and configure Locale Addon to select language.
- fix VNSI: use header from current wirbelscan

4
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.6"
PKG_REV="115"
PKG_VERSION="2.4.7"
PKG_REV="116"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://libreelec.tv"

3
packages/devel/ncurses/package.mk
View File

@ -69,6 +69,7 @@ PKG_CONFIGURE_OPTS_HOST="--enable-termcap \
post_makeinstall_target() {
cp misc/ncurses-config ${TOOLCHAIN}/bin
chmod +x ${TOOLCHAIN}/bin/ncurses-config
sed -e "s:\(['=\" ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${TOOLCHAIN}/bin/ncurses-config
sed -e "s:\(['=\" ]\)/usr:\\1${PKG_ORIG_SYSROOT_PREFIX}/usr:g" -i ${TOOLCHAIN}/bin/ncurses-config
rm -f ${TOOLCHAIN}/bin/ncurses6-config
rm -rf ${INSTALL}/usr/bin
}

6
packages/devel/pcre/package.mk
View File

@ -9,7 +9,7 @@ PKG_LICENSE="OSS"
PKG_SITE="http://www.pcre.org/"
PKG_URL="https://ftp.pcre.org/pub/pcre/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
PKG_DEPENDS_HOST="toolchain:host"
PKG_DEPENDS_TARGET="toolchain"
PKG_DEPENDS_TARGET="toolchain pcre:host"
PKG_LONGDESC="A set of functions that implement regular expression pattern matching."
PKG_TOOLCHAIN="configure"
PKG_BUILD_FLAGS="+pic"
@ -29,5 +29,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
post_makeinstall_target() {
rm -rf ${INSTALL}/usr/bin
sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/${PKG_NAME}-config
cp ${PKG_NAME}-config ${TOOLCHAIN}/bin
sed -e "s:\(['= ]\)/usr:\\1${PKG_ORIG_SYSROOT_PREFIX}/usr:g" -i ${TOOLCHAIN}/bin/${PKG_NAME}-config
chmod +x ${TOOLCHAIN}/bin/${PKG_NAME}-config
}

6
packages/web/curl/package.mk
View File

@ -73,7 +73,9 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_lib_rtmp_RTMP_Init=yes \
post_makeinstall_target() {
rm -rf ${INSTALL}/usr/share/zsh
rm -rf ${INSTALL}/usr/bin/curl-config
sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/curl-config
rm -rf ${INSTALL}/usr/bin/${PKG_NAME}-config
cp ${PKG_NAME}-config ${TOOLCHAIN}/bin
sed -e "s:\(['= ]\)/usr:\\1${PKG_ORIG_SYSROOT_PREFIX}/usr:g" -i ${TOOLCHAIN}/bin/${PKG_NAME}-config
chmod +x ${TOOLCHAIN}/bin/${PKG_NAME}-config
}

2
scripts/build
View File

@ -384,7 +384,7 @@ pkg_call_exists_opt post_make_${TARGET} && pkg_call
# Hack around directly writing/modifying the content of a shared sysroot
# by temporarily installing new files to a package specific sysroot
PKG_ORIG_SYSROOT_PREFIX="${SYSROOT_PREFIX}"
export PKG_ORIG_SYSROOT_PREFIX="${SYSROOT_PREFIX}"
export SYSROOT_PREFIX="${BUILD}/.sysroot/${PKG_NAME}.${TARGET}"
rm -rf "${SYSROOT_PREFIX}"