mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
xbmc: update to xbmc-12.0.6
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
98ad4cafd3
commit
1de0c74187
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xbmc-theme-Confluence"
|
PKG_NAME="xbmc-theme-Confluence"
|
||||||
PKG_VERSION="12.0.5"
|
PKG_VERSION="12.0.6"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xbmc"
|
PKG_NAME="xbmc"
|
||||||
PKG_VERSION="12.0.5"
|
PKG_VERSION="12.0.6"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
@ -1,34 +0,0 @@
|
|||||||
From 88e250d43dcb13ec2a05f64994c57a3d96b024b4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jim Carroll <thecarrolls@jiminger.com>
|
|
||||||
Date: Mon, 11 Mar 2013 03:19:46 -0400
|
|
||||||
Subject: [PATCH] [fix] build issue with std::min on some platforms.
|
|
||||||
|
|
||||||
---
|
|
||||||
xbmc/interfaces/legacy/File.h | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/xbmc/interfaces/legacy/File.h b/xbmc/interfaces/legacy/File.h
|
|
||||||
index d8b5d26..d3c17b3 100644
|
|
||||||
--- a/xbmc/interfaces/legacy/File.h
|
|
||||||
+++ b/xbmc/interfaces/legacy/File.h
|
|
||||||
@@ -27,6 +27,8 @@
|
|
||||||
#include "LanguageHook.h"
|
|
||||||
#include "commons/Buffer.h"
|
|
||||||
|
|
||||||
+#include <algorithm>
|
|
||||||
+
|
|
||||||
namespace XBMCAddon
|
|
||||||
{
|
|
||||||
|
|
||||||
@@ -70,7 +72,7 @@
|
|
||||||
inline String read(unsigned long numBytes = 0)
|
|
||||||
{
|
|
||||||
XbmcCommons::Buffer b = readBytes(numBytes);
|
|
||||||
- return b.getString(numBytes == 0 ? b.remaining() : std::min(b.remaining(),numBytes));
|
|
||||||
+ return b.getString(numBytes == 0 ? b.remaining() : std::min((unsigned long)b.remaining(),numBytes));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
--
|
|
||||||
1.7.10
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="xbmc"
|
PKG_NAME="xbmc"
|
||||||
PKG_VERSION="12.0.5"
|
PKG_VERSION="12.0.6"
|
||||||
GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git"
|
GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git"
|
||||||
DEST_DIR="$PKG_NAME-frodo"
|
DEST_DIR="$PKG_NAME-frodo"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user