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

Merge pull request #5030 from mglae/le10_vdr_115

Browse Source 
vdr-addon: support locale / wirbelscan and vnsi fixes (115)
This commit is contained in:
CvH 2021-02-07 11:46:35 +01:00 committed by GitHub
commit abe5ce2a35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 96 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/patches/vdr-plugin-epgsearch-03-no_docs.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/Makefile 2021-01-13 00:12:27.752044046 +0100
+++ b/Makefile 2021-01-13 00:24:08.199000066 +0100
@@ -184,7 +184,7 @@ LIBS4 =
### The main target:
-all: $(ALL) i18n docs
+all: $(ALL) i18n
### Implicit rules:

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

@ -26,7 +26,8 @@ make_target() {
make VDRDIR=${VDR_DIR} \
LIBDIR="." \
LOCALEDIR="./locale"
LOCALEDIR="./locale" \
all install-i18n
cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
}

11
packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-03-no-i18n.patch
View File

@ -1,11 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ SUBDIRS := $(WEB_DIR_PAGES) $(WEB_DIR_CSS) $(WEB_DIR_JAVA)
### The main target:
.PHONY: all
-all: lib i18n
+all: lib
@true
### Implicit rules:

17
packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_i18n.patch Normal file
View File

@ -0,0 +1,17 @@
--- a/Makefile 2017-09-30 21:31:48.000000000 +0200
+++ b/Makefile 2021-01-12 23:26:57.857536391 +0100
@@ -71,12 +71,14 @@ all: client server
client:
$(MAKE) -C ./tools
$(MAKE) -C ./client
+ $(MAKE) -C ./client install-i18n
server:
$(MAKE) -C ./tools
$(MAKE) -C ./libdvbmpeg
$(MAKE) -C ./remux
$(MAKE) -C ./server
+ $(MAKE) -C ./server install-i18n
install-client: client
$(MAKE) -C ./client install

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

@ -9,10 +9,15 @@ PKG_LICENSE="GPL"
PKG_SITE="https://github.com/mdre77/vdr-plugin-vnsiserver"
PKG_URL="https://github.com/mdre77/vdr-plugin-vnsiserver/archive/${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain vdr"
PKG_NEED_UNPACK="$(get_pkg_directory vdr)"
PKG_NEED_UNPACK="$(get_pkg_directory vdr) $(get_pkg_directory vdr-plugin-wirbelscan)"
PKG_LONGDESC="VDR plugin to handle Kodi clients."
PKG_TOOLCHAIN="manual"
pre_build_target() {
WIRBELSCAN_DIR=$(get_build_dir vdr-plugin-wirbelscan)
ln -sf ${WIRBELSCAN_DIR}/wirbelscan_services.h $PKG_BUILD
}
make_target() {
VDR_DIR=$(get_build_dir vdr)
export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH}

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

@ -0,0 +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 },*/
@@ -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},*/

15
packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/patches/vdr-plugin-wirbelscancontrol-01-dont-build-i18n.patch
View File

@ -1,15 +0,0 @@
From: Stefan Saraev <stefan@saraev.ca>
Subject: [PATCH] dont build i18n
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ UNCRUSTIFY_FILES = $(PLUGIN).c scanmenu.c scanmenu.h
### The main target:
-all: libvdr-$(PLUGIN).so i18n
+all: libvdr-$(PLUGIN).so
### Implicit rules:

15
packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_dont-build-i18n.patch
View File

@ -1,15 +0,0 @@
From: Stefan Saraev <stefan@saraev.ca>
Subject: [PATCH] dont build i18n
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ OBJS = $(PLUGIN).o soundex.o extpipe.o parse.o source.o import.o event.o setup.o
### The main target:
-all: libvdr-$(PLUGIN).so i18n
+all: libvdr-$(PLUGIN).so
### Implicit rules:

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

@ -27,7 +27,7 @@ pre_make_target() {
PREFIX = /usr
VIDEODIR = /storage/videos
CONFDIR = /storage/.config/vdr
LOCDIR = /usr/share/locale
LOCDIR = ./locale
LIBS += -liconv
NO_KBD=yes
VDR_USER=root
@ -36,5 +36,6 @@ EOF
make_target() {
make vdr vdr.pc
make LOCDIR=./dummylocale install-i18n
make include-dir
}

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

@ -1,3 +1,8 @@
115
- add locale. Install and configure Locale Addon to select language.
- fix VNSI: use header from current wirbelscan
- fix wirbelscan: convert country names to utf8
114
- update VNSI plugin to 47a90dd

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

@ -5,7 +5,7 @@
PKG_NAME="vdr-addon"
PKG_VERSION="2.4.6"
PKG_REV="114"
PKG_REV="115"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://libreelec.tv"
@ -25,7 +25,7 @@ PKG_ADDON_REQUIRES="pvr.vdr.vnsi:0.0.0 script.config.vdr:0.0.0"
addon() {
# create dirs
mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib,plugin}
mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib,plugin,locale}
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}
@ -53,13 +53,22 @@ addon() {
cp -PR $(get_build_dir vdr-plugin-${pkg})/libvdr*.so.* ${ADDON_BUILD}/${PKG_ADDON_ID}/plugin
done
# copy locale (omit ddci, dummydevice, robotv)
for pkg in dvbapi eepg epgfixer epgsearch iptv live restfulapi satip vnsiserver wirbelscan wirbelscancontrol xmltv2vdr; do
cp -PR $(get_build_dir vdr-plugin-${pkg})/locale/* ${ADDON_BUILD}/${PKG_ADDON_ID}/locale
done
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
cp -PR $(get_build_dir vdr-plugin-streamdev)/client/locale/* \
$(get_build_dir vdr-plugin-streamdev)/server/locale/* \
${ADDON_BUILD}/${PKG_ADDON_ID}/locale
cp -PL $(get_install_dir tntnet)/usr/lib/libtntnet.so.12 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
cp -P $(get_build_dir vdr)/vdr ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/vdr.bin
cp -PR $(get_build_dir vdr)/locale/* ${ADDON_BUILD}/${PKG_ADDON_ID}/locale
cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
}

5
packages/addons/service/vdr-addon/source/bin/vdr.start
View File

@ -55,6 +55,7 @@ VDR_ARG="$VDR_ARG --resdir=$ADDON_DIR/res"
VDR_ARG="$VDR_ARG --cachedir=$ADDON_CACHE_DIR"
VDR_ARG="$VDR_ARG --lib=$ADDON_PLUGIN_DIR"
VDR_ARG="$VDR_ARG --video=\"$VDR_VIDEO_DIR\""
VDR_ARG="$VDR_ARG --localedir=$ADDON_DIR/locale"
if [ "$ENABLE_EXTERNAL_RECCMD" == "true" ] ; then
if [ ! -z "$EXTERNAL_RECCMD_PATH" -a -x "$EXTERNAL_RECCMD_PATH" ] ; then
@ -181,4 +182,6 @@ if [ "$ENABLE_VDR_DEBUG" == "true" ] ; then
sleep 1
fi
eval LANG=en_US.UTF-8 exec vdr.bin $VDR_ARG
[ -z "$LANG" ] && export LANG=en_US.UTF-8
eval exec vdr.bin $VDR_ARG