Merge pull request #35 from phunkyfish/api-change

Recompile for 6.1.0 PVR Addon API compatibility
2025-12-27 07:11:04 +01:00 · 2019-09-03 19:58:50 +02:00 · 2019-09-03 16:56:33 +01:00 · 2019-08-08 18:12:31 +02:00 · 2019-08-07 22:39:55 +01:00 · 2019-05-10 23:37:27 +02:00
6 changed files with 3 additions and 6 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,12 +6,10 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 enable_language(CXX)
 find_package(Kodi REQUIRED)
 find_package(kodiplatform REQUIRED)
 find_package(p8-platform REQUIRED)
 find_package(JsonCpp REQUIRED)
 include_directories(
 	${kodiplatform_INCLUDE_DIRS}
 	${p8-platform_INCLUDE_DIRS}
 	${KODI_INCLUDE_DIR}
 	${JSONCPP_INCLUDE_DIRS})
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: kodi-pvr-octonet
 Priority: extra
 Maintainer: Julian Scheel <julian@jusst.de>
 Build-Depends: debhelper (>= 9.0.0), cmake, libjsoncpp-dev,
-               libkodiplatform-dev (>= 16.0.0), kodi-addon-dev
+               libp8-platform-dev, kodi-addon-dev
 Standards-Version: 3.9.4
 Section: libs
 Homepage: https://github.com/DigitalDevices/pvr.octonet
--- a/depends/common/jsoncpp/jsoncpp.sha256
+++ b/depends/common/jsoncpp/jsoncpp.sha256
@@ -0,0 +1 @@
 3671ba6051e0f30849942cc66d1798fdf0362d089343a83f704c09ee7156604f
--- a/pvr.octonet/addon.xml.in
+++ b/pvr.octonet/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
 	id="pvr.octonet"
-	version="1.0.0"
+	version="1.2.0"
 	name="Digital Devices Octopus NET Client"
 	provider-name="digitaldevices">
 	<requires>@ADDON_DEPENDS@</requires>
--- a/src/OctonetData.cpp
+++ b/src/OctonetData.cpp
@@ -26,7 +26,6 @@
 #include <json/json.h>
 #include "OctonetData.h"
 #include "p8-platform/util/StringUtils.h"
 #ifdef __WINDOWS__
 #define timegm _mkgmtime
--- a/src/OctonetData.h
+++ b/src/OctonetData.h
@@ -25,7 +25,6 @@
 #include <vector>
 #include "p8-platform/threads/threads.h"
 #include "p8-platform/util/StdString.h"
 #include "client.h"
 struct OctonetEpgEntry
Author	SHA1	Message	Date
Kai Sommerfeld	14d3e9d225	Merge pull request #35 from phunkyfish/api-change Recompile for 6.1.0 PVR Addon API compatibility	2019-09-03 19:58:50 +02:00
phunkyfish	cf9ee98727	Recompile for 6.1.0 PVR Addon API compatibility	2019-09-03 16:56:33 +01:00
Kai Sommerfeld	9d98f2bba4	Merge pull request #29 from enen92/Matrix [pvr.octonet] 1.1.0	2019-08-08 18:12:31 +02:00
enen92	ca692f14be	[pvr.octonet] 1.1.0	2019-08-07 22:39:55 +01:00
Kai Sommerfeld	69da8dbd0c	Merge pull request #28 from ksooo/fixWindows-matrix Fix windows matrix	2019-05-10 23:37:27 +02:00
Rechi	6d4f3847c7	[cleanup] remove unused includes this fixes windows build failures	2019-05-10 23:36:06 +02:00
Rechi	38e25e1f1c	[depends] jsoncpp: add checksum file	2019-05-10 23:36:06 +02:00
Kai Sommerfeld	472dc2beae	Merge pull request #27 from olafhering/kodiplatform [cmake] remove usage of kodi-platform	2019-05-10 23:31:20 +02:00
Olaf Hering	ec08c20540	[cmake] remove usage of kodi-platform The pvr.octonet binary addon does not use kodi-platform. Remove existing references from CMakeLists.txt and debian/control. Add dependency to libp8-platform-dev because libkodiplatform-dev pulled that dependency in as a side effect. Fix that bug too by adding an explicit dependency. Signed-off-by: Olaf Hering <olaf@aepfle.de>	2019-04-28 12:34:56 +00:00
		`@@ -0,0 +1 @@`
							`3671ba6051e0f30849942cc66d1798fdf0362d089343a83f704c09ee7156604f`