rotorng: update to rotorng-0.3.1

This commit is contained in:
Stefan Saraev 2013-04-09 22:11:43 +03:00
parent af4c63d1a1
commit d35a8cac93
4 changed files with 38 additions and 33 deletions

View File

@ -24,7 +24,10 @@
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"

View File

@ -19,15 +19,15 @@
################################################################################
PKG_NAME="rotorng"
PKG_VERSION="0.1.0"
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_URL="http://projects.vdr-developer.org/attachments/download/631/rotorng-${PKG_VERSION}.tar.gz"
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"

View File

@ -1,30 +0,0 @@
diff -uNr rotorng-0.1.0-orig/rotorng.c rotorng-0.1.0/rotorng.c
--- rotorng-0.1.0-orig/rotorng.c 2012-05-06 16:14:06.000000000 +0200
+++ rotorng-0.1.0/rotorng.c 2012-05-07 10:52:18.000000000 +0200
@@ -338,7 +338,7 @@
int last_position_shown;
bool transfer;
protected:
- virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
+ virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber,bool LiveView);
public:
cStatusMonitor();
};
@@ -348,7 +348,7 @@
transfer=false;
}
-void cStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+void cStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber,bool LiveView)
{
//actuator_status status;
if (ChannelNumber) {
@@ -1494,7 +1494,7 @@
snprintf(buf, sizeof(buf),"%s %d", tr(menucaption[itemindex]), menuvalue[itemindex]);
break;
case MI_SYSTEM:
- snprintf(buf, sizeof(buf),"%s %s", tr(menucaption[itemindex]), MapToUserString(menuvalue[itemindex], SystemValues));
+ snprintf(buf, sizeof(buf),"%s %s", tr(menucaption[itemindex]), MapToUserString(menuvalue[itemindex], SystemValuesSat));
break;
case MI_MODULATION:
snprintf(buf, sizeof(buf),"%s %s ", tr(menucaption[itemindex]), MapToUserString(menuvalue[itemindex], ModulationValues));

View File

@ -0,0 +1,32 @@
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: