commit 02a2a46f7b68d7b11ff3f51a22c1794531768f6e Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; Date: Mon Mar 19 15:27:44 2018 +0100 Update to latest stable release for Kodi 18 .gitignore | 1 + gpl-2.0.txt | 339 --------------------- ...odi-pvr-mythtv-5.7.0-use_external_cppmyth.patch | 75 ++--- kodi-pvr-mythtv.spec | 47 ++- sources | 2 +- 5 files changed, 57 insertions(+), 407 deletions(-) --- diff --git a/.gitignore b/.gitignore index 518ed5a..6a66fee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /kodi-pvr-mythtv-9eb2058.tar.gz /kodi-pvr-mythtv-a41fed4.tar.gz +/pvr.mythtv-59ff911.tar.gz diff --git a/kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch b/kodi-pvr-mythtv-5.7.0-use_external_cppmyth.patch similarity index 55% rename from kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch rename to kodi-pvr-mythtv-5.7.0-use_external_cppmyth.patch index ba7583d..d041afa 100644 --- a/kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch +++ b/kodi-pvr-mythtv-5.7.0-use_external_cppmyth.patch @@ -1,32 +1,33 @@ diff -up ./CMakeLists.txt.orig ./CMakeLists.txt ---- ./CMakeLists.txt.orig 2017-04-19 15:44:27.000000000 +0200 -+++ ./CMakeLists.txt 2017-04-24 23:49:24.550567499 +0200 -@@ -10,6 +10,13 @@ enable_language(C) +--- ./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) find_package(Kodi REQUIRED) find_package(kodiplatform REQUIRED) find_package(p8-platform REQUIRED) +find_package(PkgConfig) +pkg_check_modules(CPPMYTH REQUIRED cppmyth) -+ -+set(CFLAGS ${CPPMYTH_CFLAGS} ${CPPMYTH_CFLAGS_OTHERS}) -+add_definitions(${CFLAGS}) -+set(LIBS ${CPPMYTH_CFLAGS} ${CPPMYTH_LIBRARIES}) -+link_libraries(${LIBS}) include_directories(${kodiplatform_INCLUDE_DIRS} ${p8-platform_INCLUDE_DIRS} -@@ -51,8 +58,6 @@ set(MYTHTV_SOURCES src/avinfo.cpp - src/fileOps.cpp - src/filestreaming.cpp) ++ ${CPPMYTH_INCLUDE_DIRS} + ${KODI_INCLUDE_DIR} + ${PROJECT_SOURCE_DIR}/lib/cppmyth/src) + +@@ -32,9 +35,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) ++set(DEPLIBS ${p8-platform_LIBRARIES} ${CPPMYTH_LIBRARIES}) if(WIN32) list(APPEND DEPLIBS ws2_32) + else() diff -up ./src/avinfo.h.orig ./src/avinfo.h ---- ./src/avinfo.h.orig 2017-04-19 15:44:27.000000000 +0200 -+++ ./src/avinfo.h 2017-04-24 23:47:36.928418218 +0200 +--- ./src/avinfo.h.orig 2018-02-25 20:43:55.000000000 +0100 ++++ ./src/avinfo.h 2018-03-15 15:26:30.283134742 +0100 @@ -24,7 +24,7 @@ #include "demuxer/tsDemuxer.h" #include "client.h" @@ -37,8 +38,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 2017-04-19 15:44:27.000000000 +0200 -+++ ./src/cppmyth/MythChannel.h 2017-04-24 23:47:36.929418191 +0200 +--- ./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 @@ -19,7 +19,7 @@ * */ @@ -49,8 +50,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 2017-04-19 15:44:27.000000000 +0200 -+++ ./src/cppmyth/MythEPGInfo.h 2017-04-24 23:47:36.929418191 +0200 +--- ./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 @@ -19,7 +19,7 @@ * */ @@ -61,8 +62,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 2017-04-19 15:44:27.000000000 +0200 -+++ ./src/cppmyth/MythProgramInfo.h 2017-04-24 23:47:36.929418191 +0200 +--- ./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 @@ -19,7 +19,7 @@ * */ @@ -73,8 +74,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 2017-04-19 15:44:27.000000000 +0200 -+++ ./src/cppmyth/MythRecordingRule.h 2017-04-24 23:47:36.930418165 +0200 +--- ./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 @@ -19,7 +19,7 @@ * */ @@ -85,8 +86,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 2017-04-19 15:44:27.000000000 +0200 -+++ ./src/cppmyth/MythScheduleManager.h 2017-04-24 23:47:36.930418165 +0200 +--- ./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 @@ -19,7 +19,7 @@ * */ @@ -96,21 +97,9 @@ diff -up ./src/cppmyth/MythScheduleManager.h.orig ./src/cppmyth/MythScheduleMana #include "MythRecordingRule.h" #include "MythProgramInfo.h" #include "MythEPGInfo.h" -diff -up ./src/demux.h.orig ./src/demux.h ---- ./src/demux.h.orig 2017-04-19 15:44:27.000000000 +0200 -+++ ./src/demux.h 2017-04-24 23:47:36.931418138 +0200 -@@ -24,7 +24,7 @@ - #include "demuxer/tsDemuxer.h" - #include "client.h" - --#include <mythstream.h> -+#include <cppmyth/mythstream.h> - #include <p8-platform/threads/threads.h> - #include <p8-platform/threads/mutex.h> - #include <p8-platform/util/buffer.h> diff -up ./src/fileOps.h.orig ./src/fileOps.h ---- ./src/fileOps.h.orig 2017-04-19 15:44:27.000000000 +0200 -+++ ./src/fileOps.h 2017-04-24 23:47:36.931418138 +0200 +--- ./src/fileOps.h.orig 2018-02-25 20:43:55.000000000 +0100 ++++ ./src/fileOps.h 2018-03-15 15:26:52.369583754 +0100 @@ -24,7 +24,7 @@ #include "cppmyth/MythChannel.h" #include "cppmyth/MythProgramInfo.h" @@ -121,8 +110,8 @@ diff -up ./src/fileOps.h.orig ./src/fileOps.h #include <string> diff -up ./src/filestreaming.h.orig ./src/filestreaming.h ---- ./src/filestreaming.h.orig 2017-04-19 15:44:27.000000000 +0200 -+++ ./src/filestreaming.h 2017-04-24 23:47:36.931418138 +0200 +--- ./src/filestreaming.h.orig 2018-02-25 20:43:55.000000000 +0100 ++++ ./src/filestreaming.h 2018-03-15 15:27:08.972125702 +0100 @@ -21,7 +21,7 @@ * */ @@ -133,9 +122,9 @@ 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 2017-04-19 15:44:27.000000000 +0200 -+++ ./src/pvrclient-mythtv.h 2017-04-24 23:47:36.932418112 +0200 -@@ -29,12 +29,12 @@ +--- ./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 @@ #include <xbmc_pvr_types.h> #include <p8-platform/threads/mutex.h> diff --git a/kodi-pvr-mythtv.spec b/kodi-pvr-mythtv.spec index 0b743f1..7519ba0 100644 --- a/kodi-pvr-mythtv.spec +++ b/kodi-pvr-mythtv.spec @@ -1,39 +1,41 @@ -%global commit a41fed4cc70cabf1d3b157dca61d7352f2292398 -%global short_commit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20170827 +%global commit 59ff911e0b37a1235962be19ae5fb3010ecdf6eb +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commitdate 20180225 %global kodi_addon pvr.mythtv -%global kodi_version 17.0 +%global kodi_version 18.0 Name: kodi-%(tr "." "-" <<<%{kodi_addon}) # Use Epoch to manage upgrades from older upstream # (https://github.com/opdenkamp/xbmc-pvr-addons/) Epoch: 1 -Version: 4.12.17 -Release: 2%{?dist} +Version: 5.7.0 +Release: 1%{?dist} Summary: MythTV PVR 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}... -# GPLv2 license file -Source1: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt +# 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: https://github.com/janbar/%{kodi_addon}/archive/%{shortcommit}/%{kodi_add... # Use external cppmyth library -Patch0: %{name}-4.12.14-use_external_cppmyth.patch +Patch0: %{name}-5.7.0-use_external_cppmyth.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: kodi-devel >= %{kodi_version} BuildRequires: kodi-platform-devel >= %{kodi_version} -BuildRequires: pkgconfig(cppmyth) >= 2.9.4 +BuildRequires: pkgconfig(cppmyth) BuildRequires: platform-devel +BuildRequires: zlib-devel Requires: kodi >= %{kodi_version} ExclusiveArch: i686 x86_64 %description -Kodi frontend for MythTV (up to MythTV 0.28). Supports streaming of live TV & -recordings, listening to radio channels, EPG and timers. +%{summary}. %prep @@ -42,14 +44,9 @@ recordings, listening to radio channels, EPG and timers. # Drop bundled cppmyth library, except private headers find lib/cppmyth/ -type f -not -path "lib/cppmyth/src/private/*" -delete -# Drop bundled zlib library -rm -r depends/common/zlib/ - -cp -p %{SOURCE1} . - %build -%cmake -DCMAKE_INSTALL_LIBDIR=%{_libdir}/kodi/ . +%cmake . %make_build @@ -58,13 +55,15 @@ cp -p %{SOURCE1} . %files -%doc %{kodi_addon}/changelog.txt -%license gpl-2.0.txt +%doc README.md %{kodi_addon}/changelog.txt %{_libdir}/kodi/addons/%{kodi_addon}/ %{_datadir}/kodi/addons/%{kodi_addon}/ %changelog +* Fri Mar 16 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 1:5.7.0-1 +- Update to latest stable release for Kodi 18 + * Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com&gt; - 1:4.12.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index b1ef923..e912970 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37a335bf8a0d372d991f4a843a66b8c2 kodi-pvr-mythtv-a41fed4.tar.gz +c9961eefca0323e9c13bcee7c7651010 pvr.mythtv-59ff911.tar.gz