mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-05 17:07:49 +00:00
vdr-addon, vdr, vdr-plugins: support locale
This commit is contained in:
parent
164b0f6729
commit
94c0ea4ee2
@ -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:
|
||||||
|
|
@ -26,7 +26,8 @@ make_target() {
|
|||||||
|
|
||||||
make VDRDIR=${VDR_DIR} \
|
make VDRDIR=${VDR_DIR} \
|
||||||
LIBDIR="." \
|
LIBDIR="." \
|
||||||
LOCALEDIR="./locale"
|
LOCALEDIR="./locale" \
|
||||||
|
all install-i18n
|
||||||
|
|
||||||
cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
|
cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION}
|
||||||
}
|
}
|
||||||
|
@ -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:
|
|
@ -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
|
@ -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:
|
|
||||||
|
|
||||||
|
|
@ -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:
|
|
||||||
|
|
||||||
|
|
@ -27,7 +27,7 @@ pre_make_target() {
|
|||||||
PREFIX = /usr
|
PREFIX = /usr
|
||||||
VIDEODIR = /storage/videos
|
VIDEODIR = /storage/videos
|
||||||
CONFDIR = /storage/.config/vdr
|
CONFDIR = /storage/.config/vdr
|
||||||
LOCDIR = /usr/share/locale
|
LOCDIR = ./locale
|
||||||
LIBS += -liconv
|
LIBS += -liconv
|
||||||
NO_KBD=yes
|
NO_KBD=yes
|
||||||
VDR_USER=root
|
VDR_USER=root
|
||||||
@ -36,5 +36,6 @@ EOF
|
|||||||
|
|
||||||
make_target() {
|
make_target() {
|
||||||
make vdr vdr.pc
|
make vdr vdr.pc
|
||||||
|
make LOCDIR=./dummylocale install-i18n
|
||||||
make include-dir
|
make include-dir
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ PKG_ADDON_REQUIRES="pvr.vdr.vnsi:0.0.0 script.config.vdr:0.0.0"
|
|||||||
|
|
||||||
addon() {
|
addon() {
|
||||||
# create dirs
|
# 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/epgsources
|
||||||
mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config/plugins/{eepg,epgfixer,epgsearch,streamdev-server,vnsiserver}
|
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}
|
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
|
cp -PR $(get_build_dir vdr-plugin-${pkg})/libvdr*.so.* ${ADDON_BUILD}/${PKG_ADDON_ID}/plugin
|
||||||
done
|
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.* \
|
cp -P $(get_build_dir vdr-plugin-streamdev)/client/libvdr*.so.* \
|
||||||
$(get_build_dir vdr-plugin-streamdev)/server/libvdr*.so.* \
|
$(get_build_dir vdr-plugin-streamdev)/server/libvdr*.so.* \
|
||||||
${ADDON_BUILD}/${PKG_ADDON_ID}/plugin
|
${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 -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 -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
|
cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
|
||||||
}
|
}
|
||||||
|
@ -55,6 +55,7 @@ VDR_ARG="$VDR_ARG --resdir=$ADDON_DIR/res"
|
|||||||
VDR_ARG="$VDR_ARG --cachedir=$ADDON_CACHE_DIR"
|
VDR_ARG="$VDR_ARG --cachedir=$ADDON_CACHE_DIR"
|
||||||
VDR_ARG="$VDR_ARG --lib=$ADDON_PLUGIN_DIR"
|
VDR_ARG="$VDR_ARG --lib=$ADDON_PLUGIN_DIR"
|
||||||
VDR_ARG="$VDR_ARG --video=\"$VDR_VIDEO_DIR\""
|
VDR_ARG="$VDR_ARG --video=\"$VDR_VIDEO_DIR\""
|
||||||
|
VDR_ARG="$VDR_ARG --localedir=$ADDON_DIR/locale"
|
||||||
|
|
||||||
if [ "$ENABLE_EXTERNAL_RECCMD" == "true" ] ; then
|
if [ "$ENABLE_EXTERNAL_RECCMD" == "true" ] ; then
|
||||||
if [ ! -z "$EXTERNAL_RECCMD_PATH" -a -x "$EXTERNAL_RECCMD_PATH" ] ; then
|
if [ ! -z "$EXTERNAL_RECCMD_PATH" -a -x "$EXTERNAL_RECCMD_PATH" ] ; then
|
||||||
@ -181,4 +182,6 @@ if [ "$ENABLE_VDR_DEBUG" == "true" ] ; then
|
|||||||
sleep 1
|
sleep 1
|
||||||
fi
|
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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user