Request 5883 (accepted)

kodi-noX-raspberry-pi.changes Changed

kodi-noX-raspberry-pi2.changes Changed

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX-raspberry-pi.spec Changed

@@ -91,6 +91,7 @@
 %endif
 Patch10:        ffmpeg-4.3.1-ogg.patch
 Patch11:        kodi-apply-ffmpeg.patch
+Patch12:        fix_building_with_fmt10.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -118,7 +119,7 @@
 BuildRequires:  pkg-config
 BuildRequires:  flatbuffers-devel
 BuildRequires:  fstrcmp-devel
-BuildRequires:  pkgconfig(fmt) < 10
+BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  libmysqlclient-devel
@@ -361,6 +362,7 @@
 %if %{without kodi_with_wayland}
 %patch9
 %endif
+%patch12 -p1
 
 %build
 
@@ -379,9 +381,6 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/platform/linux/*.cpp
 
-# Fix for missing 'l' alias
-alias l='ls -alF'
-
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
@@ -435,7 +434,7 @@
     #-DENABLE_INTERNAL_FSTRCMP=ON
     #-DFSTRCMP_URL=%{SOURCE27}
 
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || ls -alF
 
 %install
 pushd build

kodi-noX-raspberry-pi2.spec Changed

@@ -91,6 +91,7 @@
 %endif
 Patch10:        ffmpeg-4.3.1-ogg.patch
 Patch11:        kodi-apply-ffmpeg.patch
+Patch12:        fix_building_with_fmt10.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -118,7 +119,7 @@
 BuildRequires:  pkg-config
 BuildRequires:  flatbuffers-devel
 BuildRequires:  fstrcmp-devel
-BuildRequires:  pkgconfig(fmt) < 10
+BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  libmysqlclient-devel
@@ -361,6 +362,7 @@
 %if %{without kodi_with_wayland}
 %patch9
 %endif
+%patch12 -p1
 
 %build
 
@@ -379,9 +381,6 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/platform/linux/*.cpp
 
-# Fix for missing 'l' alias
-alias l='ls -alF'
-
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
@@ -435,7 +434,7 @@
     #-DENABLE_INTERNAL_FSTRCMP=ON
     #-DFSTRCMP_URL=%{SOURCE27}
 
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || ls -alF
 
 %install
 pushd build

kodi-noX.spec Changed

@@ -91,6 +91,7 @@
 %endif
 Patch10:        ffmpeg-4.3.1-ogg.patch
 Patch11:        kodi-apply-ffmpeg.patch
+Patch12:        fix_building_with_fmt10.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -118,7 +119,7 @@
 BuildRequires:  pkg-config
 BuildRequires:  flatbuffers-devel
 BuildRequires:  fstrcmp-devel
-BuildRequires:  pkgconfig(fmt) < 10
+BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  libmysqlclient-devel
@@ -361,6 +362,7 @@
 %if %{without kodi_with_wayland}
 %patch9
 %endif
+%patch12 -p1
 
 %build
 
@@ -379,9 +381,6 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/platform/linux/*.cpp
 
-# Fix for missing 'l' alias
-alias l='ls -alF'
-
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
@@ -435,7 +434,7 @@
     #-DENABLE_INTERNAL_FSTRCMP=ON
     #-DFSTRCMP_URL=%{SOURCE27}
 
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || ls -alF
 
 %install
 pushd build

kodi.spec Changed

@@ -91,6 +91,7 @@
 %endif
 Patch10:        ffmpeg-4.3.1-ogg.patch
 Patch11:        kodi-apply-ffmpeg.patch
+Patch12:        fix_building_with_fmt10.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -118,7 +119,7 @@
 BuildRequires:  pkg-config
 BuildRequires:  flatbuffers-devel
 BuildRequires:  fstrcmp-devel
-BuildRequires:  pkgconfig(fmt) < 10
+BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  libmysqlclient-devel
@@ -361,6 +362,7 @@
 %if %{without kodi_with_wayland}
 %patch9
 %endif
+%patch12 -p1
 
 %build
 
@@ -379,9 +381,6 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/platform/linux/*.cpp
 
-# Fix for missing 'l' alias
-alias l='ls -alF'
-
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
@@ -435,7 +434,7 @@
     #-DENABLE_INTERNAL_FSTRCMP=ON
     #-DFSTRCMP_URL=%{SOURCE27}
 
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
+make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || ls -alF
 
 %install
 pushd build

fix_building_with_fmt10.patch Added

@@ -0,0 +1,97 @@
+commit 3a20f5b67ff32cc3663e0ccd72941e666e8756a4
+Author: Lukas Rusak <lorusak@gmail.com>
+Date:   Tue Jun 27 11:21:50 2023 -0700
+
+    CGUIWindowHome: use AnnouncementFlagToString when logging
+    
+    Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+
+diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp
+index c42e073c48..abc6cfc94d 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)
+
+commit c82006b575b78efbb3f5aff40a159b90f245ea9d
+Author: Lukas Rusak <lorusak@gmail.com>
+Date:   Tue Jun 27 11:22:32 2023 -0700
+
+    CGUIColorButtonControl: use explicit cast to UTILS::COLOR::Color when formatting
+    
+    Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+
+diff --git a/xbmc/guilib/GUIColorButtonControl.cpp b/xbmc/guilib/GUIColorButtonControl.cpp
+index 940834cb68..67597d7ab5 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;
+
+commit e4b1aa8450fabfb41379953c8ccec0a512421531
+Author: Lukas Rusak <lorusak@gmail.com>
+Date:   Tue Jun 27 11:24:02 2023 -0700
+
+    CLog: allow using fmt::enums::format_as for explicit enum conversion when using libfmt>=10
+    
+    Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+
+diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h
+index 9fc4aae368..adf46905a8 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:
+
+commit 26c164a28cfd18ceef7a1f2bbba5bf8a4a5a750c
+Author: Lukas Rusak <lorusak@gmail.com>
+Date:   Tue Jun 27 11:24:34 2023 -0700
+
+    CLog: add formatter for std::atomic for explicit atomic conversion when using libfmt>=10
+    
+    Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+
+diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h
+index adf46905a8..1c42c888cb 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

Overview

Request 5883 (accepted)

Request History