[SCM] xbmc/master: Fix suspend/hibernate with upower >= 0.99.1

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b88aafa722496fe779fd460cc4626a4c380ea56d
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Tue Oct 28 21:16:55 2014 +0100

    Fix suspend/hibernate with upower >= 0.99.1
    
    Closes: #767161

diff --git a/debian/patches/0018-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch b/debian/patches/0018-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch
new file mode 100644
index 0000000..b14881d
--- /dev/null
+++ b/debian/patches/0018-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch
@@ -0,0 +1,30 @@
+From c6ae8568b99785465d1461c8878cdee08ff44eae Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint at balintreczey.hu>
+Date: Tue, 4 Nov 2014 00:13:21 +0100
+Subject: [PATCH] linux: Check for Logind first, then *Kit-s with UPower when
+ detecting PM framework
+
+Logind is the most likely candidate to work nowadays and latest UPower does
+not provide susend/hibernate API.
+---
+ xbmc/powermanagement/PowerManager.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/xbmc/powermanagement/PowerManager.cpp
++++ b/xbmc/powermanagement/PowerManager.cpp
+@@ -78,12 +78,12 @@
+   m_instance = new CAndroidPowerSyscall();
+ #elif defined(TARGET_POSIX)
+ #if defined(HAS_DBUS)
+-  if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
++  if (CLogindUPowerSyscall::HasLogind())
++    m_instance = new CLogindUPowerSyscall();
++  else if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
+     m_instance = new CConsoleUPowerSyscall();
+   else if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit())
+     m_instance = new CConsoleDeviceKitPowerSyscall();
+-  else if (CLogindUPowerSyscall::HasLogind())
+-    m_instance = new CLogindUPowerSyscall();
+   else if (CUPowerSyscall::HasUPower())
+     m_instance = new CUPowerSyscall();
+ #if defined(HAS_HAL)
diff --git a/debian/patches/series b/debian/patches/series
index 89523c2..416fcf5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,6 +12,7 @@
 0014-mips-Don-t-use-ASM-round-and-truncate-on-MIPS.patch
 0016-mips-Fix-build-with-using-OpenGL-rendering.patch
 0017-libav-Fix-uninitialized-read.patch
+0018-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch
 03-privacy.patch
 04-differentiate-from-vanilla-XBMC.patch
 05-Fix-GLES-with-X11.patch
@@ -20,3 +21,4 @@
 08-armel.patch
 09-use-correct-ftgl.h
 11-fix-vdpau-include.patch                                                                           
+

-- 
xbmc packaging