From 6133a205f7f708fa46e9eb7fd4e6ca7be0a22f65 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sat, 24 Aug 2019 00:23:08 +0200 Subject: [PATCH 1/3] update CMakeLists.txt to 3.5 --- CMakeLists.txt | 5 +---- lib/libhts/CMakeLists.txt | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c95475e3..a5102acb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,6 @@ +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) diff --git a/lib/libhts/CMakeLists.txt b/lib/libhts/CMakeLists.txt index 1cb73926..8e274695 100644 --- 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 From d6c81cc80c1cdd99f5583e94263550ac2de806a1 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sat, 24 Aug 2019 00:29:05 +0200 Subject: [PATCH 2/3] change header include to start with "kodi/" This needed for reworked header checks by Kodi's addon build system. --- CMakeLists.txt | 2 +- src/client.cpp | 4 ++-- src/client.h | 4 ++-- src/tvheadend/AutoRecordings.h | 2 +- src/tvheadend/HTSPConnection.h | 2 +- src/tvheadend/HTSPDemuxer.h | 2 +- src/tvheadend/HTSPTypes.h | 2 +- src/tvheadend/Settings.h | 2 +- src/tvheadend/TimeRecordings.h | 2 +- src/tvheadend/entity/Event.cpp | 2 +- src/tvheadend/entity/Recording.h | 2 +- src/tvheadend/status/DescrambleInfo.cpp | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5102acb..09d8acf2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ 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/src/client.cpp b/src/client.cpp index 7c795e2c..9cc8abb9 100644 --- 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 index 514968d5..55245fde 100644 --- 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 index 187aa337..7af603a4 100644 --- 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 index 7e9d655a..0f685ba2 100644 --- 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 index 69332109..6e4a3e95 100644 --- 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 index b6f760ec..3a2c6014 100644 --- a/src/tvheadend/HTSPTypes.h +++ b/src/tvheadend/HTSPTypes.h @@ -27,7 +27,7 @@ #include #include -#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 index 4c44c10b..30b14894 100644 --- a/src/tvheadend/Settings.h +++ b/src/tvheadend/Settings.h @@ -24,7 +24,7 @@ #include #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 index 284a06d3..495424b2 100644 --- 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 index 2c02f2b5..db674100 100644 --- 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 index 1537f845..a5a9960c 100644 --- a/src/tvheadend/entity/Recording.h +++ b/src/tvheadend/entity/Recording.h @@ -24,7 +24,7 @@ #include #include #include -#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 index 016cbddb..ed76a4ec 100644 --- 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; From 6d99ff588ccfa5dea43dc9d31a5b17dace915950 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sat, 24 Aug 2019 00:32:10 +0200 Subject: [PATCH 3/3] increase version to 4.4.19 --- pvr.hts/addon.xml.in | 2 +- pvr.hts/changelog.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in index 078eac77..30f9c01c 100644 --- a/pvr.hts/addon.xml.in +++ b/pvr.hts/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt index 457e3f5c..e69918fe 100644 --- 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.