Merge pull request #12383 from pkerling/dbus-cleanup

DeviceKit cleanup
xbmc · Jul 7, 2017 · 734cda1 · 734cda1
2 parents bd51921 + e3f3887
commit 734cda1
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 671 deletions.
diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp
@@ -49,7 +49,6 @@
 #include "linux/FallbackPowerSyscall.h"
 #if defined(HAS_DBUS)
 #include "linux/ConsoleUPowerSyscall.h"
-#include "linux/ConsoleDeviceKitPowerSyscall.h"
 #include "linux/LogindUPowerSyscall.h"
 #include "linux/UPowerSyscall.h"
 #endif // HAS_DBUS
@@ -92,8 +91,6 @@ void CPowerManager::Initialize()
   {
     std::make_pair(CConsoleUPowerSyscall::HasConsoleKitAndUPower,
                    [] { return new CConsoleUPowerSyscall(); }),
-    std::make_pair(CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit,
-                   [] { return new CConsoleDeviceKitPowerSyscall(); }),
     std::make_pair(CLogindUPowerSyscall::HasLogind,
                    [] { return new CLogindUPowerSyscall(); }),
     std::make_pair(CUPowerSyscall::HasUPower,

diff --git a/xbmc/powermanagement/linux/CMakeLists.txt b/xbmc/powermanagement/linux/CMakeLists.txt
@@ -1,10 +1,8 @@
-set(SOURCES ConsoleDeviceKitPowerSyscall.cpp
-            ConsoleUPowerSyscall.cpp
+set(SOURCES ConsoleUPowerSyscall.cpp
             UPowerSyscall.cpp
             LogindUPowerSyscall.cpp)
 
-set(HEADERS ConsoleDeviceKitPowerSyscall.h
-            ConsoleUPowerSyscall.h
+set(HEADERS ConsoleUPowerSyscall.h
             FallbackPowerSyscall.h
             LogindUPowerSyscall.h
             UPowerSyscall.h)

diff --git a/xbmc/powermanagement/linux/ConsoleDeviceKitPowerSyscall.cpp b/xbmc/powermanagement/linux/ConsoleDeviceKitPowerSyscall.cpp
diff --git a/xbmc/powermanagement/linux/ConsoleDeviceKitPowerSyscall.h b/xbmc/powermanagement/linux/ConsoleDeviceKitPowerSyscall.h
diff --git a/xbmc/storage/linux/CMakeLists.txt b/xbmc/storage/linux/CMakeLists.txt
@@ -1,13 +1,17 @@
-set(SOURCES DeviceKitDisksProvider.cpp
-            UDisksProvider.cpp)
+set(SOURCES "")
 
-set(HEADERS DeviceKitDisksProvider.h
-            LinuxStorageProvider.h
-            UDisksProvider.h)
+set(HEADERS LinuxStorageProvider.h)
+
+if(DBUS_FOUND)
+  list(APPEND SOURCES UDisksProvider.cpp)
+  list(APPEND HEADERS UDisksProvider.h)
+endif()
 
 if(UDEV_FOUND)
   list(APPEND SOURCES UDevProvider.cpp)
   list(APPEND HEADERS UDevProvider.h)
 endif()
 
-core_add_library(storage_linux)
+if(SOURCES)
+  core_add_library(storage_linux)
+endif()