[kodi-pvr-vbox] Update to 7.0.0 (switch to Matrix branch)

commit efb2bf78b0aaa719f4c323c07db7dd9620bd677c Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; Date: Thu Aug 20 15:53:27 2020 +0200 Update to 7.0.0 (switch to Matrix branch) .gitignore | 1 + kodi-pvr-vbox-4.7.0-use_external_tinyxml2.patch | 151 --------------------- ...6.patch => kodi-pvr-vbox-7.0.0-tinyxml2_6.patch | 32 ++--- kodi-pvr-vbox-7.0.0-use_external_tinyxml2.patch | 127 +++++++++++++++++ kodi-pvr-vbox.spec | 20 +-- sources | 2 +- 6 files changed, 149 insertions(+), 184 deletions(-) --- diff --git a/.gitignore b/.gitignore index fdb0987..4f0eddf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /pvr.vbox-57f3198.tar.gz /pvr.vbox-40ca81f.tar.gz /pvr.vbox-4.7.0.tar.gz +/pvr.vbox-7.0.0.tar.gz diff --git a/kodi-pvr-vbox-4.3.1-tinyxml2_6.patch b/kodi-pvr-vbox-7.0.0-tinyxml2_6.patch similarity index 50% rename from kodi-pvr-vbox-4.3.1-tinyxml2_6.patch rename to kodi-pvr-vbox-7.0.0-tinyxml2_6.patch index 02472bd..68aa62e 100644 --- a/kodi-pvr-vbox-4.3.1-tinyxml2_6.patch +++ b/kodi-pvr-vbox-7.0.0-tinyxml2_6.patch @@ -1,7 +1,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 +--- ./src/vbox/CategoryGenreMapper.cpp.orig 2020-08-20 13:48:11.371869147 +0000 ++++ ./src/vbox/CategoryGenreMapper.cpp 2020-08-20 13:50:46.233054071 +0000 +@@ -68,7 +68,7 @@ bool CategoryGenreMapper::LoadCategoryTo std::unique_ptr<std::string> contents = utilities::ReadFileContents(fileHandle); // Try to parse the document @@ -11,9 +11,9 @@ diff -up ./src/vbox/CategoryGenreMapper.cpp.orig ./src/vbox/CategoryGenreMapper. // Create mappings 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() +--- ./src/vbox/GuideChannelMapper.cpp.orig 2020-08-20 13:48:11.367869246 +0000 ++++ ./src/vbox/GuideChannelMapper.cpp 2020-08-20 13:50:46.230054145 +0000 +@@ -75,7 +75,7 @@ void GuideChannelMapper::Load() std::unique_ptr<std::string> contents = utilities::ReadFileContents(fileHandle); // Try to parse the document @@ -22,23 +22,11 @@ diff -up ./src/vbox/GuideChannelMapper.cpp.orig ./src/vbox/GuideChannelMapper.cp throw vbox::InvalidXMLException("XML parsing failed: " + std::string(document.ErrorName())); // Create mappings -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 -- if (document.Parse(contents->c_str(), contents->size()) != XML_NO_ERROR) -+ if (document.Parse(contents->c_str(), contents->size()) != XML_SUCCESS) - throw vbox::InvalidXMLException("XML parsing failed: " + std::string(document.ErrorName())); - - unsigned int minsBeforePop = g_vbox->GetSettings().m_remindMinsBeforeProg; 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) +--- ./src/vbox/response/Response.cpp.orig 2020-06-13 06:07:30.000000000 +0000 ++++ ./src/vbox/response/Response.cpp 2020-08-20 13:50:46.236053998 +0000 +@@ -32,7 +32,7 @@ Response::~Response() + void Response::ParseRawResponse(const std::string& rawResponse) { // Try to parse the response as XML - if (m_document->Parse(rawResponse.c_str(), rawResponse.size()) != XML_NO_ERROR) diff --git a/kodi-pvr-vbox-7.0.0-use_external_tinyxml2.patch b/kodi-pvr-vbox-7.0.0-use_external_tinyxml2.patch new file mode 100644 index 0000000..bf41f84 --- /dev/null +++ b/kodi-pvr-vbox-7.0.0-use_external_tinyxml2.patch @@ -0,0 +1,127 @@ +diff -up ./CMakeLists.txt.orig ./CMakeLists.txt +--- ./CMakeLists.txt.orig 2020-06-13 06:07:30.000000000 +0000 ++++ ./CMakeLists.txt 2020-08-20 13:45:23.978000867 +0000 +@@ -5,9 +5,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT + + find_package(Kodi REQUIRED) + find_package(p8-platform REQUIRED) ++find_package(PkgConfig) ++pkg_check_modules(TINYXML2 REQUIRED tinyxml2) + + include_directories(${p8-platform_INCLUDE_DIRS} + ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways ++ ${TINYXML2_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}) + + # Sources and headers +@@ -81,13 +84,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}) + +-# Library files +-set(VBOX_LIBRARIES_TINYXML2 +- lib/tinyxml2/tinyxml2.h +- lib/tinyxml2/tinyxml2.cpp) +- +-source_group("Library Files\\tinyxml2" FILES ${VBOX_LIBRARIES_TINYXML2}) +- + # Resource files + set(VBOX_RESOURCES + README.md +@@ -107,10 +103,9 @@ 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}) ++set(DEPLIBS ${p8-platform_LIBRARIES} ${TINYXML2_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 2020-06-13 06:07:30.000000000 +0000 ++++ ./src/vbox/CategoryGenreMapper.cpp 2020-08-20 13:48:11.371869147 +0000 +@@ -16,7 +16,7 @@ + + #include <kodi/General.h> + #include <kodi/addon-instance/pvr/EPG.h> +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + #include <p8-platform/util/StringUtils.h> + + // using namespace xmltv; +diff -up ./src/vbox/GuideChannelMapper.cpp.orig ./src/vbox/GuideChannelMapper.cpp +--- ./src/vbox/GuideChannelMapper.cpp.orig 2020-06-13 06:07:30.000000000 +0000 ++++ ./src/vbox/GuideChannelMapper.cpp 2020-08-20 13:48:11.367869246 +0000 +@@ -14,7 +14,7 @@ + + #include <memory> + +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + + using namespace vbox; + using namespace tinyxml2; +diff -up ./src/vbox/response/Content.cpp.orig ./src/vbox/response/Content.cpp +--- ./src/vbox/response/Content.cpp.orig 2020-06-13 06:07:30.000000000 +0000 ++++ ./src/vbox/response/Content.cpp 2020-08-20 13:48:11.377868999 +0000 +@@ -14,7 +14,7 @@ + #include "../../xmltv/Utilities.h" + #include "../Channel.h" + +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + + using namespace tinyxml2; + using namespace vbox; +diff -up ./src/vbox/response/Response.h.orig ./src/vbox/response/Response.h +--- ./src/vbox/response/Response.h.orig 2020-06-13 06:07:30.000000000 +0000 ++++ ./src/vbox/response/Response.h 2020-08-20 13:48:11.374869074 +0000 +@@ -12,7 +12,7 @@ + #include <memory> + #include <string> + +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + + namespace vbox + { +diff -up ./src/xmltv/Guide.cpp.orig ./src/xmltv/Guide.cpp +--- ./src/xmltv/Guide.cpp.orig 2020-06-13 06:07:30.000000000 +0000 ++++ ./src/xmltv/Guide.cpp 2020-08-20 13:48:11.356869517 +0000 +@@ -15,7 +15,7 @@ + + #include <algorithm> + +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + #include <p8-platform/util/StringUtils.h> + + using namespace xmltv; +diff -up ./src/xmltv/Programme.cpp.orig ./src/xmltv/Programme.cpp +--- ./src/xmltv/Programme.cpp.orig 2020-06-13 06:07:30.000000000 +0000 ++++ ./src/xmltv/Programme.cpp 2020-08-20 13:48:11.364869320 +0000 +@@ -11,7 +11,7 @@ + + #include "Utilities.h" + +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + + using namespace xmltv; + using namespace tinyxml2; +diff -up ./src/xmltv/Utilities.cpp.orig ./src/xmltv/Utilities.cpp +--- ./src/xmltv/Utilities.cpp.orig 2020-06-13 06:07:30.000000000 +0000 ++++ ./src/xmltv/Utilities.cpp 2020-08-20 13:48:11.360869418 +0000 +@@ -15,7 +15,7 @@ + #include <sstream> + #include <stdexcept> + +-#include <lib/tinyxml2/tinyxml2.h> ++#include <tinyxml2.h> + + using namespace xmltv; + diff --git a/kodi-pvr-vbox.spec b/kodi-pvr-vbox.spec index 8b7b5dd..414521f 100644 --- a/kodi-pvr-vbox.spec +++ b/kodi-pvr-vbox.spec @@ -1,28 +1,25 @@ %global kodi_addon pvr.vbox -%global kodi_version 18.0 -%global kodi_codename Leia - -%undefine __cmake_in_source_build +%global kodi_version 19.0 +%global kodi_codename Matrix Name: kodi-%(tr "." "-" <<<%{kodi_addon}) -Version: 4.7.0 -Release: 3%{?dist} +Version: 7.0.0 +Release: 1%{?dist} Summary: VBox Home TV Gateway PVR client for Kodi License: GPLv2+ URL: https://github.com/kodi-pvr/%{kodi_addon}/ Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz # Use external tinyxml2 library -Patch0: %{name}-4.7.0-use_external_tinyxml2.patch +Patch0: %{name}-7.0.0-use_external_tinyxml2.patch # Fix build with tinyxml2 >= 6.0.0 -Patch1: %{name}-4.3.1-tinyxml2_6.patch +Patch1: %{name}-7.0.0-tinyxml2_6.patch BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: kodi-devel >= %{kodi_version} -BuildRequires: kodi-platform-devel >= %{kodi_version} +BuildRequires: pkgconfig(p8-platform) BuildRequires: pkgconfig(tinyxml2) -BuildRequires: platform-devel Requires: kodi >= %{kodi_version} ExcludeArch: %{power64} ppc64le @@ -54,6 +51,9 @@ rm -r lib/tinyxml2/ %changelog +* Thu Aug 20 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 7.0.0-1 +- Update to 7.0.0 (switch to Matrix branch) + * Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 4.7.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 895920a..6b9c439 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pvr.vbox-4.7.0.tar.gz) = 1f1e4a0db20e43376cceae222ef89644304838d9bad1d7e234420c8e896f7db19acebd4cb6dd484ddd99b836e182eec8268dbbee733e49773826b6e350ec7a22 +SHA512 (pvr.vbox-7.0.0.tar.gz) = 7e8965422c750e00104c27f6b67d6d14648c840684702bb85cd7350647734848ebcc43bc6cf53e2edd2c432c8e1289908f43eafb87bc7cf70652026abee0177e