[mesa-freeworld] Update to 23.0.0-rc3
by Thorsten Leemhuis
commit 5ded12ca0c17a6bbf481abfc46a9dea65747c0d1
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Mon Jan 30 05:09:25 2023 +0100
Update to 23.0.0-rc3
.gitignore | 1 +
20933.patch | 35 +++++++++++++++
mesa-freeworld.spec | 13 +++++-
mesa-valgrind-build-fix.patch | 99 +++++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
5 files changed, 147 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe0be0d..32b914f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/mesa-22.3.1.tar.xz
/mesa-22.3.2.tar.xz
/mesa-22.3.3.tar.xz
+/mesa-23.0.0-rc3.tar.xz
diff --git a/20933.patch b/20933.patch
new file mode 100644
index 0000000..010ec78
--- /dev/null
+++ b/20933.patch
@@ -0,0 +1,35 @@
+From dd3730f8bdd7afdbc7fb0e9dd200951f9d713a34 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin.noel(a)collabora.com>
+Date: Thu, 26 Jan 2023 13:25:57 +0100
+Subject: [PATCH] kopper: Do not free the given screen in initScreen
+ implementation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The given screen is already freed by the caller in case a NULL-pointer is
+returned by the implementation.
+
+Cc: mesa-stable
+Signed-off-by: Corentin Noël <corentin.noel(a)collabora.com>
+Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz(a)gmail.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20933>
+---
+ src/gallium/frontends/dri/kopper.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c
+index 8453585b8471..9e8056975150 100644
+--- a/src/gallium/frontends/dri/kopper.c
++++ b/src/gallium/frontends/dri/kopper.c
+@@ -171,7 +171,6 @@ fail:
+ dri_destroy_screen_helper(screen);
+ if (screen->dev)
+ pipe_loader_release(&screen->dev, 1);
+- FREE(screen);
+ return NULL;
+ }
+
+--
+GitLab
+
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index f00794a..33f3ca5 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -56,9 +56,9 @@ algorithms and decoding only VC1 algorithm.
Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
-%global ver 22.3.3
+%global ver 23.0.0-rc3
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release: 2%{?dist}.1
+Release: 1%{?dist}.1
License: MIT
URL: http://www.mesa3d.org
@@ -71,6 +71,12 @@ Source2: org.mesa3d.vaapi.freeworld.metainfo.xml
Source3: org.mesa3d.vdpau.freeworld.metainfo.xml
Patch10: gnome-shell-glthread-disable.patch
+# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19778
+Patch11: mesa-valgrind-build-fix.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=2164667
+# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20933
+Patch12: 20933.patch
BuildRequires: meson >= 0.61.4
BuildRequires: gcc
@@ -286,6 +292,9 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%license docs/license.rst
%endif
%changelog
+* Mon Jan 30 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.0.0~rc3-1
+- Update to 23.0.0-rc3
+
* Wed Jan 18 2023 Luya Tshimbalanga <luya(a)fedoraproject.org> - 22.3.3-2.1
- Drop conflicts with provides
diff --git a/mesa-valgrind-build-fix.patch b/mesa-valgrind-build-fix.patch
new file mode 100644
index 0000000..ad20b37
--- /dev/null
+++ b/mesa-valgrind-build-fix.patch
@@ -0,0 +1,99 @@
+From 47bba327f44a801d41b9f52c900d75eb03dcb9f6 Mon Sep 17 00:00:00 2001
+From: Karol Herbst <kherbst(a)redhat.com>
+Date: Wed, 16 Nov 2022 11:50:51 +0100
+Subject: [PATCH] rusticl: fix build error with valgrind being enabled
+
+This bumps the meson requierement to 1.0 because it requires
+https://github.com/mesonbuild/meson/pull/11024
+
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7688
+Fixes: 20c90fed5a0 ("rusticl: added")
+Signed-off-by: Karol Herbst <kherbst(a)redhat.com>
+---
+ .gitlab-ci/container/debian/x86_build-base.sh | 4 ++--
+ .gitlab-ci/image-tags.yml | 2 +-
+ docs/rusticl.rst | 2 +-
+ meson.build | 4 ++--
+ src/gallium/frontends/rusticl/meson.build | 4 ++++
+ 5 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/.gitlab-ci/container/debian/x86_build-base.sh b/.gitlab-ci/container/debian/x86_build-base.sh
+index 215db4820d15..2332323fe1a6 100644
+--- a/.gitlab-ci/container/debian/x86_build-base.sh
++++ b/.gitlab-ci/container/debian/x86_build-base.sh
+@@ -78,8 +78,8 @@ apt-get install -y --no-remove \
+ # Needed for ci-fairy, this revision is able to upload files to MinIO
+ pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab75...
+
+-# We need at least 0.61.4 for proper Rust; 0.62 for modern meson env2mfile
+-pip3 install meson==0.63.3
++# We need at least 1.0.0 for proper Rust; 0.62 for modern meson env2mfile
++pip3 install meson==1.0.0
+
+ . .gitlab-ci/container/build-rust.sh
+
+diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
+index 1ecfa6ff23e6..eba9fa486562 100644
+--- a/.gitlab-ci/image-tags.yml
++++ b/.gitlab-ci/image-tags.yml
+@@ -1,6 +1,6 @@
+ variables:
+ DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
+- DEBIAN_BASE_TAG: "2023-01-10-robust-wget"
++ DEBIAN_BASE_TAG: "2023-01-25-rust-valgrind"
+
+ DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
+ DEBIAN_BUILD_TAG: "2023-01-09-lavacli"
+diff --git a/docs/rusticl.rst b/docs/rusticl.rst
+index 45f99bcca3cb..9217fc766af7 100644
+--- a/docs/rusticl.rst
++++ b/docs/rusticl.rst
+@@ -19,7 +19,7 @@ To build Rusticl you need to satisfy the following build dependencies:
+ The minimum versions to build Rusticl are:
+
+ - Rust: 1.59
+-- Meson: 0.61.4
++- Meson: 1.0.0
+ - Bindgen: 0.58.0
+ - LLVM: 11.0.0 (recommended: 15.0.0)
+ - SPIRV-Tools: any version (recommended: v2022.3)
+diff --git a/meson.build b/meson.build
+index 17669575dc2d..8a3a5b7045de 100644
+--- a/meson.build
++++ b/meson.build
+@@ -784,8 +784,8 @@ if with_gallium_rusticl
+ error('rusticl requires at least one gallium driver.')
+ endif
+
+- if meson.version().version_compare('< 0.61.4')
+- error('rusticl requires meson 0.61.4 or newer')
++ if meson.version().version_compare('< 1.0.0')
++ error('rusticl requires meson 1.0.0 or newer')
+ endif
+
+ add_languages('rust', required: true)
+diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
+index 5bfa6faf5af3..e53b50a9b8b8 100644
+--- a/src/gallium/frontends/rusticl/meson.build
++++ b/src/gallium/frontends/rusticl/meson.build
+@@ -195,6 +195,7 @@ rusticl_mesa_bindings_inline_wrapper = static_library(
+ ],
+ dependencies: [
+ idep_nir_headers,
++ dep_valgrind,
+ ],
+ )
+
+@@ -209,6 +210,9 @@ rusticl_mesa_bindings_rs = rust.bindgen(
+ inc_nir,
+ inc_src,
+ ],
++ dependencies: [
++ dep_valgrind,
++ ],
+ c_args : [
+ rusticl_bindgen_c_args,
+ pre_args,
+--
+GitLab
+
diff --git a/sources b/sources
index 0093189..860a3c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-22.3.3.tar.xz) = dcf166bc7c80e6ad09337e0188219e5ea4bdc558bc4b4ca35ce30d5421568f6b5328e5508b3175a2696521214e466354d8652ade22468ce448d9f61d5709c8a1
+SHA512 (mesa-23.0.0-rc3.tar.xz) = adad86189ae27eb5cf89d7b6e0626a78f49f5a72cdea0f4eb59d76aae74c657251d07c3142c578e1e13edef73947d4807c25eebf9598b8a0e16a70c584916ce5
1 year, 2 months
[kodi-pvr-iptvsimple] - Update to 20.6.1 - Add AppStream metadata - Switch to SPDX license identifiers
by Mohamed ElMorabity
commit a6842fa3d4c8b86fab09e99cc08f381135038aa0
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Jan 29 23:47:16 2023 +0100
- Update to 20.6.1
- Add AppStream metadata
- Switch to SPDX license identifiers
.gitignore | 1 +
kodi-pvr-iptvsimple.metainfo.xml | 11 +++++++++++
kodi-pvr-iptvsimple.spec | 30 ++++++++++++++++++++++++------
sources | 2 +-
4 files changed, 37 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ecd2df..c54f47f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/pvr.iptvsimple-7.0.0.tar.gz
/pvr.iptvsimple-7.3.0.tar.gz
/pvr.iptvsimple-7.6.7.tar.gz
+/pvr.iptvsimple-20.6.1.tar.gz
diff --git a/kodi-pvr-iptvsimple.metainfo.xml b/kodi-pvr-iptvsimple.metainfo.xml
new file mode 100644
index 0000000..7cc1609
--- /dev/null
+++ b/kodi-pvr-iptvsimple.metainfo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+ <id>kodi-peripheral-joystick</id>
+ <extends>kodi.desktop</extends>
+ <name>Joystick Support</name>
+ <summary>Kodi Joystick Library</summary>
+ <url type="homepage">https://github.com/xbmc/peripheral.joystick/</url>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0-or-later</project_license>
+ <update_contact>melmorabity(a)fedoraproject.org</update_contact>
+</component>
diff --git a/kodi-pvr-iptvsimple.spec b/kodi-pvr-iptvsimple.spec
index 6f3878c..420db5c 100644
--- a/kodi-pvr-iptvsimple.spec
+++ b/kodi-pvr-iptvsimple.spec
@@ -1,27 +1,32 @@
%global kodi_addon pvr.iptvsimple
-%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.6.7
-Release: 4%{?dist}
+Version: 20.6.1
+Release: 1%{?dist}
Summary: Simple IPTV PVR for Kodi
-License: GPLv2+
+License: GPL-2.0-or-later
URL: https://github.com/kodi-pvr/%{kodi_addon}/
Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz
+Source1: %{name}.metainfo.xml
BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
+BuildRequires: libappstream-glib
BuildRequires: pkgconfig(pugixml)
BuildRequires: pkgconfig(zlib)
BuildRequires: xz-devel
Requires: kodi >= %{kodi_version}
-ExcludeArch: %{power64} ppc64le
+Requires: kodi-inputstream-adaptive%{?_isa} >= %{kodi_version}
+Requires: kodi-inputstream-ffmpegdirect%{?_isa} >= %{kodi_version}
+Requires: kodi-inputstream-rtmp%{?_isa} >= %{kodi_version}
+ExcludeArch: %{power64}
%description
%{summary}.
@@ -39,15 +44,28 @@ ExcludeArch: %{power64} ppc64le
%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> - 1:20.6.1-1
+- Update to 20.6.1
+- Add AppStream metadata
+- Switch to SPDX license identifiers
+
* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1:7.6.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index 268cd7e..f30a108 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pvr.iptvsimple-7.6.7.tar.gz) = ba9d70da83cb503f30027b2d57941f84a13b335596d085cc59a1dc61ce05e08735c6dd260fc17ac9175035a5928f211d045a8da462e323f6e9d7ed852eeede95
+SHA512 (pvr.iptvsimple-20.6.1.tar.gz) = 0cd1e3a7c08f8fd2d28f75f82db4611f2cf306ed92ccb802dc30d39f8ce6a235e7502797d2a14c719e3eb93146210bc66300815f0c05b3921adfc719b299091e
1 year, 2 months
[kodi-pvr-iptvsimple/f36] Update to 19.2.2
by Mohamed ElMorabity
commit 6d89543cbcac291db4738c3b558324e0f230f7ab
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Mon Jan 30 00:00:43 2023 +0100
Update to 19.2.2
.gitignore | 1 +
kodi-pvr-iptvsimple.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ecd2df..bc3f067 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/pvr.iptvsimple-7.0.0.tar.gz
/pvr.iptvsimple-7.3.0.tar.gz
/pvr.iptvsimple-7.6.7.tar.gz
+/pvr.iptvsimple-19.2.2.tar.gz
diff --git a/kodi-pvr-iptvsimple.spec b/kodi-pvr-iptvsimple.spec
index bc6668f..c3feb35 100644
--- a/kodi-pvr-iptvsimple.spec
+++ b/kodi-pvr-iptvsimple.spec
@@ -6,8 +6,8 @@ Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
Epoch: 1
-Version: 7.6.7
-Release: 3%{?dist}
+Version: 19.2.2
+Release: 1%{?dist}
Summary: Simple IPTV PVR for Kodi
License: GPLv2+
@@ -48,6 +48,9 @@ ExcludeArch: %{power64} ppc64le
%changelog
+* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:19.2.2-1
+- Update to 19.2.2
+
* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1:7.6.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index 268cd7e..948df1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pvr.iptvsimple-7.6.7.tar.gz) = ba9d70da83cb503f30027b2d57941f84a13b335596d085cc59a1dc61ce05e08735c6dd260fc17ac9175035a5928f211d045a8da462e323f6e9d7ed852eeede95
+SHA512 (pvr.iptvsimple-19.2.2.tar.gz) = 4076af7738cea0b259d414f2f4aa649adbd9cd14fd89000edd19242d30e29f8ec67fae75b2998067b0299120062bc59099b62db955ad1c91848a06c9d6761336
1 year, 2 months
[kodi-pvr-iptvsimple/f37] Update to 19.2.2
by Mohamed ElMorabity
commit 8e8ad55041ca2914902397d039d19177e519caa5
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Mon Jan 30 00:00:43 2023 +0100
Update to 19.2.2
.gitignore | 1 +
kodi-pvr-iptvsimple.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ecd2df..bc3f067 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/pvr.iptvsimple-7.0.0.tar.gz
/pvr.iptvsimple-7.3.0.tar.gz
/pvr.iptvsimple-7.6.7.tar.gz
+/pvr.iptvsimple-19.2.2.tar.gz
diff --git a/kodi-pvr-iptvsimple.spec b/kodi-pvr-iptvsimple.spec
index 6f3878c..3f02b23 100644
--- a/kodi-pvr-iptvsimple.spec
+++ b/kodi-pvr-iptvsimple.spec
@@ -6,8 +6,8 @@ Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
Epoch: 1
-Version: 7.6.7
-Release: 4%{?dist}
+Version: 19.2.2
+Release: 1%{?dist}
Summary: Simple IPTV PVR for Kodi
License: GPLv2+
@@ -48,6 +48,9 @@ ExcludeArch: %{power64} ppc64le
%changelog
+* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:19.2.2-1
+- Update to 19.2.2
+
* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1:7.6.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index 268cd7e..948df1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pvr.iptvsimple-7.6.7.tar.gz) = ba9d70da83cb503f30027b2d57941f84a13b335596d085cc59a1dc61ce05e08735c6dd260fc17ac9175035a5928f211d045a8da462e323f6e9d7ed852eeede95
+SHA512 (pvr.iptvsimple-19.2.2.tar.gz) = 4076af7738cea0b259d414f2f4aa649adbd9cd14fd89000edd19242d30e29f8ec67fae75b2998067b0299120062bc59099b62db955ad1c91848a06c9d6761336
1 year, 2 months
[kodi-inputstream-adaptive] Fix build with GCC 13
by Mohamed ElMorabity
commit 62bfe3add4663d2ec5536e367fe5ffb045695d4c
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Jan 29 23:01:15 2023 +0100
Fix build with GCC 13
kodi-inputstream-adaptive-20.3.2-gcc13.patch | 84 ++++++++++++++++++++++++++++
kodi-inputstream-adaptive.spec | 13 +++--
2 files changed, 93 insertions(+), 4 deletions(-)
---
diff --git a/kodi-inputstream-adaptive-20.3.2-gcc13.patch b/kodi-inputstream-adaptive-20.3.2-gcc13.patch
new file mode 100644
index 0000000..dfe02df
--- /dev/null
+++ b/kodi-inputstream-adaptive-20.3.2-gcc13.patch
@@ -0,0 +1,84 @@
+diff -up ./src/common/AdaptiveDecrypter.h.orig ./src/common/AdaptiveDecrypter.h
+--- ./src/common/AdaptiveDecrypter.h.orig 2023-01-11 22:37:47.000000000 +0100
++++ ./src/common/AdaptiveDecrypter.h 2023-01-29 22:50:19.875120342 +0100
+@@ -12,6 +12,7 @@
+
+ #include <stdexcept>
+ #include <string_view>
++#include <cstdint>
+
+ #include <bento4/Ap4.h>
+
+diff -up ./src/Iaes_decrypter.h.orig ./src/Iaes_decrypter.h
+--- ./src/Iaes_decrypter.h.orig 2023-01-11 22:37:47.000000000 +0100
++++ ./src/Iaes_decrypter.h 2023-01-29 22:49:06.804158436 +0100
+@@ -11,6 +11,7 @@
+ #include <bento4/Ap4Types.h>
+
+ #include <string>
++#include <cstdint>
+
+ class IAESDecrypter
+ {
+@@ -31,4 +32,4 @@ public:
+
+ private:
+ std::string m_licenseKey;
+-};
+\ Pas de fin de ligne à la fin du fichier
++};
+diff -up ./src/SSD_dll.h.orig ./src/SSD_dll.h
+--- ./src/SSD_dll.h.orig 2023-01-11 22:37:47.000000000 +0100
++++ ./src/SSD_dll.h 2023-01-29 22:43:40.145864970 +0100
+@@ -10,6 +10,7 @@
+
+ #include <stdarg.h> // va_list, va_start, va_arg, va_end
+ #include <string_view>
++#include <cstdint>
+
+ //Functionality wich is supported by the Decrypter
+ class Adaptive_CencSingleSampleDecrypter;
+diff -up ./src/test/KodiStubs.h.orig ./src/test/KodiStubs.h
+--- ./src/test/KodiStubs.h.orig 2023-01-11 22:37:47.000000000 +0100
++++ ./src/test/KodiStubs.h 2023-01-29 22:54:37.546519345 +0100
+@@ -12,6 +12,7 @@
+
+ #include <string>
+ #include <vector>
++#include <cstdint>
+
+ #ifdef _WIN32 // windows
+ #if !defined(_SSIZE_T_DEFINED) && !defined(HAVE_SSIZE_T)
+diff -up ./src/utils/PropertiesUtils.h.orig ./src/utils/PropertiesUtils.h
+--- ./src/utils/PropertiesUtils.h.orig 2023-01-11 22:37:47.000000000 +0100
++++ ./src/utils/PropertiesUtils.h 2023-01-29 22:51:41.581198149 +0100
+@@ -11,6 +11,7 @@
+ #include <map>
+ #include <string>
+ #include <utility>
++#include <cstdint>
+
+ namespace UTILS
+ {
+diff -up ./src/utils/StringUtils.h.orig ./src/utils/StringUtils.h
+--- ./src/utils/StringUtils.h.orig 2023-01-11 22:37:47.000000000 +0100
++++ ./src/utils/StringUtils.h 2023-01-29 22:55:37.497310175 +0100
+@@ -11,6 +11,7 @@
+ #include <string>
+ #include <string_view>
+ #include <vector>
++#include <cstdint>
+
+ namespace UTILS
+ {
+diff -up ./src/utils/Utils.h.orig ./src/utils/Utils.h
+--- ./src/utils/Utils.h.orig 2023-01-11 22:37:47.000000000 +0100
++++ ./src/utils/Utils.h 2023-01-29 22:53:01.149247750 +0100
+@@ -12,6 +12,7 @@
+ #include <string>
+ #include <string_view>
+ #include <vector>
++#include <cstdint>
+
+ namespace UTILS
+ {
diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec
index 1783597..3201c1b 100644
--- a/kodi-inputstream-adaptive.spec
+++ b/kodi-inputstream-adaptive.spec
@@ -9,7 +9,7 @@
Name: kodi-inputstream-adaptive
Version: 20.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Adaptive file addon for Kodi's InputStream interface
# - wvdecrypter contains parts of Chromium CDM under
@@ -20,6 +20,8 @@ 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
+# Fix build with GCC 13
+Patch0: %{name}-20.3.2-gcc13.patch
BuildRequires: cmake3
BuildRequires: gcc-c++
@@ -39,7 +41,7 @@ ExcludeArch: %{power64}
%prep
-%autosetup -n %{kodi_addon}-%{version}-%{kodi_codename}
+%autosetup -n %{kodi_addon}-%{version}-%{kodi_codename} -p0
%build
@@ -71,8 +73,11 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.met
%changelog
-* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 20.3.0-1
-- Update to 20.3.0
+* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 20.3.2-2
+- Fix build with GCC 13
+
+* Sun Jan 29 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 20.3.2-1
+- Update to 20.3.2
- Add AppStream metadata
- Switch to SPDX license identifiers
1 year, 2 months
[kodi-pvr-dvblink] Add missing AppStream file
by Mohamed ElMorabity
commit 95a18aefb92a608136677697f448fa0a82191810
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Jan 29 22:32:10 2023 +0100
Add missing AppStream file
kodi-pvr-dvblink.metainfo.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
---
diff --git a/kodi-pvr-dvblink.metainfo.xml b/kodi-pvr-dvblink.metainfo.xml
new file mode 100644
index 0000000..436c221
--- /dev/null
+++ b/kodi-pvr-dvblink.metainfo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+ <id>kodi-peripheral-joystick</id>
+ <extends>kodi.desktop</extends>
+ <name>TVMosaic/DVBLink PVR Client</name>
+ <summary>PVR Plugin for TVMosaic/DVBLink</summary>
+ <url type="homepage">https://github.com/kodi-pvr/pvr.dvblink/</url>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0-or-later AND MIT</project_license>
+ <update_contact>melmorabity(a)fedoraproject.org</update_contact>
+</component>
1 year, 2 months
[kodi-inputstream-adaptive] Typo
by Mohamed ElMorabity
commit 9f21de23716b01bc2f4ffe33ce586f9832e5619e
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Jan 29 22:27:38 2023 +0100
Typo
kodi-inputstream-adaptive.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec
index 4f8bc19..1783597 100644
--- a/kodi-inputstream-adaptive.spec
+++ b/kodi-inputstream-adaptive.spec
@@ -39,7 +39,7 @@ ExcludeArch: %{power64}
%prep
-%autosetup -n %{kodi_addon}-%{version}-%{kodi_branch}
+%autosetup -n %{kodi_addon}-%{version}-%{kodi_codename}
%build
1 year, 2 months
[kodi-pvr-hts] - Update to 20.6.0 - Add AppStream metadata - Switch to SPDX license identifiers
by Mohamed ElMorabity
commit 348b643e666f09b4bc8e0f668df9d94057b5b81e
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Jan 29 22:27:13 2023 +0100
- Update to 20.6.0
- Add AppStream metadata
- Switch to SPDX license identifiers
.gitignore | 1 +
kodi-pvr-hts.metainfo.xml | 11 +++++++++++
kodi-pvr-hts.spec | 32 ++++++++++++++++++++++++--------
sources | 2 +-
4 files changed, 37 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b928260..5952884 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/pvr.hts-8.2.2.tar.gz
/pvr.hts-8.3.2.tar.gz
/pvr.hts-19.0.6.tar.gz
+/pvr.hts-20.6.0.tar.gz
diff --git a/kodi-pvr-hts.metainfo.xml b/kodi-pvr-hts.metainfo.xml
new file mode 100644
index 0000000..6d92ac2
--- /dev/null
+++ b/kodi-pvr-hts.metainfo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+ <id>kodi-pvr-hts</id>
+ <extends>kodi.desktop</extends>
+ <name>Tvheadend HTSP Client</name>
+ <summary>Kodi's frontend for Tvheadend</summary>
+ <url type="homepage">https://github.com/kodi-pvr/pvr.hts/</url>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT</project_license>
+ <update_contact>melmorabity(a)fedoraproject.org</update_contact>
+</component>
diff --git a/kodi-pvr-hts.spec b/kodi-pvr-hts.spec
index 88c2029..529eb08 100644
--- a/kodi-pvr-hts.spec
+++ b/kodi-pvr-hts.spec
@@ -1,27 +1,31 @@
%global kodi_addon pvr.hts
-%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: 19.0.6
-Release: 2%{?dist}
+Version: 20.6.0
+Release: 1%{?dist}
Summary: TVHeadEnd PVR for Kodi
-# Addon is GPLv2+. SHA1 implementation from FFmpeg bundled in
-# lib/libhts is LGPLv2+
-License: GPLv2+ and LGPLv2+
+# - Addon is GPL-2.0-or-later
+# - SHA1 implementation from FFmpeg bundled in lib/libhts is LGPL-2.1-or-later
+# - lib/kissnet is MIT
+License: GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
URL: https://github.com/kodi-pvr/%{kodi_addon}/
Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz
+Source1: %{name}.metainfo.xml
BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
+BuildRequires: libappstream-glib
Requires: kodi >= %{kodi_version}
+Provides: bundled(kissnet)
Provides: bundled(sha1-ffmpeg)
-ExcludeArch: %{power64} ppc64le
+ExcludeArch: %{power64}
%description
%{summary}.
@@ -38,6 +42,12 @@ ExcludeArch: %{power64} ppc64le
%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
@@ -45,9 +55,15 @@ ExcludeArch: %{power64} ppc64le
%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> - 1:20.6.0-1
+- Update to 20.6.0
+- Add AppStream metadata
+- Switch to SPDX license identifiers
+
* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1:19.0.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index 90c517d..38fe262 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pvr.hts-19.0.6.tar.gz) = 81fd5e18aaacd428aad8e36766a3c5ed71dd22f50b6cffd9238bfd0bce5811a2d30c43c9097e15b53d308b61eb4af87d9e04051b996df941cab41523957754fe
+SHA512 (pvr.hts-20.6.0.tar.gz) = e49803f4aeb0217e34be657f1d933ac1439610df268b759af9acf78f5b18bdc329f8528fe573e40304d23f18831a557bf2690569258fd6b66ea8566ca45b982b
1 year, 2 months
[kodi-pvr-filmon] - Update to 20.3.0 - Add AppStream metadata - Switch to SPDX license identifiers
by Mohamed ElMorabity
commit 097499621160d4a9d361e052db38ec2141b0b0de
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Jan 29 22:10:41 2023 +0100
- Update to 20.3.0
- Add AppStream metadata
- Switch to SPDX license identifiers
.gitignore | 1 +
kodi-pvr-filmon.metainfo.xml | 11 +++++++++++
kodi-pvr-filmon.spec | 29 ++++++++++++++++++++++-------
sources | 2 +-
4 files changed, 35 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc1595a..488200a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/pvr.filmon-5.1.0.tar.gz
/pvr.filmon-6.0.0.tar.gz
/pvr.filmon-6.1.1.tar.gz
+/pvr.filmon-20.3.0.tar.gz
diff --git a/kodi-pvr-filmon.metainfo.xml b/kodi-pvr-filmon.metainfo.xml
new file mode 100644
index 0000000..f9d9dca
--- /dev/null
+++ b/kodi-pvr-filmon.metainfo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+ <id>kodi-peripheral-joystick</id>
+ <extends>kodi.desktop</extends>
+ <name>Filmon Client</name>
+ <summary>Filmon PVR Client</summary>
+ <url type="homepage">https://github.com/kodi-pvr/pvr.filmon/</url>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0-or-later</project_license>
+ <update_contact>melmorabity(a)fedoraproject.org</update_contact>
+</component>
diff --git a/kodi-pvr-filmon.spec b/kodi-pvr-filmon.spec
index 167488d..5841f14 100644
--- a/kodi-pvr-filmon.spec
+++ b/kodi-pvr-filmon.spec
@@ -1,25 +1,27 @@
%global kodi_addon pvr.filmon
-%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: 6.1.1
-Release: 4%{?dist}
+Version: 20.3.0
+Release: 1%{?dist}
Summary: FilmOn PVR for Kodi
-License: GPLv2+
+License: GPL-2.0-or-later
URL: https://github.com/kodi-pvr/%{kodi_addon}/
Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz
+Source1: %{name}.metainfo.xml
BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
+BuildRequires: libappstream-glib
BuildRequires: pkgconfig(jsoncpp)
Requires: kodi >= %{kodi_version}
-ExcludeArch: %{power64} ppc64le
+ExcludeArch: %{power64}
%description
%{summary}.
@@ -31,7 +33,7 @@ ExcludeArch: %{power64} ppc64le
%build
# https://gitlab.kitware.com/cmake/cmake/issues/17555#note_355574
-export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+# export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
%cmake3
%cmake3_build
@@ -39,15 +41,28 @@ export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
%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> - 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> - 1:6.1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index b160b22..f298e48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pvr.filmon-6.1.1.tar.gz) = 435bdb66092a7c48093915bb4a70ad6fb266f6706d130d1be31e272b12ae1bedf0f42b57fa81385cbeec0f948b8a3664fc1a4ea590f5c179e74266a506f08631
+SHA512 (pvr.filmon-20.3.0.tar.gz) = 13fd81bfc4272d6a3bc84550c820df269c764a0956c1f3d6d9362e6bb96dd86e2efbb4d06ab8ca695c7719032d03cff7d08bbb1b5962f4a458b606cac42da9ee
1 year, 2 months
[kodi-pvr-dvbviewer] - Update to 20.4.0 - Add AppStream metadata - Switch to SPDX license identifiers
by Mohamed ElMorabity
commit 5f38f60a6734e8d2a5870347b64ae44827ac5b5a
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Jan 29 22:05:32 2023 +0100
- Update to 20.4.0
- Add AppStream metadata
- Switch to SPDX license identifiers
.gitignore | 1 +
kodi-pvr-dvbviewer.metainfo.xml | 11 +++++++++++
kodi-pvr-dvbviewer.spec | 27 +++++++++++++++++++++------
sources | 2 +-
4 files changed, 34 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e5ac9f7..cf6d47f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/pvr.dvbviewer-7.1.0.tar.gz
/pvr.dvbviewer-7.2.0.tar.gz
/pvr.dvbviewer-7.3.1.tar.gz
+/pvr.dvbviewer-20.4.0.tar.gz
diff --git a/kodi-pvr-dvbviewer.metainfo.xml b/kodi-pvr-dvbviewer.metainfo.xml
new file mode 100644
index 0000000..06573c5
--- /dev/null
+++ b/kodi-pvr-dvbviewer.metainfo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+ <id>kodi-peripheral-joystick</id>
+ <extends>kodi.desktop</extends>
+ <name>DVBViewer Client</name>
+ <summary>Kodi's frontend for DVBViewer</summary>
+ <url type="homepage">https://github.com/kodi-pvr/pvr.dvbviewer/</url>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0-or-later</project_license>
+ <update_contact>melmorabity(a)fedoraproject.org</update_contact>
+</component>
diff --git a/kodi-pvr-dvbviewer.spec b/kodi-pvr-dvbviewer.spec
index 4bf340b..77bccc7 100644
--- a/kodi-pvr-dvbviewer.spec
+++ b/kodi-pvr-dvbviewer.spec
@@ -1,25 +1,27 @@
%global kodi_addon pvr.dvbviewer
-%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.4.0
+Release: 1%{?dist}
Summary: DVBViewer PVR for Kodi
-License: GPLv2+
+License: GPL-2.0-or-later
URL: https://github.com/kodi-pvr/%{kodi_addon}/
Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz
+Source1: %{name}.metainfo.xml
BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
+BuildRequires: libappstream-glib
BuildRequires: pkgconfig(tinyxml)
Requires: kodi >= %{kodi_version}
-ExcludeArch: %{power64} ppc64le
+ExcludeArch: %{power64}
%description
%{summary}.
@@ -37,15 +39,28 @@ ExcludeArch: %{power64} ppc64le
%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> - 1:20.4.0-1
+- Update to 20.4.0
+- Add AppStream metadata
+- Switch to SPDX license identifiers
+
* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 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 1fd7936..b0e59bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pvr.dvbviewer-7.3.1.tar.gz) = ce81ab7712e7e428eac8569fa866afb69401046d93f096331ad491ca71ee2f56064824719d994dfe1c28d3c9e29282d17a757b9c8e003e5ca7083b617e26c223
+SHA512 (pvr.dvbviewer-20.4.0.tar.gz) = defbd647d408cd4a30379eeeebb0a4388afd17ecdfb72efb5e9efee8c281f3fb408606d26728de6be3836f1f3ab7fe43ca4c035577dcb5aad53a1f3bc3613cde
1 year, 2 months