[kodi-pvr-vbox/f30] Update to 4.7.0

commit b50a1a62adf34d885b9bc106cd4d0a9c5ddd798c Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; Date: Mon Jan 13 16:44:31 2020 +0100 Update to 4.7.0 .gitignore | 1 + ...kodi-pvr-vbox-4.7.0-use_external_tinyxml2.patch | 62 +++++++++++----------- kodi-pvr-vbox.spec | 19 +++---- sources | 2 +- 4 files changed, 42 insertions(+), 42 deletions(-) --- diff --git a/.gitignore b/.gitignore index 8915201..fdb0987 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /kodi-pvr-vbox-35dd909.tar.gz /pvr.vbox-57f3198.tar.gz /pvr.vbox-40ca81f.tar.gz +/pvr.vbox-4.7.0.tar.gz diff --git a/kodi-pvr-vbox-4.3.1-use_external_tinyxml2.patch b/kodi-pvr-vbox-4.7.0-use_external_tinyxml2.patch similarity index 66% rename from kodi-pvr-vbox-4.3.1-use_external_tinyxml2.patch rename to kodi-pvr-vbox-4.7.0-use_external_tinyxml2.patch index 79019a0..9acc97e 100644 --- a/kodi-pvr-vbox-4.3.1-use_external_tinyxml2.patch +++ b/kodi-pvr-vbox-4.7.0-use_external_tinyxml2.patch @@ -1,7 +1,7 @@ diff -up ./CMakeLists.txt.orig ./CMakeLists.txt ---- ./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) +--- ./CMakeLists.txt.orig 2019-10-26 13:32:01.000000000 +0200 ++++ ./CMakeLists.txt 2020-01-13 16:43:01.375142646 +0100 +@@ -6,9 +6,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT find_package(Kodi REQUIRED) find_package(kodiplatform REQUIRED) find_package(p8-platform REQUIRED) @@ -11,10 +11,10 @@ diff -up ./CMakeLists.txt.orig ./CMakeLists.txt include_directories(${kodiplatform_INCLUDE_DIRS} ${p8-platform_INCLUDE_DIRS} + ${TINYXML2_INCLUDE_DIRS} - ${KODI_INCLUDE_DIR} + ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways ${PROJECT_SOURCE_DIR}) -@@ -87,13 +90,6 @@ source_group("Source Files\\vbox\\respon +@@ -85,13 +88,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}) @@ -24,28 +24,26 @@ diff -up ./CMakeLists.txt.orig ./CMakeLists.txt - lib/tinyxml2/tinyxml2.cpp) - -source_group("Library Files\\tinyxml2" FILES ${VBOX_LIBRARIES_TINYXML2}) -- +- # Resource files - set(VBOX_RESOURCES + set(VBOX_RESOURCES README.md -@@ -113,10 +109,11 @@ list(APPEND VBOX_SOURCES +@@ -111,10 +107,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} -+ ${TINYXML2_LIBRARIES}) -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 2018-02-05 09:22:59.000000000 +0100 -+++ ./src/vbox/CategoryGenreMapper.cpp 2018-03-15 18:59:30.656263927 +0100 +--- ./src/vbox/CategoryGenreMapper.cpp.orig 2019-10-26 13:32:01.000000000 +0200 ++++ ./src/vbox/CategoryGenreMapper.cpp 2020-01-13 16:42:43.950596705 +0100 @@ -20,7 +20,7 @@ */ #include "CategoryGenreMapper.h" @@ -56,8 +54,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 2018-02-05 09:22:59.000000000 +0100 -+++ ./src/vbox/GuideChannelMapper.cpp 2018-03-15 18:59:30.658263875 +0100 +--- ./src/vbox/GuideChannelMapper.cpp.orig 2019-10-26 13:32:01.000000000 +0200 ++++ ./src/vbox/GuideChannelMapper.cpp 2020-01-13 16:42:43.950596705 +0100 @@ -21,7 +21,7 @@ #include "GuideChannelMapper.h" @@ -68,8 +66,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 2018-02-05 09:22:59.000000000 +0100 -+++ ./src/vbox/Reminder.cpp 2018-03-15 18:59:30.666263664 +0100 +--- ./src/vbox/Reminder.cpp.orig 2019-10-26 13:32:01.000000000 +0200 ++++ ./src/vbox/Reminder.cpp 2020-01-13 16:42:43.951596679 +0100 @@ -21,7 +21,7 @@ #include "ContentIdentifier.h" #include "Reminder.h" @@ -80,8 +78,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 2018-02-05 09:22:59.000000000 +0100 -+++ ./src/vbox/ReminderManager.cpp 2018-03-15 18:59:30.653264006 +0100 +--- ./src/vbox/ReminderManager.cpp.orig 2019-10-26 13:32:01.000000000 +0200 ++++ ./src/vbox/ReminderManager.cpp 2020-01-13 16:42:43.952596653 +0100 @@ -21,7 +21,7 @@ #include "ContentIdentifier.h" #include "ReminderManager.h" @@ -92,20 +90,20 @@ 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 2018-02-05 09:22:59.000000000 +0100 -+++ ./src/vbox/response/Content.cpp 2018-03-15 18:59:30.661263796 +0100 +--- ./src/vbox/response/Content.cpp.orig 2019-10-26 13:32:01.000000000 +0200 ++++ ./src/vbox/response/Content.cpp 2020-01-13 16:42:43.952596653 +0100 @@ -21,7 +21,7 @@ #include "Content.h" - #include "xbmc_pvr_types.h" + #include "kodi/xbmc_pvr_types.h" -#include "lib/tinyxml2/tinyxml2.h" +#include <tinyxml2.h> #include "../Channel.h" #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 2018-02-05 09:22:59.000000000 +0100 -+++ ./src/vbox/response/Response.h 2018-03-15 18:59:30.663263743 +0100 +--- ./src/vbox/response/Response.h.orig 2019-10-26 13:32:01.000000000 +0200 ++++ ./src/vbox/response/Response.h 2020-01-13 16:42:43.953596627 +0100 @@ -22,7 +22,7 @@ #include <memory> @@ -116,8 +114,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 2018-02-05 09:22:59.000000000 +0100 -+++ ./src/xmltv/Guide.cpp 2018-03-15 18:59:30.646264190 +0100 +--- ./src/xmltv/Guide.cpp.orig 2019-10-26 13:32:01.000000000 +0200 ++++ ./src/xmltv/Guide.cpp 2020-01-13 16:42:43.953596627 +0100 @@ -23,7 +23,7 @@ #include <algorithm> #include "Channel.h" @@ -128,8 +126,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 2018-02-05 09:22:59.000000000 +0100 -+++ ./src/xmltv/Programme.cpp 2018-03-15 18:59:30.648264137 +0100 +--- ./src/xmltv/Programme.cpp.orig 2019-10-26 13:32:01.000000000 +0200 ++++ ./src/xmltv/Programme.cpp 2020-01-13 16:42:43.954596602 +0100 @@ -21,7 +21,7 @@ #include "Programme.h" @@ -140,12 +138,12 @@ 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 2018-02-05 09:22:59.000000000 +0100 -+++ ./src/xmltv/Utilities.cpp 2018-03-15 18:59:30.651264058 +0100 -@@ -21,7 +21,7 @@ +--- ./src/xmltv/Utilities.cpp.orig 2019-10-26 13:32:01.000000000 +0200 ++++ ./src/xmltv/Utilities.cpp 2020-01-13 16:42:43.955596576 +0100 +@@ -20,7 +20,7 @@ + */ #include "Utilities.h" - #include "../compat.h" -#include "lib/tinyxml2/tinyxml2.h" +#include <tinyxml2.h> #include <algorithm> diff --git a/kodi-pvr-vbox.spec b/kodi-pvr-vbox.spec index 8613ffc..00e95c2 100644 --- a/kodi-pvr-vbox.spec +++ b/kodi-pvr-vbox.spec @@ -1,20 +1,17 @@ -%global commit 40ca81f334443f3a784231765f9bc0287014bf95 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20180825 - %global kodi_addon pvr.vbox %global kodi_version 18.0 +%global kodi_codename Leia Name: kodi-%(tr "." "-" <<<%{kodi_addon}) -Version: 4.4.5 -Release: 3%{?dist} +Version: 4.7.0 +Release: 1%{?dist} Summary: VBox Home TV Gateway PVR client for Kodi License: GPLv2+ URL: https://github.com/kodi-pvr/%{kodi_addon}/ -Source0: https://github.com/kodi-pvr/%{kodi_addon}/archive/%{shortcommit}/%{kodi_a... +Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz # Use external tinyxml2 library -Patch0: %{name}-4.3.1-use_external_tinyxml2.patch +Patch0: %{name}-4.7.0-use_external_tinyxml2.patch # Fix build with tinyxml2 >= 6.0.0 Patch1: %{name}-4.3.1-tinyxml2_6.patch @@ -32,7 +29,7 @@ ExcludeArch: %{power64} ppc64le %prep -%autosetup -n %{kodi_addon}-%{commit} -p0 +%autosetup -n %{kodi_addon}-%{version}-%{kodi_codename} -p0 # Drop bundled tinyxml2 library rm -r lib/tinyxml2/ @@ -49,11 +46,15 @@ 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 +* Mon Jan 13 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 4.7.0-1 +- Update to 4.7.0 + * Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 4.4.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 453cc3c..895920a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -237c8144837400adab88308d32c8eadb pvr.vbox-40ca81f.tar.gz +SHA512 (pvr.vbox-4.7.0.tar.gz) = 1f1e4a0db20e43376cceae222ef89644304838d9bad1d7e234420c8e896f7db19acebd4cb6dd484ddd99b836e182eec8268dbbee733e49773826b6e350ec7a22