[kodi-pvr-vbox] Update to latest stable release for Kodi 18

commit a986e9dec6f0b407259fa3e078d391d1991c46bc Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; Date: Mon Mar 19 15:27:54 2018 +0100 Update to latest stable release for Kodi 18 .gitignore | 1 + ...4.patch => kodi-pvr-vbox-4.3.1-tinyxml2_6.patch | 32 +++++------ ...kodi-pvr-vbox-4.3.1-use_external_tinyxml2.patch | 62 ++++++++++++---------- kodi-pvr-vbox.spec | 37 ++++++------- sources | 2 +- 5 files changed, 67 insertions(+), 67 deletions(-) --- diff --git a/.gitignore b/.gitignore index 4da1d19..f948cb3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /kodi-pvr-vbox-adc6c34.tar.gz /kodi-pvr-vbox-35dd909.tar.gz +/pvr.vbox-57f3198.tar.gz diff --git a/kodi-pvr-vbox-3.6.12-tinyxml2_v4.patch b/kodi-pvr-vbox-4.3.1-tinyxml2_6.patch similarity index 59% rename from kodi-pvr-vbox-3.6.12-tinyxml2_v4.patch rename to kodi-pvr-vbox-4.3.1-tinyxml2_6.patch index 1e03ce9..02472bd 100644 --- a/kodi-pvr-vbox-3.6.12-tinyxml2_v4.patch +++ b/kodi-pvr-vbox-4.3.1-tinyxml2_6.patch @@ -1,6 +1,7 @@ ---- ./src/vbox/CategoryGenreMapper.cpp.orig -+++ ./src/vbox/CategoryGenreMapper.cpp -@@ -75,7 +75,7 @@ +diff -up ./src/vbox/CategoryGenreMapper.cpp.orig ./src/vbox/CategoryGenreMapper.cpp +--- ./src/vbox/CategoryGenreMapper.cpp.orig 2018-03-15 18:59:30.656263927 +0100 ++++ ./src/vbox/CategoryGenreMapper.cpp 2018-03-15 19:34:26.992655689 +0100 +@@ -75,7 +75,7 @@ bool CategoryGenreMapper::LoadCategoryTo std::unique_ptr<std::string> contents = utilities::ReadFileContents(fileHandle); // Try to parse the document @@ -9,10 +10,10 @@ throw vbox::InvalidXMLException("XML parsing failed: " + std::string(document.ErrorName())); // Create mappings - ---- ./src/vbox/GuideChannelMapper.cpp.orig -+++ ./src/vbox/GuideChannelMapper.cpp -@@ -88,7 +88,7 @@ +diff -up ./src/vbox/GuideChannelMapper.cpp.orig ./src/vbox/GuideChannelMapper.cpp +--- ./src/vbox/GuideChannelMapper.cpp.orig 2018-03-15 18:59:30.658263875 +0100 ++++ ./src/vbox/GuideChannelMapper.cpp 2018-03-15 19:34:26.993655657 +0100 +@@ -88,7 +88,7 @@ void GuideChannelMapper::Load() std::unique_ptr<std::string> contents = utilities::ReadFileContents(fileHandle); // Try to parse the document @@ -21,10 +22,10 @@ throw vbox::InvalidXMLException("XML parsing failed: " + std::string(document.ErrorName())); // Create mappings - ---- ./src/vbox/ReminderManager.cpp.orig -+++ ./src/vbox/ReminderManager.cpp -@@ -203,7 +203,7 @@ +diff -up ./src/vbox/ReminderManager.cpp.orig ./src/vbox/ReminderManager.cpp +--- ./src/vbox/ReminderManager.cpp.orig 2018-03-15 18:59:30.653264006 +0100 ++++ ./src/vbox/ReminderManager.cpp 2018-03-15 19:34:26.991655720 +0100 +@@ -203,7 +203,7 @@ void ReminderManager::Load() std::unique_ptr<std::string> contents = utilities::ReadFileContents(fileHandle); // Try to parse the document @@ -33,10 +34,10 @@ throw vbox::InvalidXMLException("XML parsing failed: " + std::string(document.ErrorName())); unsigned int minsBeforePop = g_vbox->GetSettings().m_remindMinsBeforeProg; - ---- ./src/vbox/response/Response.cpp.orig -+++ ./src/vbox/response/Response.cpp -@@ -43,7 +43,7 @@ +diff -up ./src/vbox/response/Response.cpp.orig ./src/vbox/response/Response.cpp +--- ./src/vbox/response/Response.cpp.orig 2018-02-05 09:22:59.000000000 +0100 ++++ ./src/vbox/response/Response.cpp 2018-03-15 19:34:26.994655626 +0100 +@@ -43,7 +43,7 @@ Response::~Response() void Response::ParseRawResponse(const std::string &rawResponse) { // Try to parse the response as XML @@ -45,4 +46,3 @@ throw vbox::InvalidXMLException("XML parsing failed: " + std::string(m_document->ErrorName())); // Parse the response status - diff --git a/kodi-pvr-vbox-3.6.10-use_external_tinyxml2.patch b/kodi-pvr-vbox-4.3.1-use_external_tinyxml2.patch similarity index 66% rename from kodi-pvr-vbox-3.6.10-use_external_tinyxml2.patch rename to kodi-pvr-vbox-4.3.1-use_external_tinyxml2.patch index 86dd9fe..79019a0 100644 --- a/kodi-pvr-vbox-3.6.10-use_external_tinyxml2.patch +++ b/kodi-pvr-vbox-4.3.1-use_external_tinyxml2.patch @@ -1,21 +1,20 @@ diff -up ./CMakeLists.txt.orig ./CMakeLists.txt ---- ./CMakeLists.txt.orig 2017-04-07 23:00:40.000000000 +0200 -+++ ./CMakeLists.txt 2017-04-29 01:13:03.211171351 +0200 -@@ -9,6 +9,13 @@ enable_language(CXX) +--- ./CMakeLists.txt.orig 2018-02-05 09:22:59.000000000 +0100 ++++ ./CMakeLists.txt 2018-03-15 18:55:50.576296020 +0100 +@@ -9,9 +9,12 @@ enable_language(CXX) find_package(Kodi REQUIRED) find_package(kodiplatform REQUIRED) find_package(p8-platform REQUIRED) +find_package(PkgConfig) +pkg_check_modules(TINYXML2 REQUIRED tinyxml2) -+ -+set(CFLAGS ${TINYXML2_CFLAGS} ${TINYXML2_CFLAGS_OTHERS}) -+add_definitions(${CFLAGS}) -+set(LIBS ${TINYXML2_CFLAGS} ${TINYXML2_LIBRARIES}) -+link_libraries(${LIBS}) include_directories(${kodiplatform_INCLUDE_DIRS} ${p8-platform_INCLUDE_DIRS} -@@ -87,13 +94,6 @@ source_group("Source Files\\vbox\\respon ++ ${TINYXML2_INCLUDE_DIRS} + ${KODI_INCLUDE_DIR} + ${PROJECT_SOURCE_DIR}) + +@@ -87,13 +90,6 @@ source_group("Source Files\\vbox\\respon source_group("Source Files\\timeshift" FILES ${VBOX_SOURCES_TIMESHIFT}) source_group("Source Files\\xmltv" FILES ${VBOX_SOURCES_XMLTV}) @@ -29,19 +28,24 @@ diff -up ./CMakeLists.txt.orig ./CMakeLists.txt # Resource files set(VBOX_RESOURCES README.md -@@ -113,8 +113,7 @@ list(APPEND VBOX_SOURCES +@@ -113,10 +109,11 @@ list(APPEND VBOX_SOURCES ${VBOX_SOURCES_VBOX_RESPONSE} ${VBOX_SOURCES_TIMESHIFT} ${VBOX_SOURCES_XMLTV} - ${VBOX_RESOURCES} - ${VBOX_LIBRARIES_TINYXML2}) + ${VBOX_RESOURCES}) ++ ++set(DEPLIBS ${p8-platform_LIBRARIES} ++ ${TINYXML2_LIBRARIES}) - set(DEPLIBS ${p8-platform_LIBRARIES}) +-set(DEPLIBS ${p8-platform_LIBRARIES}) build_addon(pvr.vbox VBOX DEPLIBS) + + include(CPack) diff -up ./src/vbox/CategoryGenreMapper.cpp.orig ./src/vbox/CategoryGenreMapper.cpp ---- ./src/vbox/CategoryGenreMapper.cpp.orig 2017-04-07 23:00:40.000000000 +0200 -+++ ./src/vbox/CategoryGenreMapper.cpp 2017-04-29 01:09:33.213743702 +0200 +--- ./src/vbox/CategoryGenreMapper.cpp.orig 2018-02-05 09:22:59.000000000 +0100 ++++ ./src/vbox/CategoryGenreMapper.cpp 2018-03-15 18:59:30.656263927 +0100 @@ -20,7 +20,7 @@ */ #include "CategoryGenreMapper.h" @@ -52,8 +56,8 @@ diff -up ./src/vbox/CategoryGenreMapper.cpp.orig ./src/vbox/CategoryGenreMapper. #include "Utilities.h" #include "Exceptions.h" diff -up ./src/vbox/GuideChannelMapper.cpp.orig ./src/vbox/GuideChannelMapper.cpp ---- ./src/vbox/GuideChannelMapper.cpp.orig 2017-04-07 23:00:40.000000000 +0200 -+++ ./src/vbox/GuideChannelMapper.cpp 2017-04-29 01:09:33.213743702 +0200 +--- ./src/vbox/GuideChannelMapper.cpp.orig 2018-02-05 09:22:59.000000000 +0100 ++++ ./src/vbox/GuideChannelMapper.cpp 2018-03-15 18:59:30.658263875 +0100 @@ -21,7 +21,7 @@ #include "GuideChannelMapper.h" @@ -64,8 +68,8 @@ diff -up ./src/vbox/GuideChannelMapper.cpp.orig ./src/vbox/GuideChannelMapper.cp #include "Utilities.h" #include "../client.h" diff -up ./src/vbox/Reminder.cpp.orig ./src/vbox/Reminder.cpp ---- ./src/vbox/Reminder.cpp.orig 2017-04-07 23:00:40.000000000 +0200 -+++ ./src/vbox/Reminder.cpp 2017-04-29 01:09:33.213743702 +0200 +--- ./src/vbox/Reminder.cpp.orig 2018-02-05 09:22:59.000000000 +0100 ++++ ./src/vbox/Reminder.cpp 2018-03-15 18:59:30.666263664 +0100 @@ -21,7 +21,7 @@ #include "ContentIdentifier.h" #include "Reminder.h" @@ -76,8 +80,8 @@ diff -up ./src/vbox/Reminder.cpp.orig ./src/vbox/Reminder.cpp #include "Utilities.h" #include "Exceptions.h" diff -up ./src/vbox/ReminderManager.cpp.orig ./src/vbox/ReminderManager.cpp ---- ./src/vbox/ReminderManager.cpp.orig 2017-04-07 23:00:40.000000000 +0200 -+++ ./src/vbox/ReminderManager.cpp 2017-04-29 01:09:33.213743702 +0200 +--- ./src/vbox/ReminderManager.cpp.orig 2018-02-05 09:22:59.000000000 +0100 ++++ ./src/vbox/ReminderManager.cpp 2018-03-15 18:59:30.653264006 +0100 @@ -21,7 +21,7 @@ #include "ContentIdentifier.h" #include "ReminderManager.h" @@ -88,8 +92,8 @@ diff -up ./src/vbox/ReminderManager.cpp.orig ./src/vbox/ReminderManager.cpp #include "Utilities.h" #include "Exceptions.h" diff -up ./src/vbox/response/Content.cpp.orig ./src/vbox/response/Content.cpp ---- ./src/vbox/response/Content.cpp.orig 2017-04-07 23:00:40.000000000 +0200 -+++ ./src/vbox/response/Content.cpp 2017-04-29 01:09:33.213743702 +0200 +--- ./src/vbox/response/Content.cpp.orig 2018-02-05 09:22:59.000000000 +0100 ++++ ./src/vbox/response/Content.cpp 2018-03-15 18:59:30.661263796 +0100 @@ -21,7 +21,7 @@ #include "Content.h" @@ -100,8 +104,8 @@ diff -up ./src/vbox/response/Content.cpp.orig ./src/vbox/response/Content.cpp #include "../../xmltv/Utilities.h" #include "../../xmltv/Guide.h" diff -up ./src/vbox/response/Response.h.orig ./src/vbox/response/Response.h ---- ./src/vbox/response/Response.h.orig 2017-04-07 23:00:40.000000000 +0200 -+++ ./src/vbox/response/Response.h 2017-04-29 01:09:33.213743702 +0200 +--- ./src/vbox/response/Response.h.orig 2018-02-05 09:22:59.000000000 +0100 ++++ ./src/vbox/response/Response.h 2018-03-15 18:59:30.663263743 +0100 @@ -22,7 +22,7 @@ #include <memory> @@ -112,8 +116,8 @@ diff -up ./src/vbox/response/Response.h.orig ./src/vbox/response/Response.h namespace vbox { namespace response { diff -up ./src/xmltv/Guide.cpp.orig ./src/xmltv/Guide.cpp ---- ./src/xmltv/Guide.cpp.orig 2017-04-07 23:00:40.000000000 +0200 -+++ ./src/xmltv/Guide.cpp 2017-04-29 01:09:33.213743702 +0200 +--- ./src/xmltv/Guide.cpp.orig 2018-02-05 09:22:59.000000000 +0100 ++++ ./src/xmltv/Guide.cpp 2018-03-15 18:59:30.646264190 +0100 @@ -23,7 +23,7 @@ #include <algorithm> #include "Channel.h" @@ -124,8 +128,8 @@ diff -up ./src/xmltv/Guide.cpp.orig ./src/xmltv/Guide.cpp #include "../vbox/ContentIdentifier.h" diff -up ./src/xmltv/Programme.cpp.orig ./src/xmltv/Programme.cpp ---- ./src/xmltv/Programme.cpp.orig 2017-04-07 23:00:40.000000000 +0200 -+++ ./src/xmltv/Programme.cpp 2017-04-29 01:09:33.214743675 +0200 +--- ./src/xmltv/Programme.cpp.orig 2018-02-05 09:22:59.000000000 +0100 ++++ ./src/xmltv/Programme.cpp 2018-03-15 18:59:30.648264137 +0100 @@ -21,7 +21,7 @@ #include "Programme.h" @@ -136,8 +140,8 @@ diff -up ./src/xmltv/Programme.cpp.orig ./src/xmltv/Programme.cpp using namespace xmltv; using namespace tinyxml2; diff -up ./src/xmltv/Utilities.cpp.orig ./src/xmltv/Utilities.cpp ---- ./src/xmltv/Utilities.cpp.orig 2017-04-07 23:00:40.000000000 +0200 -+++ ./src/xmltv/Utilities.cpp 2017-04-29 01:09:33.214743675 +0200 +--- ./src/xmltv/Utilities.cpp.orig 2018-02-05 09:22:59.000000000 +0100 ++++ ./src/xmltv/Utilities.cpp 2018-03-15 18:59:30.651264058 +0100 @@ -21,7 +21,7 @@ #include "Utilities.h" diff --git a/kodi-pvr-vbox.spec b/kodi-pvr-vbox.spec index f4462b4..7f53f1e 100644 --- a/kodi-pvr-vbox.spec +++ b/kodi-pvr-vbox.spec @@ -1,26 +1,22 @@ -%global commit 35dd90995f22dc3cb854380a659384bcffb0c59c -%global short_commit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20170704 +%global commit 57f31984008bac8047b6d74d338980b6dd9ebd28 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20180205 %global kodi_addon pvr.vbox -%global kodi_version 17.0 +%global kodi_version 18.0 Name: kodi-%(tr "." "-" <<<%{kodi_addon}) -Version: 3.6.12 -Release: 3%{?dist} -Summary: Kodi VBox TV Gateway PVR addon +Version: 4.3.1 +Release: 1%{?dist} +Summary: VBox Home TV Gateway PVR client for Kodi -Group: Applications/Multimedia License: GPLv2+ URL: https://github.com/kodi-pvr/%{kodi_addon}/ -Source0: https://github.com/kodi-pvr/%{kodi_addon}/archive/%{short_commit}/%{name}... +Source0: https://github.com/kodi-pvr/%{kodi_addon}/archive/%{shortcommit}/%{kodi_a... # Use external tinyxml2 library -Patch0: %{name}-3.6.10-use_external_tinyxml2.patch - -%if 0%{?fedora} >= 28 -# Use XML_SUCCESS enum instead of XML_NO_ERROR, which has been deleted in tinyxml2 4.0 -Patch1: kodi-pvr-vbox-3.6.12-tinyxml2_v4.patch -%endif +Patch0: %{name}-4.3.1-use_external_tinyxml2.patch +# Fix build with tinyxml2 >= 6.0.0 +Patch1: %{name}-4.3.1-tinyxml2_6.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -32,10 +28,7 @@ Requires: kodi >= %{kodi_version} ExclusiveArch: i686 x86_64 %description -This is a PVR addon for interfacing with VBox Communications' XTi TV -Gateways. It supports all the basic functionality you would expect, such as -watching, recording and timeshifting. Additionally, it supports augmenting the -over-the-air guide data with external XMLTV data. +%{summary}. %prep @@ -46,7 +39,7 @@ rm -r lib/tinyxml2/ %build -%cmake -DCMAKE_INSTALL_LIBDIR=%{_libdir}/kodi/ . +%cmake . %make_build @@ -56,12 +49,14 @@ rm -r lib/tinyxml2/ %files %doc README.md %{kodi_addon}/changelog.txt -%license LICENSE.md %{_libdir}/kodi/addons/%{kodi_addon}/ %{_datadir}/kodi/addons/%{kodi_addon}/ %changelog +* Fri Mar 16 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 4.3.1-1 +- Update to latest stable release for Kodi 18 + * Mon Mar 12 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3.6.12-3 - Patch for new tinyxml2 diff --git a/sources b/sources index 80ab609..d341370 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe45d9ad6dd728bbcfa4941dcd34ac4c kodi-pvr-vbox-35dd909.tar.gz +ce0ba90dabb227d502947f35b7831a5d pvr.vbox-57f3198.tar.gz