da3a5b45cb
Added patch series from upstream PR 127 to remove the dependency to kodi-platform, switch dependency to kodi. Added missing dependency to tinyxml. Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
75 lines
2.9 KiB
Diff
75 lines
2.9 KiB
Diff
From e78eb2db7c42e302713d5e7129603e56d0e9b43b Mon Sep 17 00:00:00 2001
|
|
From: phunkyfish <phunkyfish@gmail.com>
|
|
Date: Thu, 8 Oct 2020 16:11:19 +0100
|
|
Subject: [PATCH] Remove p8-platform dependency
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
---
|
|
CMakeLists.txt | 7 ++-----
|
|
debian/control | 2 +-
|
|
depends/common/p8-platform/p8-platform.txt | 1 -
|
|
depends/windowsstore/p8-platform/p8-platform.txt | 1 -
|
|
4 files changed, 3 insertions(+), 8 deletions(-)
|
|
delete mode 100644 depends/common/p8-platform/p8-platform.txt
|
|
delete mode 100644 depends/windowsstore/p8-platform/p8-platform.txt
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 1226685..f612570 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -4,7 +4,6 @@ project(pvr.mediaportal.tvserver)
|
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
|
|
|
|
find_package(Kodi REQUIRED)
|
|
-find_package(p8-platform REQUIRED)
|
|
find_package(TinyXML REQUIRED)
|
|
|
|
set(LIVE555_INCLUDE_DIR
|
|
@@ -17,8 +16,7 @@ set(LIVE555_INCLUDE_DIR
|
|
|
|
set(LIVE555_DEFINES -DLIVE555 -D_WINSOCK_DEPRECATED_NO_WARNINGS -DSOCKLEN_T=socklen_t -DBSD=1)
|
|
|
|
-include_directories(${p8-platform_INCLUDE_DIRS}
|
|
- ${TINYXML_INCLUDE_DIR}
|
|
+include_directories(${TINYXML_INCLUDE_DIR}
|
|
${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
|
|
${PROJECT_SOURCE_DIR}/src
|
|
${PROJECT_BINARY_DIR}
|
|
@@ -229,8 +227,7 @@ source_group("Header Files\\lib\\live555" FILES ${LIVE555_HEADERS})
|
|
# Make sure that CMake adds all files to the MSVC project
|
|
list(APPEND MPTV_SOURCES ${MPTV_HEADERS} ${TSREADER_SOURCES} ${TSREADER_HEADERS} ${LIVE555_SOURCES} ${LIVE555_HEADERS})
|
|
|
|
-set(DEPLIBS ${p8-platform_LIBRARIES}
|
|
- ${TINYXML_LIBRARIES})
|
|
+set(DEPLIBS ${TINYXML_LIBRARIES})
|
|
|
|
if(WIN32)
|
|
list(APPEND DEPLIBS ws2_32)
|
|
diff --git a/debian/control b/debian/control
|
|
index 667e47c..e81ff45 100644
|
|
--- a/debian/control
|
|
+++ b/debian/control
|
|
@@ -2,7 +2,7 @@ Source: kodi-pvr-mediaportal-tvserver
|
|
Priority: extra
|
|
Maintainer: Nobody <nobody@kodi.tv>
|
|
Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml-dev,
|
|
- libp8-platform-dev, kodi-addon-dev
|
|
+ kodi-addon-dev
|
|
Standards-Version: 4.1.2
|
|
Section: libs
|
|
Homepage: http://kodi.tv
|
|
diff --git a/depends/common/p8-platform/p8-platform.txt b/depends/common/p8-platform/p8-platform.txt
|
|
deleted file mode 100644
|
|
index 98ed58a..0000000
|
|
--- a/depends/common/p8-platform/p8-platform.txt
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-p8-platform https://github.com/xbmc/platform.git cee64e9dc0b69e8d286dc170a78effaabfa09c44
|
|
diff --git a/depends/windowsstore/p8-platform/p8-platform.txt b/depends/windowsstore/p8-platform/p8-platform.txt
|
|
deleted file mode 100644
|
|
index db6f782..0000000
|
|
--- a/depends/windowsstore/p8-platform/p8-platform.txt
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-p8-platform https://github.com/afedchin/platform.git win10
|