From 919c2453585ac423393fa66a7e586619c1af9869 Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 17 Oct 2013 14:58:51 +0200 Subject: [PATCH 01/14] vdr-plugin-xmltv2vdr: convert to new package format. --- .../multimedia/vdr-plugin-xmltv2vdr/build | 36 ------------------- .../vdr-plugin-xmltv2vdr/{meta => package.mk} | 25 +++++++++++-- 2 files changed, 23 insertions(+), 38 deletions(-) delete mode 100755 packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/build rename packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/{meta => package.mk} (72%) diff --git a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/build b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/build deleted file mode 100755 index c44b374a1f..0000000000 --- a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/build +++ /dev/null @@ -1,36 +0,0 @@ -#!/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 -################################################################################ - -. config/options $1 - -VDR_DIR=`basename $BUILD/vdr-[0-9]*` - -CFLAGS="$CFLAGS -fPIC" -CXXFLAGS="$CXXFLAGS -fPIC" -LDFLAGS="$LDFLAGS -fPIC" - -cd $PKG_BUILD - PWD=`pwd` - make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" - cd dist/epgdata2xmltv - make -j1 - diff --git a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk similarity index 72% rename from packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta rename to packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk index 426cd0893e..e5d779b093 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr" PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-xmltv2vdr.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz" -PKG_DEPENDS="vdr curl libxml2" -PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre" +PKG_DEPENDS_TARGET="vdr curl libxml2" +PKG_BUILD_DEPENDS_TARGET="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="vdr-xmltv2vdr" @@ -35,3 +35,24 @@ PKG_LONGDESC="vdr-xmltv2vdr" PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +VDR_DIR=$(basename $BUILD/vdr-[0-9]*) +PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ + LIBDIR=\".\" \ + LOCALEDIR=\"./locale\"" + +pre_configure_target() { + CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" + LDFLAGS="$LDFLAGS -fPIC" +} + +post_make_target() { + cd dist/epgdata2xmltv + make -j1 + cd - +} + +makeinstall_target() { + : # installation not needed, done by create-addon script +} From e834b9898867a2ad9c5cfa4f3c597cf59a0d5090 Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 17 Oct 2013 15:07:16 +0200 Subject: [PATCH 02/14] vdr: convert to new package format. --- packages/3rdparty/multimedia/vdr/build | 43 ------------------- .../multimedia/vdr/{meta => package.mk} | 30 ++++++++++++- 2 files changed, 28 insertions(+), 45 deletions(-) delete mode 100755 packages/3rdparty/multimedia/vdr/build rename packages/3rdparty/multimedia/vdr/{meta => package.mk} (74%) diff --git a/packages/3rdparty/multimedia/vdr/build b/packages/3rdparty/multimedia/vdr/build deleted file mode 100755 index 752ead02d0..0000000000 --- a/packages/3rdparty/multimedia/vdr/build +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com) -# -# 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 -################################################################################ - -. config/options $1 - -LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` - -cd $PKG_BUILD - -cat > Make.config < Make.config < Date: Thu, 17 Oct 2013 15:29:05 +0200 Subject: [PATCH 03/14] vdr: bump to 2.1.1, rotorng: remove package --- packages/3rdparty/multimedia/rotorng/build | 33 ----- packages/3rdparty/multimedia/rotorng/meta | 37 ----- .../rotorng/patches/rotorng-makefile.patch | 32 ----- packages/3rdparty/multimedia/vdr/package.mk | 4 +- .../multimedia/vdr/patches/vdr-44_rotor.patch | 133 ------------------ .../addons/service/multimedia/vdr-addon/addon | 2 - .../multimedia/vdr-addon/config/settings.xml | 1 - .../addons/service/multimedia/vdr-addon/meta | 2 +- .../multimedia/vdr-addon/source/bin/vdr.start | 3 - .../resources/language/English/strings.xml | 1 - .../vdr-addon/source/resources/settings.xml | 1 - 11 files changed, 3 insertions(+), 246 deletions(-) delete mode 100755 packages/3rdparty/multimedia/rotorng/build delete mode 100644 packages/3rdparty/multimedia/rotorng/meta delete mode 100644 packages/3rdparty/multimedia/rotorng/patches/rotorng-makefile.patch delete mode 100644 packages/3rdparty/multimedia/vdr/patches/vdr-44_rotor.patch diff --git a/packages/3rdparty/multimedia/rotorng/build b/packages/3rdparty/multimedia/rotorng/build deleted file mode 100755 index 3f344636d8..0000000000 --- a/packages/3rdparty/multimedia/rotorng/build +++ /dev/null @@ -1,33 +0,0 @@ -#!/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 -################################################################################ - -. config/options $1 - -VDR_DIR=`basename $BUILD/vdr-[0-9]*` - -CFLAGS="$CFLAGS -fPIC" -CXXFLAGS="$CXXFLAGS -fPIC" -LDFLAGS="$LDFLAGS -fPIC" - -cd $PKG_BUILD - -make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" diff --git a/packages/3rdparty/multimedia/rotorng/meta b/packages/3rdparty/multimedia/rotorng/meta deleted file mode 100644 index 3321fb6451..0000000000 --- a/packages/3rdparty/multimedia/rotorng/meta +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="rotorng" -PKG_VERSION="0.3.1" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://projects.vdr-developer.org/projects/plg-rotor-ng" -PKG_DEPENDS="vdr" -PKG_BUILD_DEPENDS="toolchain vdr" -PKG_PRIORITY="optional" -PKG_URL="http://projects.vdr-developer.org/attachments/download/1088/rotorng-${PKG_VERSION}.tar.gz" -PKG_SECTION="multimedia" -PKG_SHORTDESC="Next generation of a VDR plugin design to drive a diseqc rotor" -PKG_LONGDESC="Next generation of a VDR plugin design to drive a diseqc rotor" - -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/3rdparty/multimedia/rotorng/patches/rotorng-makefile.patch b/packages/3rdparty/multimedia/rotorng/patches/rotorng-makefile.patch deleted file mode 100644 index c420b026af..0000000000 --- a/packages/3rdparty/multimedia/rotorng/patches/rotorng-makefile.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/Makefile b/Makefile -index 9d62d04..5519a07 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,7 +17,6 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri - - ### The C++ compiler and options: - --CXX ?= g++ - CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-parentheses -fpermissive - - ### Make sure that the necessary options are included -@@ -27,7 +26,6 @@ CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-parentheses -fpermissive - ### The directory environment: - - DVBDIR = ../../../../DVB --VDRDIR = ../../.. - LIBDIR = ../../lib - TMPDIR = /tmp - -@@ -37,11 +35,7 @@ TMPDIR = /tmp - - ### The version number of VDR (taken from VDR's "config.h"): - --VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') - APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) --ifeq ($(strip $(APIVERSION)),) -- APIVERSION = $(VDRVERSION) --endif - - ### The name of the distribution archive: - diff --git a/packages/3rdparty/multimedia/vdr/package.mk b/packages/3rdparty/multimedia/vdr/package.mk index 0a2bf2d1e0..9e2003b4e5 100644 --- a/packages/3rdparty/multimedia/vdr/package.mk +++ b/packages/3rdparty/multimedia/vdr/package.mk @@ -20,12 +20,12 @@ ################################################################################ PKG_NAME="vdr" -PKG_VERSION="2.0.3" +PKG_VERSION="2.1.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.tvdr.de" -PKG_URL="ftp://ftp.tvdr.de/vdr/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://ftp.tvdr.de/vdr/Developer/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS_TARGET="fontconfig freetype" PKG_BUILD_DEPENDS_TARGET="toolchain fontconfig freetype libcap libjpeg-turbo bzip2 ncurses" PKG_PRIORITY="optional" diff --git a/packages/3rdparty/multimedia/vdr/patches/vdr-44_rotor.patch b/packages/3rdparty/multimedia/vdr/patches/vdr-44_rotor.patch deleted file mode 100644 index 4e7031dc21..0000000000 --- a/packages/3rdparty/multimedia/vdr/patches/vdr-44_rotor.patch +++ /dev/null @@ -1,133 +0,0 @@ -Description: This patch is needed for the rotor plugin. -Author: Thomas Bergwinkl -Origin: extracted from the rotor plugin 0.1.4-vdr1.5 - -Index: b/device.h -=================================================================== ---- a/device.h -+++ b/device.h -@@ -24,6 +24,8 @@ - #include "spu.h" - #include "thread.h" - #include "tools.h" -+#include -+#include - - #define MAXDEVICES 16 // the maximum number of devices in the system - #define MAXPIDHANDLES 64 // the maximum number of different PIDs per device -@@ -337,6 +339,7 @@ - virtual bool HasProgramme(void) const; - ///< Returns true if the device is currently showing any programme to - ///< the user, either through replaying or live. -+ virtual bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd) {return false;} - - // PID handle facilities - -Index: b/dvbdevice.c -=================================================================== ---- a/dvbdevice.c -+++ b/dvbdevice.c -@@ -283,6 +283,7 @@ - private: - static cMutex bondMutex; - enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked }; -+ bool SendDiseqc; - int frontendType; - const cDvbDevice *device; - int fd_frontend; -@@ -299,6 +300,7 @@ - cMutex mutex; - cCondVar locked; - cCondVar newSet; -+ dvb_diseqc_master_cmd diseqc_cmd; - cDvbTuner *bondedTuner; - bool bondedMaster; - bool SetFrontendType(const cChannel *Channel); -@@ -325,12 +327,16 @@ - bool Locked(int TimeoutMs = 0); - int GetSignalStrength(void) const; - int GetSignalQuality(void) const; -+ bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd); -+private: -+ int GetCurrentDeliverySystem(void); - }; - - cMutex cDvbTuner::bondMutex; - - cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend) - { -+ SendDiseqc = false; - frontendType = SYS_UNDEFINED; - device = Device; - fd_frontend = Fd_Frontend; -@@ -653,6 +659,35 @@ - return -1; - } - -+int cDvbTuner::GetCurrentDeliverySystem() -+{ -+ dtv_property Frontend[1]; -+ memset(&Frontend, 0, sizeof(Frontend)); -+ dtv_properties CmdSeq; -+ memset(&CmdSeq, 0, sizeof(CmdSeq)); -+ CmdSeq.props = Frontend; -+ Frontend[0].cmd = DTV_DELIVERY_SYSTEM; -+ Frontend[0].u.data = 0; -+ if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) < 0) { -+ esyslog("ERROR: frontend %d/%d: %m", adapter, frontend); -+ return SYS_UNDEFINED; -+ } -+ return Frontend[0].u.data; -+} -+ -+bool cDvbTuner::SendDiseqcCmd(dvb_diseqc_master_cmd cmd) -+{ -+ cMutexLock MutexLock(&mutex); -+ int frontendType = GetCurrentDeliverySystem(); -+ if ((frontendType != SYS_DVBS && frontendType != SYS_DVBS2) || SendDiseqc) -+ return false; -+ diseqc_cmd=cmd; -+ SendDiseqc=true; -+ newSet.Broadcast(); -+ return true; -+} -+ -+ - static unsigned int FrequencyToHz(unsigned int f) - { - while (f && f < 1000000) -@@ -874,6 +909,10 @@ - if (GetFrontendStatus(NewStatus)) - Status = NewStatus; - cMutexLock MutexLock(&mutex); -+ if (SendDiseqc) { -+ CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &diseqc_cmd)); -+ SendDiseqc=false; -+ } - int WaitTime = 1000; - switch (tunerStatus) { - case tsIdle: -@@ -1571,6 +1610,11 @@ - return dvbTuner ? dvbTuner->Locked(TimeoutMs) : false; - } - -+bool cDvbDevice::SendDiseqcCmd(dvb_diseqc_master_cmd cmd) -+{ -+ return dvbTuner->SendDiseqcCmd(cmd); -+} -+ - void cDvbDevice::SetTransferModeForDolbyDigital(int Mode) - { - setTransferModeForDolbyDigital = Mode; -Index: b/dvbdevice.h -=================================================================== ---- a/dvbdevice.h -+++ b/dvbdevice.h -@@ -196,6 +196,7 @@ - virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView); - public: - virtual bool HasLock(int TimeoutMs = 0) const; -+ virtual bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd); - - // PID handle facilities - diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon index eb4fbcc89e..e518598b0d 100755 --- a/packages/addons/service/multimedia/vdr-addon/addon +++ b/packages/addons/service/multimedia/vdr-addon/addon @@ -40,7 +40,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live cp -PR $BUILD/vdr-live-*/live/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins - cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/ cp $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv @@ -57,7 +56,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-streamdev-*/server/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-streamdev-*/client/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-live-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $BUILD/rotorng-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-control-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-epgsearch*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-xmltv2vdr*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index 0638f63c8c..bacfd254f4 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -14,7 +14,6 @@ - diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta index 3bb7960356..08b48ac2f3 100644 --- a/packages/addons/service/multimedia/vdr-addon/meta +++ b/packages/addons/service/multimedia/vdr-addon/meta @@ -27,7 +27,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="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 rotorng vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr" +PKG_BUILD_DEPENDS="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_PRIORITY="optional" PKG_SECTION="service.multimedia" PKG_SHORTDESC="vdr: A powerful DVB TV application" 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 f42af44147..d737061b93 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -129,9 +129,6 @@ fi if [ "$ENABLE_LIVE" == "true" ] ; then VDR_ARG="$VDR_ARG -P 'live -i $LIVE_IP -p $LIVE_PORT'" fi -if [ "$ENABLE_ROTORNG" == "true" ] ; then - VDR_ARG="$VDR_ARG -P rotorng" -fi if [ "$ENABLE_CONTROL" == "true" ] ; then VDR_ARG="$VDR_ARG -P 'control -p $CONTROL_PORT'" 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 8a11574686..7c1087978f 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 @@ -17,7 +17,6 @@ Enable plugin: live live: listen on ip live: listen on port - Enable plugin: rotorng Enable plugin: control control: listen on port Enable plugin: epgsearch 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 4102f16afb..f7384ac93c 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -25,7 +25,6 @@ - From c6d69cad706a5673253df2b8a66036d9feaa57b3 Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 17 Oct 2013 15:53:45 +0200 Subject: [PATCH 04/14] vdr-control: convert to new package format. --- .../3rdparty/multimedia/vdr-control/build | 33 ------------------- .../vdr-control/{meta => package.mk} | 19 +++++++++-- 2 files changed, 17 insertions(+), 35 deletions(-) delete mode 100755 packages/3rdparty/multimedia/vdr-control/build rename packages/3rdparty/multimedia/vdr-control/{meta => package.mk} (76%) diff --git a/packages/3rdparty/multimedia/vdr-control/build b/packages/3rdparty/multimedia/vdr-control/build deleted file mode 100755 index 040e514757..0000000000 --- a/packages/3rdparty/multimedia/vdr-control/build +++ /dev/null @@ -1,33 +0,0 @@ -#!/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 -################################################################################ - -. config/options $1 - -CFLAGS="$CFLAGS -fPIC" -CXXFLAGS="$CXXFLAGS -fPIC" -LDFLAGS="$LDFLAGS -fPIC" - -VDR_DIR=`basename $BUILD/vdr-[0-9]*` - -cd $PKG_BUILD - PWD=`pwd` - make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" diff --git a/packages/3rdparty/multimedia/vdr-control/meta b/packages/3rdparty/multimedia/vdr-control/package.mk similarity index 76% rename from packages/3rdparty/multimedia/vdr-control/meta rename to packages/3rdparty/multimedia/vdr-control/package.mk index c145cd4648..da82d3aa22 100644 --- a/packages/3rdparty/multimedia/vdr-control/meta +++ b/packages/3rdparty/multimedia/vdr-control/package.mk @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://ricomp.de/vdr/" PKG_URL="http://ricomp.de/vdr/${PKG_NAME}-${PKG_VERSION}.tgz" -PKG_DEPENDS="vdr" -PKG_BUILD_DEPENDS="toolchain vdr" +PKG_DEPENDS_TARGET="vdr" +PKG_BUILD_DEPENDS_TARGET="toolchain vdr" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="vdr control plugin" @@ -35,3 +35,18 @@ PKG_LONGDESC="vdr control plugin" PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +VDR_DIR=$(basename $BUILD/vdr-[0-9]*) +PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ + LIBDIR=\".\" \ + LOCALEDIR=\"./locale\"" + +pre_configure_target() { + CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" + LDFLAGS="$LDFLAGS -fPIC" +} + +makeinstall_target() { + : # installation not needed, done by create-addon script +} From 9000f1b691d439980e15d594a4603d49d0f62cf2 Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 17 Oct 2013 15:57:38 +0200 Subject: [PATCH 05/14] vdr-epgsearch: convert to new package format. --- .../3rdparty/multimedia/vdr-epgsearch/build | 33 ------------------- .../vdr-epgsearch/{meta => package.mk} | 19 +++++++++-- 2 files changed, 17 insertions(+), 35 deletions(-) delete mode 100755 packages/3rdparty/multimedia/vdr-epgsearch/build rename packages/3rdparty/multimedia/vdr-epgsearch/{meta => package.mk} (70%) diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/build b/packages/3rdparty/multimedia/vdr-epgsearch/build deleted file mode 100755 index 7badf7b984..0000000000 --- a/packages/3rdparty/multimedia/vdr-epgsearch/build +++ /dev/null @@ -1,33 +0,0 @@ -#!/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 -################################################################################ - -. config/options $1 - -VDR_DIR=`basename $BUILD/vdr-[0-9]*` - -CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" -CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" -LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" - -cd $PKG_BUILD - PWD=`pwd` - make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/meta b/packages/3rdparty/multimedia/vdr-epgsearch/package.mk similarity index 70% rename from packages/3rdparty/multimedia/vdr-epgsearch/meta rename to packages/3rdparty/multimedia/vdr-epgsearch/package.mk index 19190b9af7..cdc792256f 100644 --- a/packages/3rdparty/multimedia/vdr-epgsearch/meta +++ b/packages/3rdparty/multimedia/vdr-epgsearch/package.mk @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://winni.vdr-developer.org/epgsearch/" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="vdr" -PKG_BUILD_DEPENDS="toolchain vdr" +PKG_DEPENDS_TARGET="vdr" +PKG_BUILD_DEPENDS_TARGET="toolchain vdr" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="vdr-epgsearch" @@ -35,3 +35,18 @@ PKG_LONGDESC="vdr-epgsearch" PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +VDR_DIR=$(basename $BUILD/vdr-[0-9]*) +PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ + LIBDIR=\".\" \ + LOCALEDIR=\"./locale\"" + +pre_configure_target() { + CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" + CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" + LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" +} + +makeinstall_target() { + : # installation not needed, done by create-addon script +} From 721aa24bc99abcec13537d9a98e443981a2a7596 Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 17 Oct 2013 16:01:35 +0200 Subject: [PATCH 06/14] vdr-iptv: convert to new package format. --- packages/3rdparty/multimedia/vdr-iptv/build | 32 ------------------- .../multimedia/vdr-iptv/{meta => package.mk} | 19 +++++++++-- 2 files changed, 17 insertions(+), 34 deletions(-) delete mode 100755 packages/3rdparty/multimedia/vdr-iptv/build rename packages/3rdparty/multimedia/vdr-iptv/{meta => package.mk} (77%) diff --git a/packages/3rdparty/multimedia/vdr-iptv/build b/packages/3rdparty/multimedia/vdr-iptv/build deleted file mode 100755 index deb8d5474d..0000000000 --- a/packages/3rdparty/multimedia/vdr-iptv/build +++ /dev/null @@ -1,32 +0,0 @@ -#!/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 -################################################################################ - -. config/options $1 - -VDR_DIR=`basename $BUILD/vdr-[0-9]*` - -CFLAGS="$CFLAGS -fPIC" -CXXFLAGS="$CXXFLAGS -fPIC" -LDFLAGS="$LDFLAGS -fPIC" - -cd $PKG_BUILD -make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" diff --git a/packages/3rdparty/multimedia/vdr-iptv/meta b/packages/3rdparty/multimedia/vdr-iptv/package.mk similarity index 77% rename from packages/3rdparty/multimedia/vdr-iptv/meta rename to packages/3rdparty/multimedia/vdr-iptv/package.mk index 9ba25f6bd3..9b162badd0 100644 --- a/packages/3rdparty/multimedia/vdr-iptv/meta +++ b/packages/3rdparty/multimedia/vdr-iptv/package.mk @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/" PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/$PKG_NAME-$PKG_VERSION.tgz" -PKG_DEPENDS="vdr" -PKG_BUILD_DEPENDS="toolchain vdr curl" +PKG_DEPENDS_TARGET="vdr" +PKG_BUILD_DEPENDS_TARGET="toolchain vdr curl" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="vdr-iptv: an IPTV plugin for the Video Disk Recorder (VDR)" @@ -35,3 +35,18 @@ PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)" PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +VDR_DIR=$(basename $BUILD/vdr-[0-9]*) +PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ + LIBDIR=\".\" \ + LOCALEDIR=\"./locale\"" + +pre_configure_target() { + CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" + LDFLAGS="$LDFLAGS -fPIC" +} + +makeinstall_target() { + : # installation not needed, done by create-addon script +} From e8e7fbd240aeb7d1a70dc1fb236f3bdb2a933752 Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 17 Oct 2013 16:06:50 +0200 Subject: [PATCH 07/14] vdr-live: convert to new package format. --- packages/3rdparty/multimedia/vdr-live/build | 36 ------------------- .../multimedia/vdr-live/{meta => package.mk} | 24 +++++++++++-- 2 files changed, 22 insertions(+), 38 deletions(-) delete mode 100755 packages/3rdparty/multimedia/vdr-live/build rename packages/3rdparty/multimedia/vdr-live/{meta => package.mk} (69%) diff --git a/packages/3rdparty/multimedia/vdr-live/build b/packages/3rdparty/multimedia/vdr-live/build deleted file mode 100755 index 9369d73d59..0000000000 --- a/packages/3rdparty/multimedia/vdr-live/build +++ /dev/null @@ -1,36 +0,0 @@ -#!/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 -################################################################################ - -. config/options $1 - -VDR_DIR=`basename $BUILD/vdr-[0-9]*` - -CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" -CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" -LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" - -# dont build parallel - MAKEFLAGS=-j1 - -cd $PKG_BUILD - PWD=`pwd` - make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" diff --git a/packages/3rdparty/multimedia/vdr-live/meta b/packages/3rdparty/multimedia/vdr-live/package.mk similarity index 69% rename from packages/3rdparty/multimedia/vdr-live/meta rename to packages/3rdparty/multimedia/vdr-live/package.mk index 42e21bd1df..7b8c75051f 100644 --- a/packages/3rdparty/multimedia/vdr-live/meta +++ b/packages/3rdparty/multimedia/vdr-live/package.mk @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://live.vdr-developer.org/en/index.php" PKG_URL="http://live.vdr-developer.org/downloads/${PKG_NAME}-${PKG_VERSION}.tar.gz" -PKG_DEPENDS="vdr" -PKG_BUILD_DEPENDS="toolchain vdr tntnet pcre-host pcre" +PKG_DEPENDS_TARGET="vdr" +PKG_BUILD_DEPENDS_TARGET="toolchain vdr tntnet pcre-host pcre" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="vdr-live: the LIVE Interactive VDR Environment/" @@ -35,3 +35,23 @@ PKG_LONGDESC="vdr-live allows a comfortable operation of VDR and some of its plu PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +VDR_DIR=$(basename $BUILD/vdr-[0-9]*) +PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ + LIBDIR=\".\" \ + LOCALEDIR=\"./locale\"" + +pre_configure_target() { + CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" + CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" + LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" +} + +pre_make_target() { + # dont build parallel + MAKEFLAGS=-j1 +} + +makeinstall_target() { + : # installation not needed, done by create-addon script +} From 1b657e5ad1bc2c21908624bec57d9ab047982ee4 Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 17 Oct 2013 16:25:45 +0200 Subject: [PATCH 08/14] vdr-plugin-dvbapi: convert to new package format. --- .../multimedia/vdr-plugin-dvbapi/build | 41 ------------------- .../vdr-plugin-dvbapi/{meta => package.mk} | 27 +++++++++++- 2 files changed, 25 insertions(+), 43 deletions(-) delete mode 100755 packages/3rdparty/multimedia/vdr-plugin-dvbapi/build rename packages/3rdparty/multimedia/vdr-plugin-dvbapi/{meta => package.mk} (66%) diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/build b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/build deleted file mode 100755 index 5ec4a893df..0000000000 --- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/build +++ /dev/null @@ -1,41 +0,0 @@ -#!/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 -################################################################################ - -. config/options $1 - -VDR_DIR=`basename $BUILD/vdr-[0-9]*` - -CFLAGS="$CFLAGS -fPIC" -CXXFLAGS="$CXXFLAGS -fPIC" -LDFLAGS="$LDFLAGS -fPIC" - -# dont build parallel - MAKEFLAGS=-j1 - -cd $PKG_BUILD - make VDRDIR="../$VDR_DIR" \ - VDRSRC="../$VDR_DIR" \ - LIBDIR="." \ - LOCALEDIR="./locale" \ - LIBDVBCSA=1 \ - CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops" - diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk similarity index 66% rename from packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta rename to packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk index b16aa2705a..902168629a 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="vdr openssl" -PKG_BUILD_DEPENDS="toolchain vdr openssl libdvbcsa" +PKG_DEPENDS_TARGET="vdr openssl" +PKG_BUILD_DEPENDS_TARGET="toolchain vdr openssl libdvbcsa" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="TV" @@ -35,3 +35,26 @@ PKG_LONGDESC="TV" PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +VDR_DIR=$(basename $BUILD/vdr-[0-9]*) +PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ + VDRSRC=$ROOT/$BUILD/$VDR_DIR \ + LIBDIR=\".\" \ + LOCALEDIR=\"./locale\" \ + LIBDVBCSA=1" + +pre_configure_target() { + CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" + LDFLAGS="$LDFLAGS -fPIC" + CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops" +} + +pre_make_target() { + # dont build parallel + MAKEFLAGS=-j1 +} + +makeinstall_target() { + : # installation not needed, done by create-addon script +} From 578c18ca400e23ff2b5113c780c7665cdf21be8f Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 17 Oct 2013 16:28:06 +0200 Subject: [PATCH 09/14] vdr-plugin-streamdev: convert to new package format. --- .../multimedia/vdr-plugin-streamdev/build | 33 ------------------- .../vdr-plugin-streamdev/{meta => package.mk} | 20 +++++++++-- 2 files changed, 18 insertions(+), 35 deletions(-) delete mode 100755 packages/3rdparty/multimedia/vdr-plugin-streamdev/build rename packages/3rdparty/multimedia/vdr-plugin-streamdev/{meta => package.mk} (75%) diff --git a/packages/3rdparty/multimedia/vdr-plugin-streamdev/build b/packages/3rdparty/multimedia/vdr-plugin-streamdev/build deleted file mode 100755 index b31436f613..0000000000 --- a/packages/3rdparty/multimedia/vdr-plugin-streamdev/build +++ /dev/null @@ -1,33 +0,0 @@ -#!/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 -################################################################################ - -. config/options $1 - -VDR_DIR=`basename $BUILD/vdr-[0-9]*` - -CFLAGS="$CFLAGS -fPIC" -CXXFLAGS="$CXXFLAGS -fPIC" -LDFLAGS="$LDFLAGS -fPIC" - -cd $PKG_BUILD - PWD=`pwd` - make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" diff --git a/packages/3rdparty/multimedia/vdr-plugin-streamdev/meta b/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk similarity index 75% rename from packages/3rdparty/multimedia/vdr-plugin-streamdev/meta rename to packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk index 8aff611637..bd08199e9b 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-streamdev/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://projects.vdr-developer.org/projects/show/plg-streamdev" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="vdr openssl" -PKG_BUILD_DEPENDS="toolchain vdr openssl" +PKG_DEPENDS_TARGET="vdr openssl" +PKG_BUILD_DEPENDS_TARGET="toolchain vdr openssl" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="TV" @@ -35,3 +35,19 @@ PKG_LONGDESC="TV" PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +VDR_DIR=$(basename $BUILD/vdr-[0-9]*) +PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ + LIBDIR=\".\" \ + LOCALEDIR=\"./locale\"" + +pre_configure_target() { + CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" + LDFLAGS="$LDFLAGS -fPIC" +} + +makeinstall_target() { + : # installation not needed, done by create-addon script +} + From 451a08a6e431a9cea6b95de0cb5e35521ac3cfa3 Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 17 Oct 2013 16:30:08 +0200 Subject: [PATCH 10/14] vdr-plugin-vnsiserver: convert to new package format. --- .../multimedia/vdr-plugin-vnsiserver/build | 33 ------------------- .../{meta => package.mk} | 18 ++++++++-- 2 files changed, 16 insertions(+), 35 deletions(-) delete mode 100755 packages/3rdparty/multimedia/vdr-plugin-vnsiserver/build rename packages/3rdparty/multimedia/vdr-plugin-vnsiserver/{meta => package.mk} (76%) diff --git a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/build b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/build deleted file mode 100755 index 4b0a4d920a..0000000000 --- a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/build +++ /dev/null @@ -1,33 +0,0 @@ -#!/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 -################################################################################ - -. config/options $1 - -VDR_DIR=`basename $BUILD/vdr-[0-9]*` - -CFLAGS="$CFLAGS -fPIC" -CXXFLAGS="$CXXFLAGS -fPIC" -LDFLAGS="$LDFLAGS -fPIC" - -cd $PKG_BUILD - make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" - diff --git a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk similarity index 76% rename from packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta rename to packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk index 7564791186..1b19acb1d7 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons/tree/master/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="vdr" -PKG_BUILD_DEPENDS="toolchain vdr" +PKG_DEPENDS_TARGET="vdr" +PKG_BUILD_DEPENDS_TARGET="toolchain vdr" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="TV" @@ -35,3 +35,17 @@ PKG_LONGDESC="TV" PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +VDR_DIR=$(basename $BUILD/vdr-[0-9]*) +PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ + LIBDIR=\".\" \ + LOCALEDIR=\"./locale\"" +pre_configure_target() { + CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" + LDFLAGS="$LDFLAGS -fPIC" +} + +makeinstall_target() { + : # installation not needed, done by create-addon script +} From a0523a435df4282bd2056c142de7c1129595bb59 Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 17 Oct 2013 16:33:03 +0200 Subject: [PATCH 11/14] vdr-plugin-xvdr: convert to new package format. --- .../3rdparty/multimedia/vdr-plugin-xvdr/build | 29 ------------------- .../vdr-plugin-xvdr/{meta => package.mk} | 13 +++++++-- 2 files changed, 11 insertions(+), 31 deletions(-) delete mode 100755 packages/3rdparty/multimedia/vdr-plugin-xvdr/build rename packages/3rdparty/multimedia/vdr-plugin-xvdr/{meta => package.mk} (80%) diff --git a/packages/3rdparty/multimedia/vdr-plugin-xvdr/build b/packages/3rdparty/multimedia/vdr-plugin-xvdr/build deleted file mode 100755 index 7519ca69b0..0000000000 --- a/packages/3rdparty/multimedia/vdr-plugin-xvdr/build +++ /dev/null @@ -1,29 +0,0 @@ -#!/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 -################################################################################ - -. config/options $1 - -VDR_DIR=`basename $BUILD/vdr-[0-9]*` - -cd $PKG_BUILD - make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" - diff --git a/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta b/packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk similarity index 80% rename from packages/3rdparty/multimedia/vdr-plugin-xvdr/meta rename to packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk index e3a1a993c5..b9a1e8421d 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/pipelka/vdr-plugin-xvdr" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="vdr" -PKG_BUILD_DEPENDS="toolchain vdr" +PKG_DEPENDS_TARGET="vdr" +PKG_BUILD_DEPENDS_TARGET="toolchain vdr" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="TV" @@ -35,3 +35,12 @@ PKG_LONGDESC="TV" PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +VDR_DIR=$(basename $BUILD/vdr-[0-9]*) +PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ + LIBDIR=\".\" \ + LOCALEDIR=\"./locale\"" + +makeinstall_target() { + : # installation not needed, done by create-addon script +} From 790b8ac1859b2e17c2a835a09d1cec5c282fda76 Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 17 Oct 2013 16:38:47 +0200 Subject: [PATCH 12/14] vdr-sc: convert to new package format. --- packages/3rdparty/multimedia/vdr-sc/build | 42 ------------------- .../multimedia/vdr-sc/{meta => package.mk} | 27 +++++++++++- 2 files changed, 25 insertions(+), 44 deletions(-) delete mode 100755 packages/3rdparty/multimedia/vdr-sc/build rename packages/3rdparty/multimedia/vdr-sc/{meta => package.mk} (67%) diff --git a/packages/3rdparty/multimedia/vdr-sc/build b/packages/3rdparty/multimedia/vdr-sc/build deleted file mode 100755 index dcc777ec26..0000000000 --- a/packages/3rdparty/multimedia/vdr-sc/build +++ /dev/null @@ -1,42 +0,0 @@ -#!/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 -################################################################################ - -. config/options $1 - -VDR_DIR=`basename $BUILD/vdr-[0-9]*` - -CFLAGS="$CFLAGS -fPIC" -CXXFLAGS="$CXXFLAGS -fPIC" -LDFLAGS="$LDFLAGS -fPIC" - -# vdr-sc fails building with LTO support - strip_lto - -# dont build parallel - MAKEFLAGS=-j1 - -cd $PKG_BUILD - make VDRDIR="../$VDR_DIR" \ - LIBDIR="." \ - LOCALEDIR="./locale" \ - CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops" - diff --git a/packages/3rdparty/multimedia/vdr-sc/meta b/packages/3rdparty/multimedia/vdr-sc/package.mk similarity index 67% rename from packages/3rdparty/multimedia/vdr-sc/meta rename to packages/3rdparty/multimedia/vdr-sc/package.mk index db0d93f17f..e43f9e16ce 100644 --- a/packages/3rdparty/multimedia/vdr-sc/meta +++ b/packages/3rdparty/multimedia/vdr-sc/package.mk @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://85.17.209.13:6100/" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="vdr openssl" -PKG_BUILD_DEPENDS="toolchain vdr openssl" +PKG_DEPENDS_TARGET="vdr openssl" +PKG_BUILD_DEPENDS_TARGET="toolchain vdr openssl" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="TV" @@ -35,3 +35,26 @@ PKG_LONGDESC="TV" PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +VDR_DIR=$(basename $BUILD/vdr-[0-9]*) +PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ + LIBDIR=\".\" \ + LOCALEDIR=\"./locale\"" + +pre_make_target() { + # dont build parallel + MAKEFLAGS=-j1 +} + +pre_configure_target() { + CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" + LDFLAGS="$LDFLAGS -fPIC" + CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops" + # vdr-sc fails building with LTO support + strip_lto +} + +makeinstall_target() { + : # installation not needed, done by create-addon script +} From 1f92b19a4ce76a4a40949bd558ed48e4fb8fb564 Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 17 Oct 2013 16:41:01 +0200 Subject: [PATCH 13/14] vdr-wirbelscan: convert to new package format. --- .../3rdparty/multimedia/vdr-wirbelscan/build | 33 ------------------- .../vdr-wirbelscan/{meta => package.mk} | 20 +++++++++-- 2 files changed, 18 insertions(+), 35 deletions(-) delete mode 100755 packages/3rdparty/multimedia/vdr-wirbelscan/build rename packages/3rdparty/multimedia/vdr-wirbelscan/{meta => package.mk} (76%) diff --git a/packages/3rdparty/multimedia/vdr-wirbelscan/build b/packages/3rdparty/multimedia/vdr-wirbelscan/build deleted file mode 100755 index 470986dae0..0000000000 --- a/packages/3rdparty/multimedia/vdr-wirbelscan/build +++ /dev/null @@ -1,33 +0,0 @@ -#!/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 -################################################################################ - -. config/options $1 - -VDR_DIR=`basename $BUILD/vdr-[0-9]*` - -CFLAGS="$CFLAGS -fPIC" -CXXFLAGS="$CXXFLAGS -fPIC" -LDFLAGS="$LDFLAGS -fPIC" - -cd $PKG_BUILD -make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" - diff --git a/packages/3rdparty/multimedia/vdr-wirbelscan/meta b/packages/3rdparty/multimedia/vdr-wirbelscan/package.mk similarity index 76% rename from packages/3rdparty/multimedia/vdr-wirbelscan/meta rename to packages/3rdparty/multimedia/vdr-wirbelscan/package.mk index 63634870e6..fa0cfe4b95 100644 --- a/packages/3rdparty/multimedia/vdr-wirbelscan/meta +++ b/packages/3rdparty/multimedia/vdr-wirbelscan/package.mk @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://wirbel.htpc-forum.de/wirbelscan/index2.html" PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/$PKG_NAME-$PKG_VERSION.tgz" -PKG_DEPENDS="vdr" -PKG_BUILD_DEPENDS="toolchain vdr" +PKG_DEPENDS_TARGET="vdr" +PKG_BUILD_DEPENDS_TARGET="toolchain vdr" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="TV" @@ -35,3 +35,19 @@ PKG_LONGDESC="TV" PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +VDR_DIR=$(basename $BUILD/vdr-[0-9]*) +PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ + LIBDIR=\".\" \ + LOCALEDIR=\"./locale\"" + +pre_configure_target() { + CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" + LDFLAGS="$LDFLAGS -fPIC" +} + +makeinstall_target() { + : # installation not needed, done by create-addon script +} + From 6ff47a7e08cf2d6314bffd14432fd25cf7b19e65 Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Thu, 17 Oct 2013 16:47:31 +0200 Subject: [PATCH 14/14] vdr-wirbelscancontrol: convert to new package format. --- .../multimedia/vdr-wirbelscancontrol/build | 35 ------------------- .../{meta => package.mk} | 23 ++++++++++-- 2 files changed, 21 insertions(+), 37 deletions(-) delete mode 100755 packages/3rdparty/multimedia/vdr-wirbelscancontrol/build rename packages/3rdparty/multimedia/vdr-wirbelscancontrol/{meta => package.mk} (72%) diff --git a/packages/3rdparty/multimedia/vdr-wirbelscancontrol/build b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/build deleted file mode 100755 index 7e4f905b96..0000000000 --- a/packages/3rdparty/multimedia/vdr-wirbelscancontrol/build +++ /dev/null @@ -1,35 +0,0 @@ -#!/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 -################################################################################ - -. config/options $1 - -VDR_DIR=`basename $BUILD/vdr-[0-9]*` - -CFLAGS="$CFLAGS -fPIC" -CXXFLAGS="$CXXFLAGS -fPIC" -LDFLAGS="$LDFLAGS -fPIC" - -cd $PKG_BUILD -ln -sf ../vdr-wirbelscan-[0-9]*/wirbelscan_services.h - -make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" - diff --git a/packages/3rdparty/multimedia/vdr-wirbelscancontrol/meta b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/package.mk similarity index 72% rename from packages/3rdparty/multimedia/vdr-wirbelscancontrol/meta rename to packages/3rdparty/multimedia/vdr-wirbelscancontrol/package.mk index e01d2b3a95..fb96c8b3cd 100644 --- a/packages/3rdparty/multimedia/vdr-wirbelscancontrol/meta +++ b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/package.mk @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://wirbel.htpc-forum.de/wirbelscancontrol/index2.html" PKG_URL="http://wirbel.htpc-forum.de/wirbelscancontrol/$PKG_NAME-$PKG_VERSION.tgz" -PKG_DEPENDS="vdr" -PKG_BUILD_DEPENDS="toolchain vdr vdr-wirbelscan" +PKG_DEPENDS_TARGET="vdr" +PKG_BUILD_DEPENDS_TARGET="toolchain vdr vdr-wirbelscan" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="TV" @@ -35,3 +35,22 @@ PKG_LONGDESC="TV" PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +VDR_DIR=$(basename $BUILD/vdr-[0-9]*) +PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \ + LIBDIR=\".\" \ + LOCALEDIR=\"./locale\"" + +pre_configure_target() { + CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" + LDFLAGS="$LDFLAGS -fPIC" +} + +pre_build_target() { + ln -sf $ROOT/$BUILD/vdr-wirbelscan-[0-9]*/wirbelscan_services.h $PKG_BUILD +} + +makeinstall_target() { + : # installation not needed, done by create-addon script +}