Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

Conflicts:
	packages/mediacenter/xbmc-addon-xvdr/meta
	projects/RPi/linux/linux.arm.conf

packages/mediacenter/xbmc-addon-xvdr/meta

@@ -19,10 +19,9 @@
 ################################################################################
 
 PKG_NAME="xbmc-addon-xvdr"
-if [ "$XBMC" = frodo ]; then
+PKG_VERSION="75445e7"
-  PKG_VERSION="01831de"
+if [ "$MEDIACENTER" = "xbmc-frodo" ]; then
-else
+  PKG_VERSION="d48e68e"
-  PKG_VERSION="75445e7"
 fi
 PKG_REV="1"
 PKG_ARCH="any"

packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-d48e68e-xbmc_head_changes.patch

@@ -0,0 +1,110 @@
+diff -Naur xbmc-addon-xvdr-d48e68e/addons/library.xbmc.addon/libXBMC_addon.h xbmc-addon-xvdr-d48e68e.patch/addons/library.xbmc.addon/libXBMC_addon.h
+--- xbmc-addon-xvdr-d48e68e/addons/library.xbmc.addon/libXBMC_addon.h	2012-09-13 08:11:02.000000000 +0200
++++ xbmc-addon-xvdr-d48e68e.patch/addons/library.xbmc.addon/libXBMC_addon.h	2012-09-13 11:12:53.496913518 +0200
+@@ -14,9 +14,8 @@
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+- *  along with XBMC; see the file COPYING.  If not, write to
+- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+- *  http://www.gnu.org/copyleft/gpl.html
++ *  along with XBMC; see the file COPYING.  If not, see
++ *  <http://www.gnu.org/licenses/>.
+  *
+  */
+ 
+@@ -29,37 +28,34 @@
+ #ifdef _WIN32                   // windows
+ #include "dlfcn-win32.h"
+ #define ADDON_DLL               "\\library.xbmc.addon\\libXBMC_addon" ADDON_HELPER_EXT
+-#define ADDON_HELPER_PLATFORM   "win32"
+ #define ADDON_HELPER_EXT        ".dll"
+ #else
+ #if defined(__APPLE__)          // osx
+-#define ADDON_HELPER_PLATFORM   "osx"
+ #if defined(__POWERPC__)
+-#define ADDON_HELPER_ARCH       "powerpc"
++#define ADDON_HELPER_ARCH       "powerpc-osx"
+ #elif defined(__arm__)
+-#define ADDON_HELPER_ARCH       "arm"
++#define ADDON_HELPER_ARCH       "arm-osx"
+ #else
+-#define ADDON_HELPER_ARCH       "x86"
++#define ADDON_HELPER_ARCH       "x86-osx"
+ #endif
+ #else                           // linux
+-#define ADDON_HELPER_PLATFORM   "linux"
+ #if defined(__x86_64__)
+-#define ADDON_HELPER_ARCH       "x86_64"
++#define ADDON_HELPER_ARCH       "x86_64-linux"
+ #elif defined(_POWERPC)
+-#define ADDON_HELPER_ARCH       "powerpc"
++#define ADDON_HELPER_ARCH       "powerpc-linux"
+ #elif defined(_POWERPC64)
+-#define ADDON_HELPER_ARCH       "powerpc64"
++#define ADDON_HELPER_ARCH       "powerpc64-linux"
+ #elif defined(__ARMEL__)
+ #define ADDON_HELPER_ARCH       "arm"
+ #elif defined(_MIPSEL)
+-#define ADDON_HELPER_ARCH       "mipsel"
++#define ADDON_HELPER_ARCH       "mipsel-linux"
+ #else
+-#define ADDON_HELPER_ARCH       "i486"
++#define ADDON_HELPER_ARCH       "i486-linux"
+ #endif
+ #endif
+ #include <dlfcn.h>              // linux+osx
+ #define ADDON_HELPER_EXT        ".so"
+-#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT
++#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-" ADDON_HELPER_ARCH ADDON_HELPER_EXT
+ #endif
+ 
+ #ifdef LOG_DEBUG
+diff -Naur xbmc-addon-xvdr-d48e68e/addons/library.xbmc.gui/libXBMC_gui.h xbmc-addon-xvdr-d48e68e.patch/addons/library.xbmc.gui/libXBMC_gui.h
+--- xbmc-addon-xvdr-d48e68e/addons/library.xbmc.gui/libXBMC_gui.h	2012-09-13 08:11:02.000000000 +0200
++++ xbmc-addon-xvdr-d48e68e.patch/addons/library.xbmc.gui/libXBMC_gui.h	2012-09-13 11:10:40.866902690 +0200
+@@ -14,9 +14,8 @@
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+- *  along with XBMC; see the file COPYING.  If not, write to
+- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+- *  http://www.gnu.org/copyleft/gpl.html
++ *  along with XBMC; see the file COPYING.  If not, see
++ *  <http://www.gnu.org/licenses/>.
+  *
+  */
+ 
+@@ -32,7 +31,7 @@
+ #ifdef _WIN32
+ #define GUI_HELPER_DLL "\\library.xbmc.gui\\libXBMC_gui" ADDON_HELPER_EXT
+ #else
+-#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT
++#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-" ADDON_HELPER_ARCH ADDON_HELPER_EXT
+ #endif
+ 
+ #define ADDON_ACTION_PREVIOUS_MENU          10
+diff -Naur xbmc-addon-xvdr-d48e68e/addons/library.xbmc.pvr/libXBMC_pvr.h xbmc-addon-xvdr-d48e68e.patch/addons/library.xbmc.pvr/libXBMC_pvr.h
+--- xbmc-addon-xvdr-d48e68e/addons/library.xbmc.pvr/libXBMC_pvr.h	2012-09-13 08:11:02.000000000 +0200
++++ xbmc-addon-xvdr-d48e68e.patch/addons/library.xbmc.pvr/libXBMC_pvr.h	2012-09-13 11:10:40.866902690 +0200
+@@ -14,9 +14,8 @@
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+- *  along with XBMC; see the file COPYING.  If not, write to
+- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+- *  http://www.gnu.org/copyleft/gpl.html
++ *  along with XBMC; see the file COPYING.  If not, see
++ *  <http://www.gnu.org/licenses/>.
+  *
+  */
+ 
+@@ -31,7 +30,7 @@
+ #ifdef _WIN32
+ #define PVR_HELPER_DLL "\\library.xbmc.pvr\\libXBMC_pvr" ADDON_HELPER_EXT
+ #else
+-#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT
++#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-" ADDON_HELPER_ARCH ADDON_HELPER_EXT
+ #endif
+ 
+ #define DVD_TIME_BASE 1000000

