mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
commit
e5199b5bf9
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="vdr-epgsearch"
|
||||
PKG_VERSION="e2de927"
|
||||
PKG_VERSION="29c174a"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="vdr-iptv"
|
||||
PKG_VERSION="2.0.0"
|
||||
PKG_VERSION="2.0.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -1,5 +1,5 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 7f147b8..db294fc 100644
|
||||
index 74f8b09..db294fc 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -12,8 +12,6 @@
|
||||
@ -16,7 +16,7 @@ index 7f147b8..db294fc 100644
|
||||
### 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 --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
|
||||
-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)
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="vdr-plugin-dvbapi"
|
||||
PKG_VERSION="2be5e15"
|
||||
PKG_VERSION="4d9de95"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="vdr-plugin-streamdev"
|
||||
PKG_VERSION="a9c2adb"
|
||||
PKG_VERSION="40704cd"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -1,25 +0,0 @@
|
||||
From 18f51127373375ce189be498a64cc286114f142f Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Sat, 19 Oct 2013 21:40:14 +0300
|
||||
Subject: [PATCH] vdr 2.1.2 buildfix
|
||||
|
||||
---
|
||||
server/connectionVTP.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/server/connectionVTP.c b/server/connectionVTP.c
|
||||
index 55c92de..57bb64b 100644
|
||||
--- a/server/connectionVTP.c
|
||||
+++ b/server/connectionVTP.c
|
||||
@@ -1377,7 +1377,7 @@ bool cConnectionVTP::CmdSTAT(const char *Option)
|
||||
if (*Option) {
|
||||
if (strcasecmp(Option, "DISK") == 0) {
|
||||
int FreeMB, UsedMB;
|
||||
- int Percent = VideoDiskSpace(&FreeMB, &UsedMB);
|
||||
+ int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB);
|
||||
Reply(250, "%dMB %dMB %d%%", FreeMB + UsedMB, FreeMB, Percent);
|
||||
}
|
||||
else if (strcasecmp(Option, "NAME") == 0) {
|
||||
--
|
||||
1.7.2.5
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="vdr-plugin-vnsiserver"
|
||||
PKG_VERSION="e2e6804"
|
||||
PKG_VERSION="9021115"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
31
packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-620-vdr-2.1.3.patch
vendored
Normal file
31
packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-620-vdr-2.1.3.patch
vendored
Normal file
@ -0,0 +1,31 @@
|
||||
diff --git a/device.c b/device.c
|
||||
index 04bbef1..e6d63aa 100644
|
||||
--- a/device.c
|
||||
+++ b/device.c
|
||||
@@ -357,7 +357,7 @@ bool cScDevices::Initialize(void)
|
||||
*vdr_nci=0; *vdr_ud=vdr_save_ud;
|
||||
|
||||
int i, found=0;
|
||||
- for(i=0; i<MAXDVBDEVICES; i++) {
|
||||
+ for(i=0; i<MAXDEVICES; i++) {
|
||||
if(UseDevice(NextCardIndex())) {
|
||||
char name[128];
|
||||
cScDevices::DvbName(DEV_DVB_FRONTEND,i,0,name,sizeof(name));
|
||||
@@ -382,7 +382,7 @@ bool cScDevices::Initialize(void)
|
||||
}
|
||||
else NextCardIndex(1);
|
||||
}
|
||||
- NextCardIndex(MAXDVBDEVICES-i);
|
||||
+ NextCardIndex(MAXDEVICES-i);
|
||||
if(found>0) PRINTF(L_GEN_INFO,"captured %d video device%s",found,found>1 ? "s" : "");
|
||||
else PRINTF(L_GEN_INFO,"no DVB device captured");
|
||||
return found>0;
|
||||
@@ -411,7 +411,7 @@ void cScDevices::Shutdown(void)
|
||||
|
||||
void cScDevices::SetForceBudget(int n)
|
||||
{
|
||||
- if(n>=0 && n<MAXDVBDEVICES) budget|=(1<<n);
|
||||
+ if(n>=0 && n<MAXDEVICES) budget|=(1<<n);
|
||||
}
|
||||
|
||||
bool cScDevices::ForceBudget(int n)
|
2
packages/3rdparty/multimedia/vdr/package.mk
vendored
2
packages/3rdparty/multimedia/vdr/package.mk
vendored
@ -18,7 +18,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="vdr"
|
||||
PKG_VERSION="2.1.2"
|
||||
PKG_VERSION="2.1.3"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
2
packages/3rdparty/web/tntnet/package.mk
vendored
2
packages/3rdparty/web/tntnet/package.mk
vendored
@ -25,7 +25,7 @@ PKG_SITE="http://www.tntnet.org/"
|
||||
PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_HOST=""
|
||||
PKG_DEPENDS_TARGET="libtool cxxtools"
|
||||
PKG_BUILD_DEPENDS_HOST="toolchain cxxtools:host"
|
||||
PKG_BUILD_DEPENDS_HOST="toolchain cxxtools:host zlib:host"
|
||||
PKG_BUILD_DEPENDS_TARGET="toolchain tntnet:host libtool cxxtools"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/web"
|
||||
|
@ -1,3 +1,11 @@
|
||||
4.1.2
|
||||
- update to vdr-2.1.3
|
||||
- update to vdr-iptv-2.0.1
|
||||
- update to vdr-plugin-dvbapi-4d9de95
|
||||
- update to vdr-plugin-streamdev-40704cd
|
||||
- update to vdr-plugin-vnsiserver-9021115
|
||||
- update to vdr-epgsearch-29c174a
|
||||
|
||||
4.1.1
|
||||
- rebuild to fix curl/gnutls/ssl
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
PKG_NAME="vdr-addon"
|
||||
PKG_VERSION="4.1"
|
||||
PKG_REV="1"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.openelec.tv"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="service.openelec.settings"
|
||||
PKG_VERSION="0.3.9"
|
||||
PKG_VERSION="0.3.10"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="prop."
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bluez"
|
||||
PKG_VERSION="5.12"
|
||||
PKG_VERSION="5.13"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
Loading…
x
Reference in New Issue
Block a user