From 1de0c74187322cfd65ce556a2ed7ec55d139ffa9 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 11 Mar 2013 19:02:33 +0100
Subject: [PATCH] xbmc: update to xbmc-12.0.6

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../mediacenter/xbmc-theme-Confluence/meta    |  2 +-
 packages/mediacenter/xbmc/meta                |  2 +-
 .../xbmc/patches/xbmc-990.27-fix-build.patch  | 34 -------------------
 tools/mkpkg/mkpkg_xbmc-frodo                  |  2 +-
 4 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-990.27-fix-build.patch

diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
index 8601e6b110..8624112f66 100644
--- a/packages/mediacenter/xbmc-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-theme-Confluence/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="12.0.5"
+PKG_VERSION="12.0.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 03ae526c9d..09f8fbe5d5 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="12.0.5"
+PKG_VERSION="12.0.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.27-fix-build.patch b/packages/mediacenter/xbmc/patches/xbmc-990.27-fix-build.patch
deleted file mode 100644
index b17ea63d81..0000000000
--- a/packages/mediacenter/xbmc/patches/xbmc-990.27-fix-build.patch
+++ /dev/null
@@ -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
-
diff --git a/tools/mkpkg/mkpkg_xbmc-frodo b/tools/mkpkg/mkpkg_xbmc-frodo
index 8109893465..b51f2cf9a5 100755
--- a/tools/mkpkg/mkpkg_xbmc-frodo
+++ b/tools/mkpkg/mkpkg_xbmc-frodo
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="12.0.5"
+PKG_VERSION="12.0.6"
 GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git"
 DEST_DIR="$PKG_NAME-frodo"