Merge pull request #8 from hudokkow/platform

Switch to libplatform
kodi-pvr · May 5, 2015 · 933482c · 933482c
2 parents 413fe9e + 66af2b6
commit 933482c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,13 +8,15 @@ enable_language(CXX)
 
 find_package(kodi REQUIRED)
 find_package(kodiplatform REQUIRED)
+find_package(platform REQUIRED)
 find_package(JsonCpp REQUIRED)
 
 include_directories(${kodiplatform_INCLUDE_DIRS}
+                    ${platform_INCLUDE_DIRS}
                     ${JSONCPP_INCLUDE_DIRS}
                     ${KODI_INCLUDE_DIR})
 
-set(DEPLIBS ${kodiplatform_LIBRARIES} ${JSONCPP_LIBRARIES})
+set(DEPLIBS ${platform_LIBRARIES} ${JSONCPP_LIBRARIES})
 
 set(FILMON_SOURCES src/client.cpp
                    src/FilmonAPI.cpp

diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: kodi-pvr-filmon
 Priority: extra
 Maintainer: Nobody <nobody@kodi.tv>
 Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml-dev, kodi-pvr-dev,
-               libkodiplatform-dev, kodi-addon-dev, libjsoncpp-dev
+               libkodiplatform-dev (>= 16.0.0), kodi-addon-dev, libjsoncpp-dev
 Standards-Version: 3.9.4
 Section: libs
 

diff --git a/pvr.filmon/addon.xml b/pvr.filmon/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.filmon"
-  version="0.5.4"
+  version="0.5.5"
   name="PVR Filmon Client"
   provider-name="Stephen Denham">
   <requires>

diff --git a/pvr.filmon/changelog.txt b/pvr.filmon/changelog.txt
@@ -1,3 +1,6 @@
+0.5.5
+Updated to use new libplatform-dev
+
 0.5.4
 Updated to API v1.9.6
 

diff --git a/src/FilmonAPI.cpp b/src/FilmonAPI.cpp
@@ -28,7 +28,7 @@
 
 #include <json/json.h>
 
-#include "kodi/util/timeutils.h" // for usleep
+#include "platform/util/timeutils.h" // for usleep
 
 #include "FilmonAPI.h"
 #include "client.h"

diff --git a/src/PVRFilmonData.h b/src/PVRFilmonData.h
@@ -22,8 +22,8 @@
  */
 
 #include <vector>
-#include "kodi/util/StdString.h"
-#include "kodi/threads/mutex.h"
+#include "platform/util/StdString.h"
+#include "platform/threads/mutex.h"
 #include "client.h"
 #include "kodi/libXBMC_pvr.h"
 #include "FilmonAPI.h"

diff --git a/src/client.cpp b/src/client.cpp
@@ -22,7 +22,7 @@
 
 #include "client.h"
 
-#include "kodi/util/util.h"
+#include "platform/util/util.h"
 #include "PVRFilmonData.h"
 #include "kodi/xbmc_pvr_dll.h"
 #include "kodi/libKODI_guilib.h"