Merge pull request #6 from FernetMenta/sync

adapt to move of platform sources
kodi-pvr · May 5, 2015 · 4c6ef26 · 4c6ef26
2 parents 3a28e39 + 2ffd0f3
commit 4c6ef26
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,6 +8,7 @@ enable_language(CXX)
 
 find_package(kodi REQUIRED)
 find_package(kodiplatform REQUIRED)
+find_package(platform REQUIRED)
 
 add_definitions(-DUSE_DEMUX)
 
@@ -56,13 +57,14 @@ list(APPEND VDR_SOURCES src/client.cpp
                         src/VNSIRecording.cpp
                         src/VNSISession.cpp)
 
-list(APPEND DEPLIBS ${kodiplatform_LIBRARIES})
+list(APPEND DEPLIBS ${platform_LIBRARIES})
 if(WIN32)
   list(APPEND DEPLIBS ws2_32)
 endif()
 
 include_directories(${INCLUDES}
                     ${kodiplatform_INCLUDE_DIRS}
+                    ${platform_INCLUDE_DIRS}
                     ${KODI_INCLUDE_DIR})
 
 build_addon(pvr.vdr.vnsi VDR DEPLIBS)

diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: kodi-pvr-vdr-vnsi
 Priority: extra
 Maintainer: fernetmenta <fernetmenta@kodi.tv>
 Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml-dev, kodi-pvr-dev,
-               libkodiplatform-dev, kodi-addon-dev,
+               libkodiplatform-dev (>= 16.0.0), kodi-addon-dev,
                libgles2-mesa-dev [arm], libgl1-mesa-dev [i386 amd64], pkg-config
 Standards-Version: 3.9.4
 Section: libs

diff --git a/pvr.vdr.vnsi/addon.xml b/pvr.vdr.vnsi/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.vdr.vnsi"
-  version="1.10.4"
+  version="1.10.5"
   name="VDR VNSI Client"
   provider-name="FernetMenta, Team XBMC">
   <requires>

diff --git a/src/VNSIData.cpp b/src/VNSIData.cpp
@@ -23,7 +23,7 @@
 #include "responsepacket.h"
 #include "requestpacket.h"
 #include "vnsicommand.h"
-#include "kodi/util/StdString.h"
+#include "platform/util/StdString.h"
 
 using namespace ADDON;
 using namespace PLATFORM;

diff --git a/src/VNSISession.cpp b/src/VNSISession.cpp
@@ -31,8 +31,8 @@
 #include "requestpacket.h"
 #include "vnsicommand.h"
 #include "tools.h"
-#include "kodi/sockets/tcp.h"
-#include "kodi/util/timeutils.h"
+#include "platform/sockets/tcp.h"
+#include "platform/util/timeutils.h"
 
 /* Needed on Mac OS/X */
 

diff --git a/src/VNSISession.h b/src/VNSISession.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <string>
-#include "kodi/threads/threads.h"
+#include "platform/threads/threads.h"
 
 
 class cResponsePacket;

diff --git a/src/client.cpp b/src/client.cpp
@@ -26,7 +26,7 @@
 #include "VNSIData.h"
 #include "VNSIChannelScan.h"
 #include "VNSIAdmin.h"
-#include "kodi/util/util.h"
+#include "platform/util/util.h"
 
 #include <sstream>
 #include <string>

diff --git a/src/requestpacket.cpp b/src/requestpacket.cpp
@@ -26,7 +26,7 @@
 #include "requestpacket.h"
 #include "vnsicommand.h"
 #include "tools.h"
-#include "kodi/sockets/tcp.h"
+#include "platform/sockets/tcp.h"
 
 uint32_t cRequestPacket::serialNumberCounter = 1;