Merge pull request #8324 from mglae/le12_vdr_so_locale_fix

vdr-addon: update addon to (4)
This commit is contained in:
Rudi Heitbaum 2023-11-14 12:48:00 +11:00 committed by GitHub
commit d7616c51c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 8 deletions

View File

@ -34,7 +34,7 @@ LDFLAGS += $(shell pkg-config --libs $(LIBREPFUNC))
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
OBJS += scanfilter.o statemachine.o countries.o
OBJS += scanfilter.o statemachine.o countries.o si_ext.o
all: libvdr-$(PLUGIN).so i18n

View File

@ -25,5 +25,6 @@ make_target() {
make VDRDIR=${VDR_DIR} \
INCLUDES="-I." \
LIBDIR="." \
LOCALEDIR="./locale"
LOCALEDIR="./locale" \
install
}

View File

@ -23,7 +23,8 @@ make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=${VDR_DIR} \
LIBDIR="." \
LOCALEDIR="./locale"
LOCALEDIR="./locale" \
install
}
post_make_target() {

View File

@ -5,7 +5,7 @@
PKG_NAME="vdr-addon"
PKG_VERSION="2.6.4"
PKG_REV="3"
PKG_REV="4"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://libreelec.tv"
@ -49,12 +49,14 @@ addon() {
cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv.dist ${ADDON_BUILD}/${PKG_ADDON_ID}/config/epgsources/epgdata2xmltv
# copy binaries
for pkg in ddci2 dummydevice dvbapi eepg epgfixer epgsearch iptv live restfulapi robotv satip vnsiserver wirbelscan wirbelscancontrol xmltv2vdr; do
cp -PR $(get_build_dir vdr-plugin-${pkg})/libvdr*.so* ${ADDON_BUILD}/${PKG_ADDON_ID}/plugin
for pkg in ddci2 dummydevice dvbapi eepg epgfixer epgsearch iptv live restfulapi robotv satip \
vnsiserver wirbelscan wirbelscancontrol xmltv2vdr; do
cp -PR $(get_build_dir vdr-plugin-${pkg})/libvdr*.so.* ${ADDON_BUILD}/${PKG_ADDON_ID}/plugin
done
# copy locale (omit ddci, dummydevice, robotv, wirbelscancontrol, xmltv2vdr)
for pkg in dvbapi eepg epgfixer epgsearch iptv live restfulapi satip vnsiserver wirbelscan; do
# 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