[kodi-pvr-mythtv] - Update to 20.3.0 - Add AppStream metadata - Switch to SPDX license identifiers

commit 53992d72a7ee503f4075391ada6bee07986a2d63 Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; Date: Tue Jan 31 11:35:03 2023 +0100 - Update to 20.3.0 - Add AppStream metadata - Switch to SPDX license identifiers .gitignore | 1 + ...di-pvr-mythtv-20.3.0-use_external_cppmyth.patch | 87 +++++++++++----------- kodi-pvr-mythtv-7.1.1-build.patch | 12 --- kodi-pvr-mythtv.metainfo.xml | 11 +++ kodi-pvr-mythtv.spec | 29 ++++++-- sources | 2 +- 6 files changed, 79 insertions(+), 63 deletions(-) --- diff --git a/.gitignore b/.gitignore index 7e45210..cd58311 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /pvr.mythtv-7.1.1.tar.gz /pvr.mythtv-7.3.0.tar.gz /pvr.mythtv-7.3.1.tar.gz +/pvr.mythtv-20.3.0.tar.gz diff --git a/kodi-pvr-mythtv-7.0.5-use_external_cppmyth.patch b/kodi-pvr-mythtv-20.3.0-use_external_cppmyth.patch similarity index 60% rename from kodi-pvr-mythtv-7.0.5-use_external_cppmyth.patch rename to kodi-pvr-mythtv-20.3.0-use_external_cppmyth.patch index a4d4db7..251f462 100644 --- a/kodi-pvr-mythtv-7.0.5-use_external_cppmyth.patch +++ b/kodi-pvr-mythtv-20.3.0-use_external_cppmyth.patch @@ -1,33 +1,34 @@ diff -up ./CMakeLists.txt.orig ./CMakeLists.txt ---- ./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) +--- ./CMakeLists.txt.orig 2022-09-28 12:05:08.000000000 +0200 ++++ ./CMakeLists.txt 2023-01-31 11:30:47.934396991 +0100 +@@ -7,8 +7,13 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(Kodi REQUIRED) +find_package(PkgConfig) +pkg_check_modules(CPPMYTH REQUIRED cppmyth) ++ ++set(DEPLIBS ${CPPMYTH_LIBRARIES}) include_directories(${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways + ${CPPMYTH_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/lib/cppmyth/src) add_definitions(-DUSE_DEMUX -D__STDC_FORMAT_MACROS) -@@ -27,9 +30,7 @@ file (GLOB MYTHTV_HEADERS +@@ -27,9 +32,6 @@ file (GLOB MYTHTV_HEADERS src/cppmyth/*.h src/*.h) -add_subdirectory(lib/cppmyth) - -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-07-15 07:57:28.000000000 +0000 -+++ ./src/artworksmanager.h 2020-08-20 09:56:06.292325528 +0000 -@@ -25,7 +25,7 @@ +--- ./src/artworksmanager.h.orig 2022-09-28 12:05:08.000000000 +0200 ++++ ./src/artworksmanager.h 2023-01-31 11:12:45.794714411 +0100 +@@ -12,7 +12,7 @@ #include "cppmyth/MythProgramInfo.h" #include <kodi/AddonBase.h> @@ -37,9 +38,9 @@ diff -up ./src/artworksmanager.h.orig ./src/artworksmanager.h #include <string> diff -up ./src/avinfo.h.orig ./src/avinfo.h ---- ./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 @@ +--- ./src/avinfo.h.orig 2022-09-28 12:05:08.000000000 +0200 ++++ ./src/avinfo.h 2023-01-31 11:12:45.813714687 +0100 +@@ -10,7 +10,7 @@ #include "demuxer/tsDemuxer.h" @@ -49,11 +50,11 @@ diff -up ./src/avinfo.h.orig ./src/avinfo.h #include <set> diff -up ./src/cppmyth/MythChannel.h.orig ./src/cppmyth/MythChannel.h ---- ./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 @@ - * - */ +--- ./src/cppmyth/MythChannel.h.orig 2022-09-28 12:05:08.000000000 +0200 ++++ ./src/cppmyth/MythChannel.h 2023-01-31 11:12:45.808714614 +0100 +@@ -8,7 +8,7 @@ + + #pragma once -#include <mythtypes.h> +#include <cppmyth/mythtypes.h> @@ -61,11 +62,11 @@ 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-07-15 07:57:28.000000000 +0000 -+++ ./src/cppmyth/MythEPGInfo.h 2020-08-20 09:56:06.277325896 +0000 -@@ -19,7 +19,7 @@ - * - */ +--- ./src/cppmyth/MythEPGInfo.h.orig 2022-09-28 12:05:08.000000000 +0200 ++++ ./src/cppmyth/MythEPGInfo.h 2023-01-31 11:12:45.810714644 +0100 +@@ -8,7 +8,7 @@ + + #pragma once -#include <mythtypes.h> +#include <cppmyth/mythtypes.h> @@ -73,11 +74,11 @@ 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-07-15 07:57:28.000000000 +0000 -+++ ./src/cppmyth/MythProgramInfo.h 2020-08-20 09:56:06.283325749 +0000 -@@ -19,7 +19,7 @@ - * - */ +--- ./src/cppmyth/MythProgramInfo.h.orig 2022-09-28 12:05:08.000000000 +0200 ++++ ./src/cppmyth/MythProgramInfo.h 2023-01-31 11:12:45.804714556 +0100 +@@ -8,7 +8,7 @@ + + #pragma once -#include <mythtypes.h> +#include <cppmyth/mythtypes.h> @@ -85,11 +86,11 @@ 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-07-15 07:57:28.000000000 +0000 -+++ ./src/cppmyth/MythRecordingRule.h 2020-08-20 09:56:06.274325970 +0000 -@@ -19,7 +19,7 @@ - * - */ +--- ./src/cppmyth/MythRecordingRule.h.orig 2022-09-28 12:05:08.000000000 +0200 ++++ ./src/cppmyth/MythRecordingRule.h 2023-01-31 11:12:45.806714585 +0100 +@@ -8,7 +8,7 @@ + + #pragma once -#include <mythtypes.h> +#include <cppmyth/mythtypes.h> @@ -97,11 +98,11 @@ 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-07-15 07:57:28.000000000 +0000 -+++ ./src/cppmyth/MythScheduleManager.h 2020-08-20 09:56:06.280325823 +0000 -@@ -19,7 +19,7 @@ - * - */ +--- ./src/cppmyth/MythScheduleManager.h.orig 2022-09-28 12:05:08.000000000 +0200 ++++ ./src/cppmyth/MythScheduleManager.h 2023-01-31 11:12:45.802714527 +0100 +@@ -8,7 +8,7 @@ + + #pragma once -#include <mythcontrol.h> +#include <cppmyth/mythcontrol.h> @@ -109,21 +110,21 @@ 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-07-15 07:57:28.000000000 +0000 -+++ ./src/filestreaming.h 2020-08-20 09:56:06.286325675 +0000 -@@ -23,7 +23,7 @@ +--- ./src/filestreaming.h.orig 2022-09-28 12:05:08.000000000 +0200 ++++ ./src/filestreaming.h 2023-01-31 11:12:45.800714498 +0100 +@@ -10,7 +10,7 @@ #include <kodi/Filesystem.h> -#include <mythstream.h> +#include <cppmyth/mythstream.h> - class ATTRIBUTE_HIDDEN FileStreaming : public Myth::Stream + class ATTR_DLL_LOCAL FileStreaming : public Myth::Stream { diff -up ./src/pvrclient-mythtv.h.orig ./src/pvrclient-mythtv.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 @@ +--- ./src/pvrclient-mythtv.h.orig 2022-09-28 12:05:08.000000000 +0200 ++++ ./src/pvrclient-mythtv.h 2023-01-31 11:12:45.797714454 +0100 +@@ -14,12 +14,12 @@ #include "settings.h" #include <kodi/addon-instance/PVR.h> diff --git a/kodi-pvr-mythtv.metainfo.xml b/kodi-pvr-mythtv.metainfo.xml new file mode 100644 index 0000000..300394f --- /dev/null +++ b/kodi-pvr-mythtv.metainfo.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="addon"> + <id>kodi-pvr-mythtv</id> + <extends>kodi.desktop</extends> + <name>MythTV PVR Client</name> + <summary>Kodi frontend for MythTV</summary> + <url type="homepage">https://github.com/xbmc/peripheral.joystick/... + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0-or-later AND LGPL-3.0-or-later</project_license> + <update_contact&gt;melmorabity(a)fedoraproject.org&lt;/update_contact&gt; +</component> diff --git a/kodi-pvr-mythtv.spec b/kodi-pvr-mythtv.spec index bebb1fc..ec10f72 100644 --- a/kodi-pvr-mythtv.spec +++ b/kodi-pvr-mythtv.spec @@ -1,29 +1,31 @@ %global kodi_addon pvr.mythtv -%global kodi_version 19.0 -%global kodi_codename Matrix +%global kodi_version 20 +%global kodi_codename Nexus Name: kodi-%(tr "." "-" <<<%{kodi_addon}) # Use Epoch to manage upgrades from older upstream # (https://github.com/opdenkamp/xbmc-pvr-addons/) Epoch: 1 -Version: 7.3.1 -Release: 4%{?dist} +Version: 20.3.0 +Release: 1%{?dist} Summary: MythTV PVR for Kodi # Some cppmyth private headers are LGPLv2+ -License: GPLv2+ and LGPLv2+ +License: GPL-2.0-or-later AND LGPL-3.0-or-later URL: https://github.com/janbar/%{kodi_addon}/ Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz +Source1: %{name}.metainfo.xml # Use external cppmyth library -Patch0: %{name}-7.0.5-use_external_cppmyth.patch +Patch0: %{name}-20.3.0-use_external_cppmyth.patch BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: kodi-devel >= %{kodi_version} +BuildRequires: libappstream-glib BuildRequires: pkgconfig(cppmyth) >= 2.14.1 BuildRequires: pkgconfig(zlib) Requires: kodi >= %{kodi_version} -ExcludeArch: %{power64} ppc64le +ExcludeArch: %{power64} %description %{summary}. @@ -44,15 +46,28 @@ find lib/cppmyth/ -type f -not -path "lib/cppmyth/src/private/*" -delete %install %cmake3_install +# Install AppData file +install -Dpm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + + +%check +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + %files %doc README.md %{kodi_addon}/changelog.txt %license LICENSE.md %{_libdir}/kodi/addons/%{kodi_addon}/ %{_datadir}/kodi/addons/%{kodi_addon}/ +%{_metainfodir}/%{name}.metainfo.xml %changelog +* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 1:20.3.0-1 +- Update to 20.3.0 +- Add AppStream metadata +- Switch to SPDX license identifiers + * Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 1:7.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index 694ecc4..9685e69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pvr.mythtv-7.3.1.tar.gz) = 19635d83e464035a0bf5d7cd27006059ee932ceb5bb4eb8797a8342ad063e8081393541e0c7f52230d91fba83a870bc9c83ece352ff114c82c7640d8201665b1 +SHA512 (pvr.mythtv-20.3.0.tar.gz) = 414727f6875792aa520a1133ff3947008353b95ab6714b6b472dcc7d0a8250b5645b5e9d3de1f9670fb4fe0aa7ac1f1d6a67b8c3edd48be3b5cffe3e9cc3892f