Merge pull request #4679 from CvH/patch-3

Thanks :)
This commit is contained in:
Christian Hewitt 2016-02-06 06:34:39 +04:00
commit 910272817f
5 changed files with 72 additions and 7 deletions

View File

@ -1,3 +1,8 @@
7.0.2
- update to vdr-plugin-restfulapi-0.2.6.0
- update to vdr-plugin-vnsiserver-00b5779
- update to vdr-satip-b755dbf
7.0.1
- update to vdr-plugin-xmltv2vdr-b48e0bec
- update to vdr-plugin-streamdev-fc52e92

View File

@ -19,7 +19,7 @@
PKG_NAME="vdr-addon"
PKG_VERSION="7.0"
PKG_REV="1"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv"

View File

@ -17,12 +17,12 @@
################################################################################
PKG_NAME="vdr-plugin-restfulapi"
PKG_VERSION="0.2.5.6"
PKG_VERSION="0.2.6.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/yavdr/vdr-plugin-restfulapi"
PKG_URL="https://github.com/yavdr/${PKG_NAME}/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_URL="https://github.com/yavdr/${PKG_NAME}/releases/download/2.6.0/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain vdr cxxtools vdr-wirbelscan"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="vdr-plugin-vnsiserver"
PKG_VERSION="d96f211"
PKG_VERSION="00b5779"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,7 +1,7 @@
From 165fd5b14af2327f3cd5d5b6fbe814737a0ea423 Mon Sep 17 00:00:00 2001
From: Tobias Grimm <etobi@debian.org>
Date: Sat, 5 Dec 2015 16:59:28 +0100
Subject: [PATCH 1/3] Reorderd the transponder URL parameter in a way the
Subject: [PATCH 1/5] Reorderd the transponder URL parameter in a way the
Panasonic CXW804 expects them (src/freq/pol/ro/msys/mtype/plts/sr/fec)
This only applies to DVB-S. DVB-C and DVB-T might need further tweaking.
@ -59,7 +59,7 @@ index c71902d..b5eaf1c 100644
From c1a881ba9459146541ef07ea1519fd45e5603d2c Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Sat, 5 Dec 2015 20:23:32 +0200
Subject: [PATCH 2/3] Reorder also terrestrial and cable query parameters as
Subject: [PATCH 2/5] Reorder also terrestrial and cable query parameters as
introduced in the satip specification 1.2.2, although the ordering shouldn't
matter according to it.
@ -118,7 +118,7 @@ index b5eaf1c..c9c4529 100644
From 9d5f7cc7030657f38c56f6041ff7f697774a9624 Mon Sep 17 00:00:00 2001
From: chriszero <zerov83@gmail.com>
Date: Thu, 7 Jan 2016 20:56:39 +0100
Subject: [PATCH 3/3] Make it possible to specify the rtp and rtcp ports this
Subject: [PATCH 3/5] Make it possible to specify the rtp and rtcp ports this
makes it possible to use the satip through a NAT (e.g. a docker bridged
network)
@ -340,3 +340,63 @@ index c12a19e..fc47b51 100644
}
if ((rtpM.Port() <= 0) || (rtcpM.Port() <= 0)) {
error("Cannot open required RTP/RTCP ports [device %d]", deviceIdM);
From 8f12ce6f55d0db46e516cf9f471438f8ed84c403 Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Sat, 30 Jan 2016 21:41:10 +0200
Subject: [PATCH 4/5] Add a missing device name update.
---
device.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/device.c b/device.c
index ad96434..4a59291 100644
--- a/device.c
+++ b/device.c
@@ -355,6 +355,7 @@ bool cSatipDevice::SetChannelDevice(const cChannel *channelP, bool liveViewP)
}
else if (pTunerM) {
pTunerM->SetSource(NULL, 0, NULL, deviceIndexM);
+ deviceNameM = cString::sprintf("%s %d", *DeviceType(), deviceIndexM);
return true;
}
return false;
From b755dbf318874e4dadc5f4e4c7405e90dc4eeb2e Mon Sep 17 00:00:00 2001
From: Tobias Grimm <git@e-tobi.net>
Date: Sat, 23 Jan 2016 18:38:44 +0100
Subject: [PATCH 5/5] C++11 requires a mandatory space when concatenating
string literals
---
common.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/common.h b/common.h
index ac9ea20..c85404b 100644
--- a/common.h
+++ b/common.h
@@ -48,15 +48,15 @@
esyslog("curl_easy_perform() [%s,%d] failed: %s (%d)", __FILE__, __LINE__, curl_easy_strerror(res), res); \
}
-#define ERROR_IF_FUNC(exp, errstr, func, ret) \
- do { \
- if (exp) { \
- char tmp[64]; \
- esyslog("[%s,%d]: "errstr": %s", __FILE__, __LINE__, \
- strerror_r(errno, tmp, sizeof(tmp))); \
- func; \
- ret; \
- } \
+#define ERROR_IF_FUNC(exp, errstr, func, ret) \
+ do { \
+ if (exp) { \
+ char tmp[64]; \
+ esyslog("[%s,%d]: " errstr ": %s", __FILE__, __LINE__, \
+ strerror_r(errno, tmp, sizeof(tmp))); \
+ func; \
+ ret; \
+ } \
} while (0)