From 94c0ea4ee2f10c405bc825ad82f1270992801db3 Mon Sep 17 00:00:00 2001 From: mglae Date: Sun, 24 Jan 2021 15:57:32 +0100 Subject: [PATCH] vdr-addon, vdr, vdr-plugins: support locale --- .../vdr-plugin-epgsearch-03-no_docs.patch | 11 +++++++++++ .../vdr-plugins/vdr-plugin-live/package.mk | 3 ++- .../patches/vdr-plugin-live-03-no-i18n.patch | 11 ----------- .../patches/vdr-plugin-streamdev-03_i18n.patch | 17 +++++++++++++++++ ...n-wirbelscancontrol-01-dont-build-i18n.patch | 15 --------------- ...dr-plugin-xmltv2vdr-01_dont-build-i18n.patch | 15 --------------- packages/addons/addon-depends/vdr/package.mk | 3 ++- packages/addons/service/vdr-addon/package.mk | 11 ++++++++++- .../service/vdr-addon/source/bin/vdr.start | 5 ++++- 9 files changed, 46 insertions(+), 45 deletions(-) create mode 100644 packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/patches/vdr-plugin-epgsearch-03-no_docs.patch delete mode 100644 packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-03-no-i18n.patch create mode 100644 packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_i18n.patch delete mode 100644 packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/patches/vdr-plugin-wirbelscancontrol-01-dont-build-i18n.patch delete mode 100644 packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_dont-build-i18n.patch diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/patches/vdr-plugin-epgsearch-03-no_docs.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/patches/vdr-plugin-epgsearch-03-no_docs.patch new file mode 100644 index 0000000000..4b92293c24 --- /dev/null +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/patches/vdr-plugin-epgsearch-03-no_docs.patch @@ -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: + diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk index 1430fed11e..5eebef6400 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk @@ -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} } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-03-no-i18n.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-03-no-i18n.patch deleted file mode 100644 index 3d932b8164..0000000000 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/patches/vdr-plugin-live-03-no-i18n.patch +++ /dev/null @@ -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: diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_i18n.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_i18n.patch new file mode 100644 index 0000000000..5be059a4aa --- /dev/null +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_i18n.patch @@ -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 diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/patches/vdr-plugin-wirbelscancontrol-01-dont-build-i18n.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/patches/vdr-plugin-wirbelscancontrol-01-dont-build-i18n.patch deleted file mode 100644 index e457bbbe7f..0000000000 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/patches/vdr-plugin-wirbelscancontrol-01-dont-build-i18n.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Stefan Saraev -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: - - diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_dont-build-i18n.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_dont-build-i18n.patch deleted file mode 100644 index 643d1f21a6..0000000000 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_dont-build-i18n.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Stefan Saraev -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: - - diff --git a/packages/addons/addon-depends/vdr/package.mk b/packages/addons/addon-depends/vdr/package.mk index 4477b1b8b3..09a5722f27 100644 --- a/packages/addons/addon-depends/vdr/package.mk +++ b/packages/addons/addon-depends/vdr/package.mk @@ -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 } diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk index 789920bfbb..2b2a12db13 100644 --- a/packages/addons/service/vdr-addon/package.mk +++ b/packages/addons/service/vdr-addon/package.mk @@ -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 } diff --git a/packages/addons/service/vdr-addon/source/bin/vdr.start b/packages/addons/service/vdr-addon/source/bin/vdr.start index 7ca107f081..a9d7c5ef1b 100644 --- a/packages/addons/service/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/vdr-addon/source/bin/vdr.start @@ -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