[kodi-inputstream-adaptive/f38] Update to 20.3.9
by Michael Cronenworth
commit f6f14a2240133fe2e7098015bedf632c680ad2e9
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Sat Jul 8 22:21:19 2023 -0500
Update to 20.3.9
.gitignore | 3 +--
kodi-inputstream-adaptive.spec | 9 ++++++---
sources | 4 ++--
3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d6adbc..d32eba9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
/inputstream.adaptive-*.tar.gz
-/Bento4-1.6.0-639-5-Nexus.tar.gz
-/Bento4-1.6.0-639-6-Nexus.tar.gz
+/Bento4-1.6.0-639-7-Omega.tar.gz
diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec
index cbc2b1b..643980d 100644
--- a/kodi-inputstream-adaptive.spec
+++ b/kodi-inputstream-adaptive.spec
@@ -5,10 +5,10 @@
# 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}-6-%{kodi_codename}
+%global internal_bento4_tag %{internal_bento4_version}-7-Omega
Name: kodi-inputstream-adaptive
-Version: 20.3.6
+Version: 20.3.9
Release: 1%{?dist}
Summary: Adaptive file addon for Kodi's InputStream interface
@@ -17,7 +17,7 @@ Summary: Adaptive file addon for Kodi's InputStream interface
# - 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
+Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}-%{kodi_codename}.tar.gz
Source1: https://github.com/xbmc/Bento4/archive/%{internal_bento4_tag}/Bento4-%{in...
Source2: %{name}.metainfo.xml
# Fix build with GCC 13
@@ -73,6 +73,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.met
%changelog
+* Sat Jul 08 2023 Michael Cronenworth <mike(a)cchtml.com> - 20.3.9-1
+- Update to 20.3.9
+
* Sun Apr 09 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 20.3.6-1
- Update to 20.3.6
diff --git a/sources b/sources
index d2a2a3b..49c10e0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (Bento4-1.6.0-639-6-Nexus.tar.gz) = 08c359fb75f42d095ae040fb4dff020c902ba24677a95360fb845245ba3881423961bff6c8f0d2a791d387aa58ebe50b4998bedb866e0b7b58321bf8cdd4b1c3
-SHA512 (inputstream.adaptive-20.3.6.tar.gz) = 010af7abfeeed375d4c3457f5d7a9aa848edbf247427b72f64f1f4e26870ad39ec4a9b1e6bc9479ce41dc01779f9a7d0bdbb8f005f7e8afde9ea59f9e31d879d
+SHA512 (inputstream.adaptive-20.3.9-Nexus.tar.gz) = 95045e4438ee02f0fb95908e36e9e4812b5674eea167cd72ad5e75e0009f21e837cb0cc803be13b90b67318f9ef8f3c1b6ede518a8484223861ced8480240127
+SHA512 (Bento4-1.6.0-639-7-Omega.tar.gz) = bf257e5831eec44db944d1313858262c1ba32b6e67564bb8f809a1aa0fc8a55faaaac2357d80f1ce2e794914f6bec5263548e77802db2b9e52998af2b6276809
1 year, 4 months
[kodi-inputstream-adaptive] Update to 20.3.9
by Michael Cronenworth
commit de8bc4f18f4fac9c892db9789b07acd8401768bc
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Sat Jul 8 22:21:19 2023 -0500
Update to 20.3.9
.gitignore | 3 +--
kodi-inputstream-adaptive.spec | 9 ++++++---
sources | 4 ++--
3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d6adbc..d32eba9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
/inputstream.adaptive-*.tar.gz
-/Bento4-1.6.0-639-5-Nexus.tar.gz
-/Bento4-1.6.0-639-6-Nexus.tar.gz
+/Bento4-1.6.0-639-7-Omega.tar.gz
diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec
index cbc2b1b..643980d 100644
--- a/kodi-inputstream-adaptive.spec
+++ b/kodi-inputstream-adaptive.spec
@@ -5,10 +5,10 @@
# 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}-6-%{kodi_codename}
+%global internal_bento4_tag %{internal_bento4_version}-7-Omega
Name: kodi-inputstream-adaptive
-Version: 20.3.6
+Version: 20.3.9
Release: 1%{?dist}
Summary: Adaptive file addon for Kodi's InputStream interface
@@ -17,7 +17,7 @@ Summary: Adaptive file addon for Kodi's InputStream interface
# - 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
+Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}-%{kodi_codename}.tar.gz
Source1: https://github.com/xbmc/Bento4/archive/%{internal_bento4_tag}/Bento4-%{in...
Source2: %{name}.metainfo.xml
# Fix build with GCC 13
@@ -73,6 +73,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{name}.met
%changelog
+* Sat Jul 08 2023 Michael Cronenworth <mike(a)cchtml.com> - 20.3.9-1
+- Update to 20.3.9
+
* Sun Apr 09 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 20.3.6-1
- Update to 20.3.6
diff --git a/sources b/sources
index d2a2a3b..49c10e0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (Bento4-1.6.0-639-6-Nexus.tar.gz) = 08c359fb75f42d095ae040fb4dff020c902ba24677a95360fb845245ba3881423961bff6c8f0d2a791d387aa58ebe50b4998bedb866e0b7b58321bf8cdd4b1c3
-SHA512 (inputstream.adaptive-20.3.6.tar.gz) = 010af7abfeeed375d4c3457f5d7a9aa848edbf247427b72f64f1f4e26870ad39ec4a9b1e6bc9479ce41dc01779f9a7d0bdbb8f005f7e8afde9ea59f9e31d879d
+SHA512 (inputstream.adaptive-20.3.9-Nexus.tar.gz) = 95045e4438ee02f0fb95908e36e9e4812b5674eea167cd72ad5e75e0009f21e837cb0cc803be13b90b67318f9ef8f3c1b6ede518a8484223861ced8480240127
+SHA512 (Bento4-1.6.0-639-7-Omega.tar.gz) = bf257e5831eec44db944d1313858262c1ba32b6e67564bb8f809a1aa0fc8a55faaaac2357d80f1ce2e794914f6bec5263548e77802db2b9e52998af2b6276809
1 year, 4 months
[VirtualBox] Rebuilt for Python 3.12
by Leigh Scott
commit 1aed2d1e8db71fd7955ab54e9c9a9f4c5d13ae39
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jul 8 21:57:47 2023 +0100
Rebuilt for Python 3.12
VirtualBox.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 9544a22..6bd9368 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -46,7 +46,7 @@
Name: VirtualBox
Version: 7.0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -900,6 +900,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Sat Jul 08 2023 Leigh Scott <leigh123linux(a)gmail.com> - 7.0.8-4
+- Rebuilt for Python 3.12
+
* Sun May 21 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.8-3
- (#6660) Fix the documentation, the vboxpci module is not shipped since VirtualBox 6.1.0
1 year, 4 months
[kodi] Fix gcc error
by Leigh Scott
commit 715bed2b455c68a8373a9700d5845e4210399f7f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jul 8 21:18:00 2023 +0100
Fix gcc error
kodi.spec | 4 ++++
tp_watched_initializer.patch | 10 ++++++++++
2 files changed, 14 insertions(+)
---
diff --git a/kodi.spec b/kodi.spec
index 9f6f6cb..5827da2 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -78,6 +78,9 @@ Patch2: kodi-20-annobin-workaround.patch
Patch3: https://github.com/xbmc/xbmc/pull/23453.patch#/fmt10_buildfix.patch
+# Add initializer for tp_watched
+Patch4: tp_watched_initializer.patch
+
%ifarch x86_64
%global _with_crystalhd 1
%endif
@@ -302,6 +305,7 @@ This package contains FirewallD files for Kodi.
%patch -P 2 -p1 -b.innobinfix
%if 0%{?fedora} && 0%{?fedora} > 38
%patch -P 3 -p1 -b.fmt
+%patch -P 4 -p1 -b.initializer
%endif
# Fix up Python shebangs
diff --git a/tp_watched_initializer.patch b/tp_watched_initializer.patch
new file mode 100644
index 0000000..45fa7ca
--- /dev/null
+++ b/tp_watched_initializer.patch
@@ -0,0 +1,10 @@
+--- a/xbmc/interfaces/python/swig.cpp
++++ b/xbmc/interfaces/python/swig.cpp
+@@ -72,6 +72,7 @@ namespace PythonBindings
+ #if PY_VERSION_HEX < 0x03090000
+ 0,
+ #endif
++ 0
+ };
+
+ static int size = (long*)&(py_type_object_header.tp_name) - (long*)&py_type_object_header;
1 year, 4 months
[tvheadend] Rebuilt for Python 3.12
by Leigh Scott
commit a1678cd3d9c38f6caed9db16ded60943319f9486
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jul 8 20:13:37 2023 +0100
Rebuilt for Python 3.12
tvheadend.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/tvheadend.spec b/tvheadend.spec
index a1faf7a..0f70f3b 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -7,7 +7,7 @@
Name: tvheadend
Version: 4.3^%{commitdate}git%{shortcommit}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: TV streaming server and digital video recorder
# - Source code is GPL-3.0-or-later
@@ -199,6 +199,9 @@ chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
%changelog
+* Sat Jul 08 2023 Leigh Scott <leigh123linux(a)gmail.com> - 4.3^20230408gitf32c7c5-2
+- Rebuilt for Python 3.12
+
* Tue Apr 04 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.3^20230408gitf32c7c5-1
- Update to latest snapshot
- Fix build with FFmpeg 6
1 year, 4 months
[kodi] Fix build with fmt-10
by Leigh Scott
commit de82b31f59279a0db281d787f2325651780e4784
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jul 8 20:05:55 2023 +0100
Fix build with fmt-10
fmt10_buildfix.patch | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++
kodi.spec | 5 +++
2 files changed, 113 insertions(+)
---
diff --git a/fmt10_buildfix.patch b/fmt10_buildfix.patch
new file mode 100644
index 0000000..ff00c1d
--- /dev/null
+++ b/fmt10_buildfix.patch
@@ -0,0 +1,108 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak(a)gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak(a)gmail.com>
+---
+ xbmc/windows/GUIWindowHome.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp
+index c42e073c48ced..abc6cfc94d5a0 100644
+--- a/xbmc/windows/GUIWindowHome.cpp
++++ b/xbmc/windows/GUIWindowHome.cpp
+@@ -78,7 +78,8 @@ void CGUIWindowHome::Announce(ANNOUNCEMENT::AnnouncementFlag flag,
+ {
+ int ra_flag = 0;
+
+- CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}", flag, sender, message);
++ CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}",
++ AnnouncementFlagToString(flag), sender, message);
+
+ // we are only interested in library changes
+ if ((flag & (ANNOUNCEMENT::VideoLibrary | ANNOUNCEMENT::AudioLibrary)) == 0)
+
+From c82006b575b78efbb3f5aff40a159b90f245ea9d Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak(a)gmail.com>
+Date: Tue, 27 Jun 2023 11:22:32 -0700
+Subject: [PATCH 2/4] CGUIColorButtonControl: use explicit cast to
+ UTILS::COLOR::Color when formatting
+
+Signed-off-by: Lukas Rusak <lorusak(a)gmail.com>
+---
+ xbmc/guilib/GUIColorButtonControl.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/guilib/GUIColorButtonControl.cpp b/xbmc/guilib/GUIColorButtonControl.cpp
+index 940834cb68852..67597d7ab504b 100644
+--- a/xbmc/guilib/GUIColorButtonControl.cpp
++++ b/xbmc/guilib/GUIColorButtonControl.cpp
+@@ -188,7 +188,8 @@ void CGUIColorButtonControl::RenderInfoText()
+ void CGUIColorButtonControl::ProcessInfoText(unsigned int currentTime)
+ {
+ CRect labelRenderRect = m_labelInfo.GetRenderRect();
+- bool changed = m_labelInfo.SetText(StringUtils::Format("#{:08X}", m_imgBoxColor));
++ bool changed = m_labelInfo.SetText(
++ StringUtils::Format("#{:08X}", static_cast<UTILS::COLOR::Color>(m_imgBoxColor)));
+ // Set Label X position based on image mask control position
+ float textWidth = m_labelInfo.GetTextWidth() + 2 * m_labelInfo.GetLabelInfo().offsetX;
+ float textPosX = m_imgColorMask->GetXPosition() - textWidth;
+
+From e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak(a)gmail.com>
+Date: Tue, 27 Jun 2023 11:24:02 -0700
+Subject: [PATCH 3/4] CLog: allow using fmt::enums::format_as for explicit enum
+ conversion when using libfmt>=10
+
+Signed-off-by: Lukas Rusak <lorusak(a)gmail.com>
+---
+ xbmc/utils/log.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h
+index 9fc4aae36813e..adf46905a86c6 100644
+--- a/xbmc/utils/log.h
++++ b/xbmc/utils/log.h
+@@ -46,6 +46,10 @@ class dist_sink;
+ } // namespace sinks
+ } // namespace spdlog
+
++#if FMT_VERSION >= 100000
++using fmt::enums::format_as;
++#endif
++
+ class CLog : public ISettingsHandler, public ISettingCallback
+ {
+ public:
+
+From 26c164a28cfd18ceef7a1f2bbba5bf8a4a5a750c Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak(a)gmail.com>
+Date: Tue, 27 Jun 2023 11:24:34 -0700
+Subject: [PATCH 4/4] CLog: add formatter for std::atomic for explicit atomic
+ conversion when using libfmt>=10
+
+Signed-off-by: Lukas Rusak <lorusak(a)gmail.com>
+---
+ xbmc/utils/log.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h
+index adf46905a86c6..1c42c888cb655 100644
+--- a/xbmc/utils/log.h
++++ b/xbmc/utils/log.h
+@@ -48,6 +48,14 @@ class dist_sink;
+
+ #if FMT_VERSION >= 100000
+ using fmt::enums::format_as;
++
++namespace fmt
++{
++template<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+
+ class CLog : public ISettingsHandler, public ISettingCallback
diff --git a/kodi.spec b/kodi.spec
index c3ca390..9f6f6cb 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -76,6 +76,8 @@ Patch1: kodi-20-versioning.patch
# Fix an annobin issue, required for ARM arch
Patch2: kodi-20-annobin-workaround.patch
+Patch3: https://github.com/xbmc/xbmc/pull/23453.patch#/fmt10_buildfix.patch
+
%ifarch x86_64
%global _with_crystalhd 1
%endif
@@ -298,6 +300,9 @@ This package contains FirewallD files for Kodi.
%setup -q -n %{name}-%{DIRVERSION}
%patch -P 1 -p1 -b.versioning
%patch -P 2 -p1 -b.innobinfix
+%if 0%{?fedora} && 0%{?fedora} > 38
+%patch -P 3 -p1 -b.fmt
+%endif
# Fix up Python shebangs
%py3_shebang_fix \
1 year, 4 months
[kodi] Use new shebang macro
by Leigh Scott
commit 9acb4935e59955a1c19c320af16f54a9e2006ea6
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jul 8 19:46:06 2023 +0100
Use new shebang macro
kodi.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index 5f74d8a..c3ca390 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -196,7 +196,6 @@ BuildRequires: pipewire-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: python3-devel
BuildRequires: python3-pillow
-BuildRequires: /usr/bin/pathfix.py
BuildRequires: rapidjson-devel
BuildRequires: spdlog-devel
BuildRequires: sqlite-devel
@@ -301,7 +300,7 @@ This package contains FirewallD files for Kodi.
%patch -P 2 -p1 -b.innobinfix
# Fix up Python shebangs
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \
+%py3_shebang_fix \
tools/EventClients/lib/python/zeroconf.py \
tools/EventClients/Clients/PS3BDRemote/ps3_remote.py \
tools/EventClients/lib/python/ps3/sixaxis.py \
1 year, 4 months
[videomorph] Use new shebang macro
by Leigh Scott
commit cfea68f3dd06eaa06fdc5bd315cb9239f4bf842d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jul 8 19:42:35 2023 +0100
Use new shebang macro
videomorph.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/videomorph.spec b/videomorph.spec
index 16a8f8b..bdffa62 100644
--- a/videomorph.spec
+++ b/videomorph.spec
@@ -27,7 +27,7 @@ FLV, MOV, OGV, and also extract the audio to a file with MP3 format.
%prep
%autosetup
-sed -i -e 's@#!/usr/bin/python@#!/usr/bin/python3@g' setup.py bin/videomorph tests/*
+%py3_shebang_fix setup.py bin/videomorph tests/*
%build
1 year, 4 months
[rpmfusion-packager] Use new shebang macro
by Leigh Scott
commit bd0725a9f2486d0c6a4ff14e87950466640cc9de
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jul 8 19:39:14 2023 +0100
Use new shebang macro
rpmfusion-packager.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/rpmfusion-packager.spec b/rpmfusion-packager.spec
index f915c98..e470681 100644
--- a/rpmfusion-packager.spec
+++ b/rpmfusion-packager.spec
@@ -93,6 +93,9 @@ autoreconf -i
%build
%if %{with python3}
%configure --with-python3
+%py3_shebang_fix \
+ src/rpmfusion-cert.py \
+ src/rpmfusion-packager-setup.py
%else
%configure --with-python2
%endif
1 year, 4 months
[python-vlc] Use new shebang macro
by Leigh Scott
commit 16ebbf2e56acde7bad0d40d51b5a8d82bb81aeff
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jul 8 19:35:11 2023 +0100
Use new shebang macro
python-vlc.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/python-vlc.spec b/python-vlc.spec
index fb9b604..5ab783c 100644
--- a/python-vlc.spec
+++ b/python-vlc.spec
@@ -32,7 +32,7 @@ Requires: vlc-core >= 1.1.0
# Remove bundled egg-info
rm -rf %{pypi_name}.egg-info
# fix shebang
-sed -i -e 's@/usr/bin/python@/usr/bin/python3@g' \
+%py3_shebang_fix \
examples/glsurface.py \
examples/play_buffer.py vlc.py
#fix rpmlint
1 year, 4 months