Overview
Request 5883 (accepted)
- Unban fmt10, but add new patch fix_building_with_fmt10.patch
derived from https://github.com/xbmc/xbmc/pull/23453 to fix
building on current TW with updated libfmt10 and libspdlog12.
- Remove "alias l=..." and replace its use with the real command
kodi-noX-raspberry-pi.changes
Changed
x
1
2
-------------------------------------------------------------------
3
+Tue Dec 5 12:31:48 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
4
+
5
+- Unban fmt10, but add new patch fix_building_with_fmt10.patch
6
+ derived from https://github.com/xbmc/xbmc/pull/23453 to fix
7
+ building on current TW with updated libfmt10 and libspdlog12.
8
+- Remove "alias l=..." and replace its use with the real command
9
+
10
+-------------------------------------------------------------------
11
Fri Nov 3 10:00:39 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
12
13
- Don't use java >= 21 for building yet.
14
kodi-noX-raspberry-pi2.changes
Changed
14
1
2
-------------------------------------------------------------------
3
+Tue Dec 5 12:31:48 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
4
+
5
+- Unban fmt10, but add new patch fix_building_with_fmt10.patch
6
+ derived from https://github.com/xbmc/xbmc/pull/23453 to fix
7
+ building on current TW with updated libfmt10 and libspdlog12.
8
+- Remove "alias l=..." and replace its use with the real command
9
+
10
+-------------------------------------------------------------------
11
Fri Nov 3 10:00:39 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
12
13
- Don't use java >= 21 for building yet.
14
kodi-noX.changes
Changed
14
1
2
-------------------------------------------------------------------
3
+Tue Dec 5 12:31:48 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
4
+
5
+- Unban fmt10, but add new patch fix_building_with_fmt10.patch
6
+ derived from https://github.com/xbmc/xbmc/pull/23453 to fix
7
+ building on current TW with updated libfmt10 and libspdlog12.
8
+- Remove "alias l=..." and replace its use with the real command
9
+
10
+-------------------------------------------------------------------
11
Fri Nov 3 10:00:39 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
12
13
- Don't use java >= 21 for building yet.
14
kodi.changes
Changed
14
1
2
-------------------------------------------------------------------
3
+Tue Dec 5 12:31:48 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
4
+
5
+- Unban fmt10, but add new patch fix_building_with_fmt10.patch
6
+ derived from https://github.com/xbmc/xbmc/pull/23453 to fix
7
+ building on current TW with updated libfmt10 and libspdlog12.
8
+- Remove "alias l=..." and replace its use with the real command
9
+
10
+-------------------------------------------------------------------
11
Fri Nov 3 10:00:39 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
12
13
- Don't use java >= 21 for building yet.
14
kodi-noX-raspberry-pi.spec
Changed
45
1
2
%endif
3
Patch10: ffmpeg-4.3.1-ogg.patch
4
Patch11: kodi-apply-ffmpeg.patch
5
+Patch12: fix_building_with_fmt10.patch
6
7
BuildRequires: autoconf
8
BuildRequires: automake
9
10
BuildRequires: pkg-config
11
BuildRequires: flatbuffers-devel
12
BuildRequires: fstrcmp-devel
13
-BuildRequires: pkgconfig(fmt) < 10
14
+BuildRequires: pkgconfig(fmt)
15
BuildRequires: pkgconfig(RapidJSON) >= 1.0.2
16
BuildRequires: pkgconfig(python3)
17
BuildRequires: libmysqlclient-devel
18
19
%if %{without kodi_with_wayland}
20
%patch9
21
%endif
22
+%patch12 -p1
23
24
%build
25
26
27
-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
28
xbmc/platform/linux/*.cpp
29
30
-# Fix for missing 'l' alias
31
-alias l='ls -alF'
32
-
33
%if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
34
export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
35
%endif
36
37
#-DENABLE_INTERNAL_FSTRCMP=ON
38
#-DFSTRCMP_URL=%{SOURCE27}
39
40
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
41
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || ls -alF
42
43
%install
44
pushd build
45
kodi-noX-raspberry-pi2.spec
Changed
45
1
2
%endif
3
Patch10: ffmpeg-4.3.1-ogg.patch
4
Patch11: kodi-apply-ffmpeg.patch
5
+Patch12: fix_building_with_fmt10.patch
6
7
BuildRequires: autoconf
8
BuildRequires: automake
9
10
BuildRequires: pkg-config
11
BuildRequires: flatbuffers-devel
12
BuildRequires: fstrcmp-devel
13
-BuildRequires: pkgconfig(fmt) < 10
14
+BuildRequires: pkgconfig(fmt)
15
BuildRequires: pkgconfig(RapidJSON) >= 1.0.2
16
BuildRequires: pkgconfig(python3)
17
BuildRequires: libmysqlclient-devel
18
19
%if %{without kodi_with_wayland}
20
%patch9
21
%endif
22
+%patch12 -p1
23
24
%build
25
26
27
-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
28
xbmc/platform/linux/*.cpp
29
30
-# Fix for missing 'l' alias
31
-alias l='ls -alF'
32
-
33
%if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
34
export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
35
%endif
36
37
#-DENABLE_INTERNAL_FSTRCMP=ON
38
#-DFSTRCMP_URL=%{SOURCE27}
39
40
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
41
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || ls -alF
42
43
%install
44
pushd build
45
kodi-noX.spec
Changed
45
1
2
%endif
3
Patch10: ffmpeg-4.3.1-ogg.patch
4
Patch11: kodi-apply-ffmpeg.patch
5
+Patch12: fix_building_with_fmt10.patch
6
7
BuildRequires: autoconf
8
BuildRequires: automake
9
10
BuildRequires: pkg-config
11
BuildRequires: flatbuffers-devel
12
BuildRequires: fstrcmp-devel
13
-BuildRequires: pkgconfig(fmt) < 10
14
+BuildRequires: pkgconfig(fmt)
15
BuildRequires: pkgconfig(RapidJSON) >= 1.0.2
16
BuildRequires: pkgconfig(python3)
17
BuildRequires: libmysqlclient-devel
18
19
%if %{without kodi_with_wayland}
20
%patch9
21
%endif
22
+%patch12 -p1
23
24
%build
25
26
27
-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
28
xbmc/platform/linux/*.cpp
29
30
-# Fix for missing 'l' alias
31
-alias l='ls -alF'
32
-
33
%if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
34
export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
35
%endif
36
37
#-DENABLE_INTERNAL_FSTRCMP=ON
38
#-DFSTRCMP_URL=%{SOURCE27}
39
40
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
41
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || ls -alF
42
43
%install
44
pushd build
45
kodi.spec
Changed
45
1
2
%endif
3
Patch10: ffmpeg-4.3.1-ogg.patch
4
Patch11: kodi-apply-ffmpeg.patch
5
+Patch12: fix_building_with_fmt10.patch
6
7
BuildRequires: autoconf
8
BuildRequires: automake
9
10
BuildRequires: pkg-config
11
BuildRequires: flatbuffers-devel
12
BuildRequires: fstrcmp-devel
13
-BuildRequires: pkgconfig(fmt) < 10
14
+BuildRequires: pkgconfig(fmt)
15
BuildRequires: pkgconfig(RapidJSON) >= 1.0.2
16
BuildRequires: pkgconfig(python3)
17
BuildRequires: libmysqlclient-devel
18
19
%if %{without kodi_with_wayland}
20
%patch9
21
%endif
22
+%patch12 -p1
23
24
%build
25
26
27
-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
28
xbmc/platform/linux/*.cpp
29
30
-# Fix for missing 'l' alias
31
-alias l='ls -alF'
32
-
33
%if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
34
export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
35
%endif
36
37
#-DENABLE_INTERNAL_FSTRCMP=ON
38
#-DFSTRCMP_URL=%{SOURCE27}
39
40
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
41
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || ls -alF
42
43
%install
44
pushd build
45
fix_building_with_fmt10.patch
Added
99
1
2
+commit 3a20f5b67ff32cc3663e0ccd72941e666e8756a4
3
+Author: Lukas Rusak <lorusak@gmail.com>
4
+Date: Tue Jun 27 11:21:50 2023 -0700
5
+
6
+ CGUIWindowHome: use AnnouncementFlagToString when logging
7
+
8
+ Signed-off-by: Lukas Rusak <lorusak@gmail.com>
9
+
10
+diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp
11
+index c42e073c48..abc6cfc94d 100644
12
+--- a/xbmc/windows/GUIWindowHome.cpp
13
++++ b/xbmc/windows/GUIWindowHome.cpp
14
+@@ -78,7 +78,8 @@ void CGUIWindowHome::Announce(ANNOUNCEMENT::AnnouncementFlag flag,
15
+ {
16
+ int ra_flag = 0;
17
+
18
+- CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}", flag, sender, message);
19
++ CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}",
20
++ AnnouncementFlagToString(flag), sender, message);
21
+
22
+ // we are only interested in library changes
23
+ if ((flag & (ANNOUNCEMENT::VideoLibrary | ANNOUNCEMENT::AudioLibrary)) == 0)
24
+
25
+commit c82006b575b78efbb3f5aff40a159b90f245ea9d
26
+Author: Lukas Rusak <lorusak@gmail.com>
27
+Date: Tue Jun 27 11:22:32 2023 -0700
28
+
29
+ CGUIColorButtonControl: use explicit cast to UTILS::COLOR::Color when formatting
30
+
31
+ Signed-off-by: Lukas Rusak <lorusak@gmail.com>
32
+
33
+diff --git a/xbmc/guilib/GUIColorButtonControl.cpp b/xbmc/guilib/GUIColorButtonControl.cpp
34
+index 940834cb68..67597d7ab5 100644
35
+--- a/xbmc/guilib/GUIColorButtonControl.cpp
36
++++ b/xbmc/guilib/GUIColorButtonControl.cpp
37
+@@ -188,7 +188,8 @@ void CGUIColorButtonControl::RenderInfoText()
38
+ void CGUIColorButtonControl::ProcessInfoText(unsigned int currentTime)
39
+ {
40
+ CRect labelRenderRect = m_labelInfo.GetRenderRect();
41
+- bool changed = m_labelInfo.SetText(StringUtils::Format("#{:08X}", m_imgBoxColor));
42
++ bool changed = m_labelInfo.SetText(
43
++ StringUtils::Format("#{:08X}", static_cast<UTILS::COLOR::Color>(m_imgBoxColor)));
44
+ // Set Label X position based on image mask control position
45
+ float textWidth = m_labelInfo.GetTextWidth() + 2 * m_labelInfo.GetLabelInfo().offsetX;
46
+ float textPosX = m_imgColorMask->GetXPosition() - textWidth;
47
+
48
+commit e4b1aa8450fabfb41379953c8ccec0a512421531
49
+Author: Lukas Rusak <lorusak@gmail.com>
50
+Date: Tue Jun 27 11:24:02 2023 -0700
51
+
52
+ CLog: allow using fmt::enums::format_as for explicit enum conversion when using libfmt>=10
53
+
54
+ Signed-off-by: Lukas Rusak <lorusak@gmail.com>
55
+
56
+diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h
57
+index 9fc4aae368..adf46905a8 100644
58
+--- a/xbmc/utils/log.h
59
++++ b/xbmc/utils/log.h
60
+@@ -46,6 +46,10 @@ class dist_sink;
61
+ } // namespace sinks
62
+ } // namespace spdlog
63
+
64
++#if FMT_VERSION >= 100000
65
++using fmt::enums::format_as;
66
++#endif
67
++
68
+ class CLog : public ISettingsHandler, public ISettingCallback
69
+ {
70
+ public:
71
+
72
+commit 26c164a28cfd18ceef7a1f2bbba5bf8a4a5a750c
73
+Author: Lukas Rusak <lorusak@gmail.com>
74
+Date: Tue Jun 27 11:24:34 2023 -0700
75
+
76
+ CLog: add formatter for std::atomic for explicit atomic conversion when using libfmt>=10
77
+
78
+ Signed-off-by: Lukas Rusak <lorusak@gmail.com>
79
+
80
+diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h
81
+index adf46905a8..1c42c888cb 100644
82
+--- a/xbmc/utils/log.h
83
++++ b/xbmc/utils/log.h
84
+@@ -48,6 +48,14 @@ class dist_sink;
85
+
86
+ #if FMT_VERSION >= 100000
87
+ using fmt::enums::format_as;
88
++
89
++namespace fmt
90
++{
91
++template<typename T, typename Char>
92
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
93
++{
94
++};
95
++} // namespace fmt
96
+ #endif
97
+
98
+ class CLog : public ISettingsHandler, public ISettingCallback
99
Refresh
Refresh
Login required, please
login
or
signup
in order to comment
Request History
manfred-h created request about 1 year ago
- Unban fmt10, but add new patch fix_building_with_fmt10.patch
derived from https://github.com/xbmc/xbmc/pull/23453 to fix
building on current TW with updated libfmt10 and libspdlog12.
- Remove "alias l=..." and replace its use with the real command
sagiben accepted request about 1 year ago