Merge pull request #427 from AlwinEsch/Leia-change

[Leia] update CMakeLists.txt to 3.5, change header include and increase version to 4.4.19
kodi-pvr · Aug 29, 2019 · d5488d2 · d5488d2
2 parents d301b2b + 6d99ff5
commit d5488d2
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 23 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,16 +1,13 @@
+cmake_minimum_required(VERSION 3.5)
 project(pvr.hts)
 
-cmake_minimum_required(VERSION 2.6)
-
-enable_language(CXX)
-
 find_package(Kodi REQUIRED)
 find_package(kodiplatform REQUIRED)
 find_package(p8-platform REQUIRED)
 
 include_directories(${kodiplatform_INCLUDE_DIRS}
                     ${p8-platform_INCLUDE_DIRS}
-                    ${KODI_INCLUDE_DIR}
+                    ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
                     ${PROJECT_SOURCE_DIR}/lib)
 
 add_definitions(-DUSE_DEMUX)

diff --git a/lib/libhts/CMakeLists.txt b/lib/libhts/CMakeLists.txt
@@ -1,9 +1,6 @@
+cmake_minimum_required(VERSION 3.5)
 PROJECT(hts)
 
-ENABLE_LANGUAGE(C)
-
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
 SET(SOURCES htsbuf.c
             htsmsg_binary.c
             htsmsg.c

diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="4.4.18"
+  version="4.4.19"
   name="Tvheadend HTSP Client"
   provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt
@@ -1,3 +1,7 @@
+4.4.19
+- Update build system version and cleanup
+- Change kodi header include way
+
 4.4.18
 - Predictive tuning: Fix unability to retune to a channel that was closed immediately before.
 

diff --git a/src/client.cpp b/src/client.cpp
@@ -20,8 +20,8 @@
  */
 
 #include "client.h"
-#include "xbmc_pvr_dll.h"
-#include "libKODI_guilib.h"
+#include "kodi/xbmc_pvr_dll.h"
+#include "kodi/libKODI_guilib.h"
 #include "p8-platform/util/util.h"
 #include "Tvheadend.h"
 #include "tvheadend/Settings.h"

diff --git a/src/client.h b/src/client.h
@@ -22,8 +22,8 @@
  */
 
 #include "p8-platform/os.h"
-#include "libXBMC_addon.h"
-#include "libXBMC_pvr.h"
+#include "kodi/libXBMC_addon.h"
+#include "kodi/libXBMC_pvr.h"
 
 extern ADDON::CHelper_libXBMC_addon*  XBMC;
 extern CHelper_libXBMC_pvr*           PVR;
diff --git a/src/tvheadend/AutoRecordings.h b/src/tvheadend/AutoRecordings.h
@@ -29,7 +29,7 @@ extern "C"
 #include "libhts/htsmsg.h"
 }
 
-#include "libXBMC_pvr.h"
+#include "kodi/libXBMC_pvr.h"
 #include "entity/AutoRecording.h"
 
 namespace tvheadend

diff --git a/src/tvheadend/HTSPConnection.h b/src/tvheadend/HTSPConnection.h
@@ -29,7 +29,7 @@ extern "C" {
 #include "libhts/htsmsg.h"
 }
 
-#include "libXBMC_pvr.h"
+#include "kodi/libXBMC_pvr.h"
 
 #include "p8-platform/sockets/tcp.h"
 #include "p8-platform/threads/mutex.h"

diff --git a/src/tvheadend/HTSPDemuxer.h b/src/tvheadend/HTSPDemuxer.h
@@ -32,7 +32,7 @@ extern "C" {
 #include "libhts/htsmsg.h"
 }
 
-#include "libXBMC_pvr.h"
+#include "kodi/libXBMC_pvr.h"
 
 #include "p8-platform/threads/mutex.h"
 #include "p8-platform/util/buffer.h"

diff --git a/src/tvheadend/HTSPTypes.h b/src/tvheadend/HTSPTypes.h
@@ -27,7 +27,7 @@
 #include <string>
 #include <vector>
 
-#include "libXBMC_pvr.h"
+#include "kodi/libXBMC_pvr.h"
 
 #include "entity/Event.h"
 

diff --git a/src/tvheadend/Settings.h b/src/tvheadend/Settings.h
@@ -24,7 +24,7 @@
 #include <string>
 
 #include "HTSPTypes.h"
-#include "xbmc_addon_types.h"
+#include "kodi/xbmc_addon_types.h"
 
 namespace tvheadend {
 

diff --git a/src/tvheadend/TimeRecordings.h b/src/tvheadend/TimeRecordings.h
@@ -29,7 +29,7 @@ extern "C"
 #include "libhts/htsmsg.h"
 }
 
-#include "libXBMC_pvr.h"
+#include "kodi/libXBMC_pvr.h"
 #include "entity/TimeRecording.h"
 
 namespace tvheadend

diff --git a/src/tvheadend/entity/Event.cpp b/src/tvheadend/entity/Event.cpp
@@ -22,7 +22,7 @@
 #include "Event.h"
 
 #include "p8-platform/util/StringUtils.h"
-#include "xbmc_epg_types.h"
+#include "kodi/xbmc_epg_types.h"
 
 using namespace tvheadend::entity;
 

diff --git a/src/tvheadend/entity/Recording.h b/src/tvheadend/entity/Recording.h
@@ -24,7 +24,7 @@
 #include <algorithm>
 #include <map>
 #include <string>
-#include "xbmc_pvr_types.h"
+#include "kodi/xbmc_pvr_types.h"
 #include "Entity.h"
 #include "../utilities/LifetimeMapper.h"
 

diff --git a/src/tvheadend/status/DescrambleInfo.cpp b/src/tvheadend/status/DescrambleInfo.cpp
@@ -21,7 +21,7 @@
 
 #include "DescrambleInfo.h"
 
-#include "xbmc_pvr_types.h"
+#include "kodi/xbmc_pvr_types.h"
 
 using namespace tvheadend::status;