packages/mediacenter/xbmc-frodo-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-frodo-theme-Confluence"
-PKG_VERSION="0c1f4e1"
+PKG_VERSION="63ca86a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-frodo/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-frodo"
-PKG_VERSION="0c1f4e1"
+PKG_VERSION="63ca86a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-63ca86a-999.01-fix-CEC.patch

@@ -0,0 +1,43 @@
+From b62503c578604bef65a7e00da4f48a7876bc260c Mon Sep 17 00:00:00 2001
+From: Lars Op den Kamp <lars@opdenkamp.eu>
+Date: Thu, 13 Sep 2012 14:00:54 +0200
+Subject: [PATCH] [rpi/cec] and now correct, use CEC_RPI_VIRTUAL_COM from
+ cectypes.h (which also uses the correct value instead of
+ 'CEC')
+
+---
+ xbmc/peripherals/bus/linux/PeripheralBusRPi.cpp |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xbmc/peripherals/bus/linux/PeripheralBusRPi.cpp b/xbmc/peripherals/bus/linux/PeripheralBusRPi.cpp
+index 08e4190..8a436e4 100644
+--- a/xbmc/peripherals/bus/linux/PeripheralBusRPi.cpp
++++ b/xbmc/peripherals/bus/linux/PeripheralBusRPi.cpp
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include "PeripheralBusRPi.h"
++#include <libcec/cectypes.h>
+ 
+ extern "C" {
+ #include <interface/vmcs_host/vc_cecservice.h>
+@@ -29,7 +30,6 @@
+ 
+ #define RPI_PERIPHERAL_BUS_VID 0x2708
+ #define RPI_PERIPHERAL_CEC_PID 0x1001
+-#define RPI_PERIPHERAL_CEC_LOC "CEC"
+ 
+ CPeripheralBusRPi::CPeripheralBusRPi(CPeripherals *manager) :
+     CPeripheralBus(manager, PERIPHERAL_BUS_RPI)
+@@ -45,7 +45,7 @@ bool CPeripheralBusRPi::PerformDeviceScan(PeripheralScanResults &results)
+     result.m_iVendorId   = RPI_PERIPHERAL_BUS_VID;
+     result.m_iProductId  = RPI_PERIPHERAL_CEC_PID;
+     result.m_type        = PERIPHERAL_CEC;
+-    result.m_strLocation = RPI_PERIPHERAL_CEC_LOC;
++    result.m_strLocation = CEC_RPI_VIRTUAL_COM;
+ 
+     if (!results.ContainsResult(result))
+       results.m_results.push_back(result);
+-- 
+1.7.10
+

projects/RPi/linux/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.2.27 Kernel Configuration
+# Linux/arm 3.2.28 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -17,10 +17,12 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_FIQ=y
 CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 CONFIG_NEED_MACH_MEMORY_H=y
@@ -381,6 +383,28 @@ CONFIG_CMDLINE_EXTEND=y
 #
 # CPU Power Management
 #
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_STAT is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+
+#
+# ARM CPU frequency scaling drivers
+#
+CONFIG_ARM_BCM2835_CPUFREQ=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y