commit b4edad947e6fa081c62da850543128a5c6b96f12 Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; Date: Mon Jan 13 15:27:54 2020 +0100 Update to 5.10.15 .gitignore | 1 + ...i-pvr-mythtv-5.10.15-use_external_cppmyth.patch | 83 +++++++++++----------- kodi-pvr-mythtv.spec | 22 +++--- sources | 2 +- 4 files changed, 52 insertions(+), 56 deletions(-) --- diff --git a/.gitignore b/.gitignore index 0b03414..048cbaa 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /pvr.mythtv-59ff911.tar.gz /pvr.mythtv-573f7b2.tar.gz /pvr.mythtv-179b6ea.tar.gz +/pvr.mythtv-5.10.15.tar.gz diff --git a/kodi-pvr-mythtv-5.7.0-use_external_cppmyth.patch b/kodi-pvr-mythtv-5.10.15-use_external_cppmyth.patch similarity index 58% rename from kodi-pvr-mythtv-5.7.0-use_external_cppmyth.patch rename to kodi-pvr-mythtv-5.10.15-use_external_cppmyth.patch index 8002845..32aee19 100644 --- a/kodi-pvr-mythtv-5.7.0-use_external_cppmyth.patch +++ b/kodi-pvr-mythtv-5.10.15-use_external_cppmyth.patch @@ -1,33 +1,44 @@ diff -up ./CMakeLists.txt.orig ./CMakeLists.txt ---- ./CMakeLists.txt.orig 2018-02-25 20:43:55.000000000 +0100 -+++ ./CMakeLists.txt 2018-03-15 15:30:10.575409084 +0100 -@@ -10,9 +10,12 @@ enable_language(C) +--- ./CMakeLists.txt.orig 2020-01-09 19:52:50.000000000 +0100 ++++ ./CMakeLists.txt 2020-01-13 14:55:44.178476740 +0100 +@@ -7,8 +7,11 @@ set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + find_package(Kodi REQUIRED) - find_package(kodiplatform REQUIRED) - find_package(p8-platform REQUIRED) +find_package(PkgConfig) +pkg_check_modules(CPPMYTH REQUIRED cppmyth) - include_directories(${kodiplatform_INCLUDE_DIRS} - ${p8-platform_INCLUDE_DIRS} + include_directories(${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways + ${CPPMYTH_INCLUDE_DIRS} - ${KODI_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/lib/cppmyth/src) -@@ -32,9 +35,7 @@ file (GLOB MYTHTV_HEADERS + add_definitions(-DUSE_DEMUX -D__STDC_FORMAT_MACROS) +@@ -27,9 +30,7 @@ file (GLOB MYTHTV_HEADERS src/cppmyth/*.h src/*.h) -add_subdirectory(lib/cppmyth) - --set(DEPLIBS ${p8-platform_LIBRARIES} cppmyth) -+set(DEPLIBS ${p8-platform_LIBRARIES} ${CPPMYTH_LIBRARIES}) +-set(DEPLIBS cppmyth) ++set(DEPLIBS ${CPPMYTH_LIBRARIES}) if(WIN32) 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" + #include "cppmyth/MythProgramInfo.h" + +-#include <mythwsapi.h> ++#include <cppmyth/mythwsapi.h> + + #include <string> + diff -up ./src/avinfo.h.orig ./src/avinfo.h ---- ./src/avinfo.h.orig 2018-02-25 20:43:55.000000000 +0100 -+++ ./src/avinfo.h 2018-03-15 15:26:30.283134742 +0100 +--- ./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 @@ #include "demuxer/tsDemuxer.h" #include "client.h" @@ -38,8 +49,8 @@ diff -up ./src/avinfo.h.orig ./src/avinfo.h #include <set> #include <vector> diff -up ./src/cppmyth/MythChannel.h.orig ./src/cppmyth/MythChannel.h ---- ./src/cppmyth/MythChannel.h.orig 2018-02-25 20:43:55.000000000 +0100 -+++ ./src/cppmyth/MythChannel.h 2018-03-15 15:23:01.194937844 +0100 +--- ./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 @@ -19,7 +19,7 @@ * */ @@ -50,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 2018-02-25 20:43:55.000000000 +0100 -+++ ./src/cppmyth/MythEPGInfo.h 2018-03-15 15:23:17.412533201 +0100 +--- ./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 @@ -19,7 +19,7 @@ * */ @@ -62,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 2018-02-25 20:43:55.000000000 +0100 -+++ ./src/cppmyth/MythProgramInfo.h 2018-03-15 15:23:35.925072615 +0100 +--- ./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 @@ -19,7 +19,7 @@ * */ @@ -74,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 2018-02-25 20:43:55.000000000 +0100 -+++ ./src/cppmyth/MythRecordingRule.h 2018-03-15 15:23:52.616606084 +0100 +--- ./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 @@ -19,7 +19,7 @@ * */ @@ -86,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 2018-02-25 20:43:55.000000000 +0100 -+++ ./src/cppmyth/MythScheduleManager.h 2018-03-15 15:24:16.883918927 +0100 +--- ./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 @@ -19,7 +19,7 @@ * */ @@ -97,21 +108,9 @@ diff -up ./src/cppmyth/MythScheduleManager.h.orig ./src/cppmyth/MythScheduleMana #include "MythRecordingRule.h" #include "MythProgramInfo.h" #include "MythEPGInfo.h" -diff -up ./src/artworksmanager.h.orig ./src/artworksmanager.h ---- ./src/artworksmanager.h.orig 2019-07-27 13:13:17.724168594 +0100 -+++ ./src/artworksmanager.h 2019-04-08 16:01:39.000000000 +0100 -@@ -24,7 +24,7 @@ - #include "cppmyth/MythChannel.h" - #include "cppmyth/MythProgramInfo.h" - --#include <mythwsapi.h> -+#include <cppmyth/mythwsapi.h> - - #include <string> - diff -up ./src/filestreaming.h.orig ./src/filestreaming.h ---- ./src/filestreaming.h.orig 2018-02-25 20:43:55.000000000 +0100 -+++ ./src/filestreaming.h 2018-03-15 15:27:08.972125702 +0100 +--- ./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 @@ * */ @@ -122,12 +121,12 @@ diff -up ./src/filestreaming.h.orig ./src/filestreaming.h class FileStreaming : public Myth::Stream { diff -up ./src/pvrclient-mythtv.h.orig ./src/pvrclient-mythtv.h ---- ./src/pvrclient-mythtv.h.orig 2018-02-25 20:43:55.000000000 +0100 -+++ ./src/pvrclient-mythtv.h 2018-03-15 15:27:51.067967472 +0100 -@@ -28,12 +28,12 @@ +--- ./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" - #include <xbmc_pvr_types.h> - #include <p8-platform/threads/mutex.h> + #include <kodi/xbmc_pvr_types.h> -#include <mythsharedptr.h> -#include <mythcontrol.h> -#include <mytheventhandler.h> diff --git a/kodi-pvr-mythtv.spec b/kodi-pvr-mythtv.spec index 698a6a2..e33e43e 100644 --- a/kodi-pvr-mythtv.spec +++ b/kodi-pvr-mythtv.spec @@ -1,28 +1,21 @@ -%global commit 179b6ea5ad6a394a7e59be25ae72bc5033c9cb35 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20190408 - %global kodi_addon pvr.mythtv %global kodi_version 18.0 +%global kodi_codename Leia 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.7 -Release: 2%{?dist} +Version: 5.10.15 +Release: 1%{?dist} Summary: MythTV PVR for Kodi # Some cppmyth private headers are LGPLv2+ License: GPLv2+ and LGPLv2+ -# Switch to main developer's fork for Kodi 18 support until the main -# project is updated -# URL: https://github.com/kodi-pvr/%%{kodi_addon}/ -# Source0: https://github.com/kodi-pvr/%%{kodi_addon}/archive/%%{shortcommit}/%%{kod... URL: https://github.com/janbar/%{kodi_addon}/ -Source0: %{url}/archive/%{shortcommit}/%{kodi_addon}-%{shortcommit}.tar.gz +Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz # Use external cppmyth library -Patch0: %{name}-5.7.0-use_external_cppmyth.patch +Patch0: %{name}-5.10.15-use_external_cppmyth.patch BuildRequires: cmake3 BuildRequires: gcc-c++ @@ -39,7 +32,7 @@ ExcludeArch: %{power64} ppc64le %prep -%autosetup -n %{kodi_addon}-%{commit} -p0 +%autosetup -n %{kodi_addon}-%{version}-%{kodi_codename} -p0 # Drop bundled cppmyth library, except private headers find lib/cppmyth/ -type f -not -path "lib/cppmyth/src/private/*" -delete @@ -61,6 +54,9 @@ find lib/cppmyth/ -type f -not -path "lib/cppmyth/src/private/*" -delete %changelog +* Mon Jan 13 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 1:5.10.15-1 +- Update to 5.10.15 + * Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1:5.10.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index d84d889..353c34c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09b4c939ce61eb7c8e86cdb3f35caaa8 pvr.mythtv-179b6ea.tar.gz +SHA512 (pvr.mythtv-5.10.15.tar.gz) = bf7e4d6fc1436fc01596a4587b4334e495b72e4fdc9638393c94bd289c9f58065ad5d61c87ce109d727a0d656873100da050b8d395e28aac5efe567da70839e8