commit 1ed4bc9d9f94454deb7aa826bf48db8a5ef3fb20 Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; Date: Thu Aug 20 14:59:01 2020 +0200 Update to 7.0.5 (switch to Matrix branch) .gitignore | 1 + ...odi-pvr-mythtv-7.0.5-use_external_cppmyth.patch | 64 +++++++++++----------- kodi-pvr-mythtv.spec | 21 ++++--- sources | 2 +- 4 files changed, 46 insertions(+), 42 deletions(-) --- diff --git a/.gitignore b/.gitignore index 048cbaa..c2d143c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /pvr.mythtv-573f7b2.tar.gz /pvr.mythtv-179b6ea.tar.gz /pvr.mythtv-5.10.15.tar.gz +/pvr.mythtv-7.0.5.tar.gz diff --git a/kodi-pvr-mythtv-5.10.15-use_external_cppmyth.patch b/kodi-pvr-mythtv-7.0.5-use_external_cppmyth.patch similarity index 62% rename from kodi-pvr-mythtv-5.10.15-use_external_cppmyth.patch rename to kodi-pvr-mythtv-7.0.5-use_external_cppmyth.patch index 32aee19..a4d4db7 100644 --- a/kodi-pvr-mythtv-5.10.15-use_external_cppmyth.patch +++ b/kodi-pvr-mythtv-7.0.5-use_external_cppmyth.patch @@ -1,6 +1,6 @@ diff -up ./CMakeLists.txt.orig ./CMakeLists.txt ---- ./CMakeLists.txt.orig 2020-01-09 19:52:50.000000000 +0100 -+++ ./CMakeLists.txt 2020-01-13 14:55:44.178476740 +0100 +--- ./CMakeLists.txt.orig 2020-07-15 07:57:28.000000000 +0000 ++++ ./CMakeLists.txt 2020-08-20 09:30:20.602092660 +0000 @@ -7,8 +7,11 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -25,32 +25,32 @@ diff -up ./CMakeLists.txt.orig ./CMakeLists.txt list(APPEND DEPLIBS ws2_32) else() diff -up ./src/artworksmanager.h.orig ./src/artworksmanager.h ---- ./src/artworksmanager.h.orig 2020-01-09 19:52:50.000000000 +0100 -+++ ./src/artworksmanager.h 2020-01-13 14:59:21.554803199 +0100 -@@ -24,7 +24,7 @@ - #include "cppmyth/MythChannel.h" +--- ./src/artworksmanager.h.orig 2020-07-15 07:57:28.000000000 +0000 ++++ ./src/artworksmanager.h 2020-08-20 09:56:06.292325528 +0000 +@@ -25,7 +25,7 @@ #include "cppmyth/MythProgramInfo.h" + #include <kodi/AddonBase.h> -#include <mythwsapi.h> +#include <cppmyth/mythwsapi.h> #include <string> diff -up ./src/avinfo.h.orig ./src/avinfo.h ---- ./src/avinfo.h.orig 2020-01-09 19:52:50.000000000 +0100 -+++ ./src/avinfo.h 2020-01-13 14:59:21.545803434 +0100 -@@ -24,7 +24,7 @@ +--- ./src/avinfo.h.orig 2020-07-15 07:57:28.000000000 +0000 ++++ ./src/avinfo.h 2020-08-20 09:56:06.289325602 +0000 +@@ -23,7 +23,7 @@ + #include "demuxer/tsDemuxer.h" - #include "client.h" -#include <mythstream.h> +#include <cppmyth/mythstream.h> + #include <kodi/AddonBase.h> #include <set> - #include <vector> diff -up ./src/cppmyth/MythChannel.h.orig ./src/cppmyth/MythChannel.h ---- ./src/cppmyth/MythChannel.h.orig 2020-01-09 19:52:50.000000000 +0100 -+++ ./src/cppmyth/MythChannel.h 2020-01-13 14:59:21.606801842 +0100 +--- ./src/cppmyth/MythChannel.h.orig 2020-07-15 07:57:28.000000000 +0000 ++++ ./src/cppmyth/MythChannel.h 2020-08-20 09:56:06.270326068 +0000 @@ -19,7 +19,7 @@ * */ @@ -61,8 +61,8 @@ diff -up ./src/cppmyth/MythChannel.h.orig ./src/cppmyth/MythChannel.h class MythChannel { diff -up ./src/cppmyth/MythEPGInfo.h.orig ./src/cppmyth/MythEPGInfo.h ---- ./src/cppmyth/MythEPGInfo.h.orig 2020-01-09 19:52:50.000000000 +0100 -+++ ./src/cppmyth/MythEPGInfo.h 2020-01-13 14:59:21.610801738 +0100 +--- ./src/cppmyth/MythEPGInfo.h.orig 2020-07-15 07:57:28.000000000 +0000 ++++ ./src/cppmyth/MythEPGInfo.h 2020-08-20 09:56:06.277325896 +0000 @@ -19,7 +19,7 @@ * */ @@ -73,8 +73,8 @@ diff -up ./src/cppmyth/MythEPGInfo.h.orig ./src/cppmyth/MythEPGInfo.h class MythEPGInfo { diff -up ./src/cppmyth/MythProgramInfo.h.orig ./src/cppmyth/MythProgramInfo.h ---- ./src/cppmyth/MythProgramInfo.h.orig 2020-01-09 19:52:50.000000000 +0100 -+++ ./src/cppmyth/MythProgramInfo.h 2020-01-13 14:59:21.628801268 +0100 +--- ./src/cppmyth/MythProgramInfo.h.orig 2020-07-15 07:57:28.000000000 +0000 ++++ ./src/cppmyth/MythProgramInfo.h 2020-08-20 09:56:06.283325749 +0000 @@ -19,7 +19,7 @@ * */ @@ -85,8 +85,8 @@ diff -up ./src/cppmyth/MythProgramInfo.h.orig ./src/cppmyth/MythProgramInfo.h class MythProgramInfo; typedef std::map<std::string, MythProgramInfo> ProgramInfoMap; diff -up ./src/cppmyth/MythRecordingRule.h.orig ./src/cppmyth/MythRecordingRule.h ---- ./src/cppmyth/MythRecordingRule.h.orig 2020-01-09 19:52:50.000000000 +0100 -+++ ./src/cppmyth/MythRecordingRule.h 2020-01-13 14:59:21.617801555 +0100 +--- ./src/cppmyth/MythRecordingRule.h.orig 2020-07-15 07:57:28.000000000 +0000 ++++ ./src/cppmyth/MythRecordingRule.h 2020-08-20 09:56:06.274325970 +0000 @@ -19,7 +19,7 @@ * */ @@ -97,8 +97,8 @@ diff -up ./src/cppmyth/MythRecordingRule.h.orig ./src/cppmyth/MythRecordingRule. class MythRecordingRule { diff -up ./src/cppmyth/MythScheduleManager.h.orig ./src/cppmyth/MythScheduleManager.h ---- ./src/cppmyth/MythScheduleManager.h.orig 2020-01-09 19:52:50.000000000 +0100 -+++ ./src/cppmyth/MythScheduleManager.h 2020-01-13 14:59:21.632801164 +0100 +--- ./src/cppmyth/MythScheduleManager.h.orig 2020-07-15 07:57:28.000000000 +0000 ++++ ./src/cppmyth/MythScheduleManager.h 2020-08-20 09:56:06.280325823 +0000 @@ -19,7 +19,7 @@ * */ @@ -109,24 +109,24 @@ diff -up ./src/cppmyth/MythScheduleManager.h.orig ./src/cppmyth/MythScheduleMana #include "MythProgramInfo.h" #include "MythEPGInfo.h" diff -up ./src/filestreaming.h.orig ./src/filestreaming.h ---- ./src/filestreaming.h.orig 2020-01-09 19:52:50.000000000 +0100 -+++ ./src/filestreaming.h 2020-01-13 14:59:21.540803565 +0100 -@@ -21,7 +21,7 @@ - * - */ +--- ./src/filestreaming.h.orig 2020-07-15 07:57:28.000000000 +0000 ++++ ./src/filestreaming.h 2020-08-20 09:56:06.286325675 +0000 +@@ -23,7 +23,7 @@ + + #include <kodi/Filesystem.h> -#include <mythstream.h> +#include <cppmyth/mythstream.h> - class FileStreaming : public Myth::Stream + class ATTRIBUTE_HIDDEN FileStreaming : public Myth::Stream { diff -up ./src/pvrclient-mythtv.h.orig ./src/pvrclient-mythtv.h ---- ./src/pvrclient-mythtv.h.orig 2020-01-09 19:52:50.000000000 +0100 -+++ ./src/pvrclient-mythtv.h 2020-01-13 14:59:21.550803304 +0100 -@@ -26,12 +26,12 @@ - #include "categories.h" +--- ./src/pvrclient-mythtv.h.orig 2020-07-15 07:57:28.000000000 +0000 ++++ ./src/pvrclient-mythtv.h 2020-08-20 09:56:06.267326142 +0000 +@@ -27,12 +27,12 @@ + #include "settings.h" - #include <kodi/xbmc_pvr_types.h> + #include <kodi/addon-instance/PVR.h> -#include <mythsharedptr.h> -#include <mythcontrol.h> -#include <mytheventhandler.h> diff --git a/kodi-pvr-mythtv.spec b/kodi-pvr-mythtv.spec index 763b303..bf85a91 100644 --- a/kodi-pvr-mythtv.spec +++ b/kodi-pvr-mythtv.spec @@ -1,15 +1,13 @@ %global kodi_addon pvr.mythtv -%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}) # Use Epoch to manage upgrades from older upstream # (https://github.com/opdenkamp/xbmc-pvr-addons/) Epoch: 1 -Version: 5.10.15 -Release: 3%{?dist} +Version: 7.0.5 +Release: 1%{?dist} Summary: MythTV PVR for Kodi # Some cppmyth private headers are LGPLv2+ @@ -17,13 +15,14 @@ License: GPLv2+ and LGPLv2+ URL: https://github.com/janbar/%{kodi_addon}/ Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz # Use external cppmyth library -Patch0: %{name}-5.10.15-use_external_cppmyth.patch +Patch0: %{name}-7.0.5-use_external_cppmyth.patch +# Fix build with GCC10 +# Patch1: %%{name}-7.0.5-gcc10.patch BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: kodi-devel >= %{kodi_version} -BuildRequires: kodi-platform-devel >= %{kodi_version} -BuildRequires: pkgconfig(cppmyth) >= 2.12.1 +BuildRequires: pkgconfig(cppmyth) >= 2.14.1 BuildRequires: platform-devel BuildRequires: zlib-devel Requires: kodi >= %{kodi_version} @@ -51,11 +50,15 @@ find lib/cppmyth/ -type f -not -path "lib/cppmyth/src/private/*" -delete %files %doc README.md %{kodi_addon}/changelog.txt +%license LICENSE.md %{_libdir}/kodi/addons/%{kodi_addon}/ %{_datadir}/kodi/addons/%{kodi_addon}/ %changelog +* Thu Aug 20 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 1:7.0.5-1 +- Update to 7.0.5 (switch to Matrix branch) + * Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1:5.10.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 353c34c..e200b76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pvr.mythtv-5.10.15.tar.gz) = bf7e4d6fc1436fc01596a4587b4334e495b72e4fdc9638393c94bd289c9f58065ad5d61c87ce109d727a0d656873100da050b8d395e28aac5efe567da70839e8 +SHA512 (pvr.mythtv-7.0.5.tar.gz) = ad94f44f0fa853776da62af7b23a54d884cb25b6fab3186b1bc02f9c4716e7cdeb371f5eb789d65221573117ed7afafcc2a7e1f53a004d42866b61d8deae1dac