jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc: update PR2403 patch

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-03-15 14:59:04 +01:00
parent 3b9461b7c0
commit 9eb67f02a9
2 changed files with 94 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403-01.patch Normal file
View File

@ -0,0 +1,94 @@
diff -Naur xbmc-12.0.6/xbmc/powermanagement/linux/FallbackPowerSyscall.h xbmc-12.0.6.patch/xbmc/powermanagement/linux/FallbackPowerSyscall.h
--- xbmc-12.0.6/xbmc/powermanagement/linux/FallbackPowerSyscall.h 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-12.0.6.patch/xbmc/powermanagement/linux/FallbackPowerSyscall.h 2013-03-13 22:25:29.220700789 +0100
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * http://www.xbmc.org
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * 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, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+#include "powermanagement/IPowerSyscall.h"
+#include "system.h"
+#if defined(TARGET_LINUX)
+
+class CFallbackPowerSyscall : public CPowerSyscallWithoutEvents
+{
+public:
+ virtual bool Powerdown() {return true; }
+ virtual bool Suspend() {return false; }
+ virtual bool Hibernate() {return false; }
+ virtual bool Reboot() {return true; }
+
+ virtual bool CanPowerdown() {return true; }
+ virtual bool CanSuspend() {return false; }
+ virtual bool CanHibernate() {return false; }
+ virtual bool CanReboot() {return true; }
+ virtual int BatteryLevel() {return 0; }
+};
+#endif
diff -Naur xbmc-12.0.6/xbmc/powermanagement/PowerManager.cpp xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.cpp
--- xbmc-12.0.6/xbmc/powermanagement/PowerManager.cpp 2013-03-11 18:01:45.000000000 +0100
+++ xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.cpp 2013-03-14 00:20:43.263315592 +0100
@@ -41,14 +41,17 @@
#include "osx/CocoaPowerSyscall.h"
#elif defined(TARGET_ANDROID)
#include "android/AndroidPowerSyscall.h"
-#elif defined(_LINUX) && defined(HAS_DBUS)
+#elif defined(TARGET_LINUX)
+#include "linux/FallbackPowerSyscall.h"
+#if defined(HAS_DBUS)
#include "linux/ConsoleUPowerSyscall.h"
#include "linux/ConsoleDeviceKitPowerSyscall.h"
#include "linux/SystemdUPowerSyscall.h"
#include "linux/UPowerSyscall.h"
-#ifdef HAS_HAL
+#if defined(HAS_HAL)
#include "linux/HALPowerSyscall.h"
-#endif
+#endif // HAS_HAL
+#endif // HAS_DBUS
#elif defined(_WIN32)
#include "powermanagement/windows/Win32PowerSyscall.h"
extern HWND g_hWnd;
@@ -74,7 +77,8 @@
m_instance = new CCocoaPowerSyscall();
#elif defined(TARGET_ANDROID)
m_instance = new CAndroidPowerSyscall();
-#elif defined(_LINUX) && defined(HAS_DBUS)
+#elif defined(TARGET_LINUX)
+#if defined(HAS_DBUS)
if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
m_instance = new CConsoleUPowerSyscall();
else if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit())
@@ -83,10 +87,13 @@
m_instance = new CSystemdUPowerSyscall();
else if (CUPowerSyscall::HasUPower())
m_instance = new CUPowerSyscall();
-#ifdef HAS_HAL
- else
+#if defined(HAS_HAL)
+ else if(1)
m_instance = new CHALPowerSyscall();
-#endif
+#endif // HAS_HAL
+#endif // HAS_DBUS
+ else
+ m_instance = new CFallbackPowerSyscall();
#elif defined(_WIN32)
m_instance = new CWin32PowerSyscall();
#endif

14
packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403.patch
View File

@ -1,14 +0,0 @@
diff -Naur xbmc-12.0.6/xbmc/powermanagement/PowerManager.h xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.h
--- xbmc-12.0.6/xbmc/powermanagement/PowerManager.h 2013-03-11 18:01:45.000000000 +0100
+++ xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.h 2013-03-12 13:42:28.698769168 +0100
@@ -32,8 +32,8 @@
virtual bool Reboot() { return false; }
virtual bool CanPowerdown() { return true; }
- virtual bool CanSuspend() { return true; }
- virtual bool CanHibernate() { return true; }
+ virtual bool CanSuspend() { return false; }
+ virtual bool CanHibernate() { return false; }
virtual bool CanReboot() { return true; }
virtual int BatteryLevel() { return 0; }