From 432af6547f0b2fff5acae4bc6eebecc444084734 Mon Sep 17 00:00:00 2001 From: Alasdair Campbell Date: Tue, 11 Mar 2014 16:14:51 +0000 Subject: [PATCH] add vdr-plugin-eepg closes #3002 --- .../multimedia/vdr-plugin-eepg/package.mk | 51 +++++++++++++++++++ .../patches/vdr-plugin-eepg-01_makefile.patch | 43 ++++++++++++++++ .../service/multimedia/vdr-addon/package.mk | 5 +- .../multimedia/vdr-addon/source/bin/vdr.start | 3 ++ .../resources/language/English/strings.xml | 1 + .../vdr-addon/source/resources/settings.xml | 1 + .../vdr-addon/source/settings-default.xml | 1 + tools/mkpkg/mkpkg_vdr-plugin-eepg | 43 ++++++++++++++++ 8 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 packages/3rdparty/multimedia/vdr-plugin-eepg/package.mk create mode 100644 packages/3rdparty/multimedia/vdr-plugin-eepg/patches/vdr-plugin-eepg-01_makefile.patch create mode 100755 tools/mkpkg/mkpkg_vdr-plugin-eepg diff --git a/packages/3rdparty/multimedia/vdr-plugin-eepg/package.mk b/packages/3rdparty/multimedia/vdr-plugin-eepg/package.mk new file mode 100644 index 0000000000..13888f90e0 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-plugin-eepg/package.mk @@ -0,0 +1,51 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) +# +# OpenELEC is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# OpenELEC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC. If not, see . +################################################################################ + +PKG_NAME="vdr-plugin-eepg" +PKG_VERSION="69b47ba" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://projects.vdr-developer.org/projects/plg-eepg" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS_TARGET="toolchain vdr" +PKG_PRIORITY="optional" +PKG_SECTION="multimedia" +PKG_SHORTDESC="vdr-plugin-eepg" +PKG_LONGDESC="This plugin parses the Extended (2 to 10 day) EPG data which is send by providers on their portal channels. This EEPG data is transmitted in a non-standard format on a non-standard PID." + +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" + +pre_configure_target() { + export CFLAGS="$CFLAGS -fPIC" + export CXXFLAGS="$CXXFLAGS -fPIC" + export LDFLAGS="$LDFLAGS -fPIC" +} + +make_target() { + VDR_DIR=$(get_build_dir vdr) + make VDRDIR=$VDR_DIR \ + LIBDIR="." \ + LOCALEDIR="./locale" +} + +makeinstall_target() { + : # installation not needed, done by create-addon script +} diff --git a/packages/3rdparty/multimedia/vdr-plugin-eepg/patches/vdr-plugin-eepg-01_makefile.patch b/packages/3rdparty/multimedia/vdr-plugin-eepg/patches/vdr-plugin-eepg-01_makefile.patch new file mode 100644 index 0000000000..eab19bcf4d --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-plugin-eepg/patches/vdr-plugin-eepg-01_makefile.patch @@ -0,0 +1,43 @@ +--- vdr-plugin-eepg-master/Makefile 2014-03-11 15:44:36.675368020 +0000 ++++ vdr-plugin-eepg-master/Makefile 2014-03-11 15:51:02.065495474 +0000 +@@ -31,21 +31,16 @@ + ### The directory environment: + + # Use package data if installed...otherwise assume we're under the VDR source directory: +-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr)) +-LIBDIR = $(call PKGCFG,libdir) +-LOCDIR = $(call PKGCFG,locdir) +-PLGCFG = $(call PKGCFG,plgcfg) + # + TMPDIR ?= /tmp + + ### The compiler options: + +-export CFLAGS = $(call PKGCFG,cflags) +-export CXXFLAGS = $(call PKGCFG,cxxflags) ++include $(VDRDIR)/Make.global + + ### The version number of VDR's plugin API: + +-APIVERSION = $(call PKGCFG,apiversion) ++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) + + ### Allow user defined options to overwrite defaults: + +@@ -65,7 +60,7 @@ + + INCLUDES += -I$(VDRDIR)/include + +-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' ++DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"' -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE + + ### The object files (add further files here): + +@@ -119,6 +114,7 @@ + + $(SOFILE): $(OBJS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ ++ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) + + install-lib: $(SOFILE) + install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) diff --git a/packages/addons/service/multimedia/vdr-addon/package.mk b/packages/addons/service/multimedia/vdr-addon/package.mk index 0c8ba6220d..0053b9661c 100644 --- a/packages/addons/service/multimedia/vdr-addon/package.mk +++ b/packages/addons/service/multimedia/vdr-addon/package.mk @@ -24,7 +24,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr" +PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg" PKG_PRIORITY="optional" PKG_SECTION="service.multimedia" PKG_SHORTDESC="vdr: A powerful DVB TV application" @@ -76,6 +76,7 @@ addon() { cp -PR $(get_build_dir vdr-wirbelscan)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $(get_build_dir vdr-wirbelscancontrol)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $(get_build_dir vdr-plugin-dvbapi)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin + cp -PR $(get_build_dir vdr-plugin-eepg)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $VDR_SC_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $VDR_SC_DIR/systems/*/libsc*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $VDR_PLUGIN_STREAMVEV_DIR/server/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin @@ -85,6 +86,8 @@ addon() { cp -PR $(get_build_dir vdr-epgsearch)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $VDR_PLUGIN_XMLTV2VDR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/eepg + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr cp -PR $VDR_PLUGIN_XVDR_DIR/xvdr/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr cp -PR $VDR_PLUGIN_XVDR_DIR/xvdr/xvdr.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start index 108d54d601..088472534d 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -96,6 +96,9 @@ fi if [ "$ENABLE_CONTROL" == "true" ] ; then VDR_ARG="$VDR_ARG -P 'control -p $CONTROL_PORT'" fi +if [ "$ENABLE_EEPG" == "true" ] ; then + VDR_ARG="$VDR_ARG -P eepg" +fi if [ "$ENABLE_EPGSEARCH" == "true" ] ; then VDR_ARG="$VDR_ARG -P epgsearch" fi diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml index 9b86038424..8e22b4f71b 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml @@ -20,6 +20,7 @@ control: listen on port Enable plugin: epgsearch Enable plugin: xmltv2vdr + Enable plugin: extended EPG VDR Configuration VDR Video Dir PVR plugin diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml index 824a6d11f9..73c6f5b9ba 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -27,6 +27,7 @@ + diff --git a/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml b/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml index a1573a5950..ba70d43b8c 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml @@ -13,6 +13,7 @@ + diff --git a/tools/mkpkg/mkpkg_vdr-plugin-eepg b/tools/mkpkg/mkpkg_vdr-plugin-eepg new file mode 100755 index 0000000000..e3a0447cf5 --- /dev/null +++ b/tools/mkpkg/mkpkg_vdr-plugin-eepg @@ -0,0 +1,43 @@ +#!/bin/sh +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +echo "getting sources..." + if [ ! -d vdr-plugin-eepg.git ]; then + git clone git://projects.vdr-developer.org/vdr-plugin-eepg.git vdr-plugin-eepg.git + fi + + cd vdr-plugin-eepg.git + git pull + GIT_REV=`git log -n1 --format=%h` + cd .. + +echo "copying sources..." + rm -rf vdr-plugin-eepg-$GIT_REV + cp -R vdr-plugin-eepg.git vdr-plugin-eepg-$GIT_REV + +echo "cleaning sources..." + rm -rf vdr-plugin-eepg-$GIT_REV/.git + +echo "packing sources..." + tar cvJf vdr-plugin-eepg-$GIT_REV.tar.xz vdr-plugin-eepg-$GIT_REV + +echo "remove temporary sourcedir..." + rm -rf vdr-plugin-eepg-$GIT_REV