Merge pull request #4 from hudokkow/platform

Switch to libplatform
kodi-pvr · May 5, 2015 · 92cb021 · 92cb021
2 parents 9e66fb4 + ebe128f
commit 92cb021
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,18 +8,20 @@ enable_language(CXX)
 
 find_package(kodi REQUIRED)
 find_package(kodiplatform REQUIRED)
+find_package(platform REQUIRED)
 find_package(TinyXML REQUIRED)
 find_package(JsonCpp REQUIRED)
 
 include_directories(${kodiplatform_INCLUDE_DIRS}
+                    ${platform_INCLUDE_DIRS}
                     ${KODI_INCLUDE_DIR}
                     ${PROJECT_SOURCE_DIR}/lib
                     ${TINYXML_INCLUDE_DIRS}
                     ${JSONCPP_INCLUDE_DIRS})
 
 add_subdirectory(lib/libstalkerclient)
 
-set(DEPLIBS ${kodiplatform_LIBRARIES} stalkerclient ${TINYXML_LIBRARIES} ${JSONCPP_LIBRARIES})
+set(DEPLIBS ${platform_LIBRARIES} stalkerclient ${TINYXML_LIBRARIES} ${JSONCPP_LIBRARIES})
 
 if(WIN32)
   list(APPEND DEPLIBS ws2_32)

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

diff --git a/pvr.stalker/addon.xml b/pvr.stalker/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.stalker"
-  version="0.7.0"
+  version="0.7.1"
   name="Stalker Client"
   provider-name="dvbken">
   <requires>

diff --git a/pvr.stalker/changelog.txt b/pvr.stalker/changelog.txt
@@ -1,3 +1,6 @@
+0.7.1 (05-05-2015)
+- updated to use new libplatform-dev
+
 0.7.0 (04-30-2015)
 - updated to PVR API version 1.9.6
 - isengard related changes

diff --git a/src/HTTPSocket.cpp b/src/HTTPSocket.cpp
@@ -22,7 +22,7 @@
 
 #include "HTTPSocket.h"
 
-#include "kodi/sockets/tcp.h"
+#include "platform/sockets/tcp.h"
 
 #include "client.h"
 

diff --git a/src/SAPI.cpp b/src/SAPI.cpp
@@ -24,7 +24,7 @@
 
 #include <algorithm>
 
-#include "kodi/os.h"
+#include "platform/os.h"
 
 #include "libstalkerclient/param.h"
 #include "libstalkerclient/stb.h"

diff --git a/src/SData.cpp b/src/SData.cpp
@@ -25,7 +25,7 @@
 #include <cmath>
 
 #include "tinyxml.h"
-#include "kodi/os.h"
+#include "platform/os.h"
 
 #include "SAPI.h"
 

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