Merge pull request #475 from ksooo/7-1-5

7.2.1: Fixes and p8-platform removal

.clang-format

@@ -44,7 +44,7 @@ IncludeCategories:
     Priority:        3
   - Regex:           '^<'
     Priority:        3
-  - Regex:           '^["<](kodi|p8-platform)\/.*\.h[">]$'
+  - Regex:           '^["<](kodi)\/.*\.h[">]$'
     Priority:        2
   - Regex:           '.*'
     Priority:        1

CMakeLists.txt

@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 3.5)
 project(pvr.hts)
 
 find_package(Kodi REQUIRED)
-find_package(p8-platform REQUIRED)
 
-include_directories(${p8-platform_INCLUDE_DIRS}
-                    ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
+set(CMAKE_CXX_STANDARD 17)
+
+include_directories(${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
                     ${PROJECT_SOURCE_DIR}/lib)
 
 # Sources and headers
@@ -68,7 +68,10 @@ set(HTS_SOURCES_TVHEADEND_UTILITIES
                 src/tvheadend/utilities/Logger.cpp
                 src/tvheadend/utilities/LifetimeMapper.h
                 src/tvheadend/utilities/AsyncState.cpp
-                src/tvheadend/utilities/AsyncState.h)
+                src/tvheadend/utilities/AsyncState.h
+                src/tvheadend/utilities/SyncedBuffer.h
+                src/tvheadend/utilities/TCPSocket.h
+                src/tvheadend/utilities/TCPSocket.cpp)
 
 source_group("Source Files" FILES ${HTS_SOURCES})
 source_group("Source Files\\tvheadend" FILES ${HTS_SOURCES_TVHEADEND})
@@ -94,12 +97,10 @@ list(APPEND HTS_SOURCES
             ${HTS_SOURCES_TVHEADEND_STATUS}
             ${HTS_SOURCES_TVHEADEND_UTILITIES})
 
-add_subdirectory(lib/libhts)
+add_subdirectory(lib/libhts
+                 lib/kissnet)
 
-set(DEPLIBS ${p8-platform_LIBRARIES} hts)
-if(WIN32)
-  list(APPEND DEPLIBS ws2_32)
-endif()
+set(DEPLIBS hts)
 
 build_addon(pvr.hts HTS DEPLIBS)
 

debian/control

@@ -1,8 +1,7 @@
 Source: kodi-pvr-hts
 Priority: extra
 Maintainer: Nobody <[email protected]>
-Build-Depends: debhelper (>= 9.0.0), cmake, libp8-platform-dev,
-               kodi-addon-dev
+Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev
 Standards-Version: 4.1.2
 Section: libs