commit 69e66183db755fdaf4e33c2bac7f035c8a7db396 Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; Date: Sun Jan 29 20:33:52 2023 +0100 - Update to 20.3.0 - Add AppStream metadata - Switch to SPDX license identifiers .gitignore | 1 + kodi-inputstream-adaptive.metainfo.xml | 11 ++++++ kodi-inputstream-adaptive.spec | 61 +++++++++++++++++++++------------- sources | 3 +- 4 files changed, 51 insertions(+), 25 deletions(-) --- diff --git a/.gitignore b/.gitignore index 3a81064..21bdada 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /inputstream.adaptive-*.tar.gz +/Bento4-1.6.0-639-5-Nexus.tar.gz diff --git a/kodi-inputstream-adaptive.metainfo.xml b/kodi-inputstream-adaptive.metainfo.xml new file mode 100644 index 0000000..c942cb5 --- /dev/null +++ b/kodi-inputstream-adaptive.metainfo.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="addon"> + <id>kodi-inputstream-adaptive</id> + <extends>kodi.desktop</extends> + <name>InputStream Adaptive</name> + <summary>InputStream client for adaptive streams</summary> + <url type="homepage">https://github.com/xbmc/inputstream.adaptive... + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0-or-later AND BSD-2-Clause-Views AND BSD-3-Clause AND RSA-MD</project_license> + <update_contact&gt;melmorabity(a)fedoraproject.org&lt;/update_contact&gt; +</component> diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec index 6ea39e0..4f8bc19 100644 --- a/kodi-inputstream-adaptive.spec +++ b/kodi-inputstream-adaptive.spec @@ -1,68 +1,81 @@ -%global aname inputstream.adaptive -%global kodi_version 19.0 -%global kodi_branch Matrix +%global kodi_addon inputstream.adaptive +%global kodi_version 20 +%global kodi_codename Nexus -# %%undefine __cmake_in_source_build +# Internal bento4 version (forked and maintained by Kodi developers, and +# required by this addon, see depends/common/bento4/bento4.txt) +%global internal_bento4_version 1.6.0-639 +%global internal_bento4_tag %{internal_bento4_version}-5-%{kodi_codename} Name: kodi-inputstream-adaptive -Version: 19.0.7 - -Release: 2%{?dist} +Version: 20.3.2 +Release: 1%{?dist} Summary: Adaptive file addon for Kodi's InputStream interface -# wvdecryper contains parts of Chromium CDM under BSD -License: GPLv2+ and BSD -URL: https://github.com/peak3d/%{aname}/ -Source0: %{url}/archive/%{version}-%{kodi_branch}/%{aname}-%{version}-%{kodi_branch}.tar.gz +# - wvdecrypter contains parts of Chromium CDM under +# BSD-2-Clause-Views/BSD-3-Clause +# - src/md5.* are RSA-MD +License: GPL-2.0-or-later AND BSD-2-Clause-Views AND BSD-3-Clause AND RSA-MD +URL: https://github.com/xbmc/%{kodi_addon}/ +Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz +Source1: https://github.com/xbmc/Bento4/archive/%{internal_bento4_tag}/Bento4-%{in... +Source2: %{name}.metainfo.xml BuildRequires: cmake3 BuildRequires: gcc-c++ -BuildRequires: gtest-devel BuildRequires: kodi-devel >= %{kodi_version} +BuildRequires: libappstream-glib BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(gtest) Requires: kodi%{?_isa} >= %{kodi_version} -Provides: bundled(bento4) +Provides: bundled(bento4) = %{internal_bento4_version} Provides: bundled(libwebm) Provides: bundled(md5-thilo) -ExcludeArch: %{power64} ppc64le +ExcludeArch: %{power64} %description %{summary}. %prep -%autosetup -n %{aname}-%{version}-%{kodi_branch} - -# Fix spurious-executable-perm on debug package -find . -name '*.h' -or -name '*.c' -or -name '*.cc' -or -name '*.cpp' | xargs chmod a-x +%autosetup -n %{kodi_addon}-%{version}-%{kodi_branch} %build -%cmake3 +%cmake3 -DENABLE_INTERNAL_BENTO4=1 -DBENTO4_URL=%{SOURCE1} %cmake3_build %install %cmake3_install -# Fix permissions at installation -chmod 0755 $RPM_BUILD_ROOT%{_libdir}/kodi/addons/%{aname}/*.so +# Install AppData file +install -Dpm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml + +# Fix permissions +chmod 0755 $RPM_BUILD_ROOT%{_libdir}/kodi/addons/%{kodi_addon}/libssd_wv.so %check %ctest +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.metainfo.xml %files %doc README.md -%license LICENSE.GPL -%{_libdir}/kodi/addons/%{aname}/ -%{_datadir}/kodi/addons/%{aname}/ +%license LICENSE.md LICENSES/ +%{_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; - 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; - 19.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index 1747d4d..b9e2f2c 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (inputstream.adaptive-19.0.7-Matrix.tar.gz) = e0cc3a7a153a32628ae0c56a98d662105f8de505ced2b8680afef3f11ee1a847af44c60fbe1ad40c6ad710ad382786b0adbea38e2a2d400c95fc42d1c9493d90 +SHA512 (Bento4-1.6.0-639-5-Nexus.tar.gz) = 8628c6b7f9cdd16fb2fb92848ce3248559e5160e2bb6d19da23634340e69c533b14775def77e897f1f030bedb9a0caa54d0645a3b39a22514b4ab844b63203aa +SHA512 (inputstream.adaptive-20.3.2.tar.gz) = dd64fc667dfa5a13c0a0fac9f64923c3dabdfedfd5f9deceb4bda80899fac9371cdd85cc3010f8c2b223e80b3339937c0e68c8bd505f1fd717dc9a6f73f20903