commit e3bce8f93588b4257199f8817fcfc7adb0ca68a0 Author: Tim Biermann <tbier@posteo.de> Date: Wed Jan 10 21:40:11 2024 +0100 kodi-gbm: 20.2 -> 20.3 diff --git a/kodi-gbm/.signature b/kodi-gbm/.signature index 1deb7c787..161863efe 100644 --- a/kodi-gbm/.signature +++ b/kodi-gbm/.signature @@ -1,10 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30YHG5NZlcGR3MefsdPp9TEnBxAm3Coie2Fy1K2od+maOBUS6sY0vnXpC+AEWVpoLw7m59GIh1/Fq4bnQ8oWcAw= -SHA256 (Pkgfile) = baabf013c3951ba74d67c2b4d4cc1cb166fc379b558dd850aa1c986a1ff610fa +RWSagIOpLGJF3zY/cwKuiybXDzo2RjJiS6J8HVj2aOyKQsHScAQs5PHi5Y/w0m+kNkfXN8PXQlHqigdi5b329mYxicP90nR0/g4= +SHA256 (Pkgfile) = 225da430e6e4d41c8b3b9f479a33516e0678426c4202bde97d9a52ab1f88a9bd SHA256 (.footprint) = e130bcf8d996eeb4e3a3047bfb990ae29c30040cd31abcb3e9d3c0796c949563 -SHA256 (xbmc-20.2-Nexus.tar.gz) = 4e81abf81172812bc8891f69a7a80a2b846298cecaae7b5009725e28a3040c23 +SHA256 (xbmc-20.3-Nexus.tar.gz) = 1dbf1d9f4d5eeeb6aa2593813703343a8a377e88a00c68226354e4d67467f64d SHA256 (ffmpeg-4.4.1-Nexus-Alpha1.tar.gz) = abbce62231baffe237e412689c71ffe01bfc83135afd375f1e538caae87729ed SHA256 (kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz) = f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e SHA256 (kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz) = 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc SHA256 (kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz) = 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 -SHA256 (23453.patch) = 0c7ce50029029a937b970a79cfd468d0c336a6be80dcf048b33380d1ed39a66b diff --git a/kodi-gbm/23453.patch b/kodi-gbm/23453.patch deleted file mode 100644 index ff00c1d4d..000000000 --- a/kodi-gbm/23453.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001 -From: Lukas Rusak <lorusak@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@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@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@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@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@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@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@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-gbm/Pkgfile b/kodi-gbm/Pkgfile index b6a91cffd..85423860f 100644 --- a/kodi-gbm/Pkgfile +++ b/kodi-gbm/Pkgfile @@ -5,8 +5,8 @@ # Optional: alsa-lib avahi bluez dav1d libmicrohttpd libnfs libnghttp2 libva libva-vdpau-driver libxslt mariadb mysql pipewire pulseaudio name=kodi-gbm -version=20.2 -release=3 +version=20.3 +release=1 # version variables {{{ _codename=Nexus @@ -20,8 +20,7 @@ source=(https://github.com/xbmc/xbmc/archive/$version-$_codename/xbmc-$version-$ https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version/ffmpeg-$_ffmpeg_vers... https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version/${name/-gbm/}-libdvdcss-$_libdvdcss_version.tar.gz https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version/${name/-gbm/}-libdvdnav-$_libdvdnav_version.tar.gz - https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-gbm}-libdvdread-$_libdvdread_version.tar.gz - 23453.patch) + https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-gbm}-libdvdread-$_libdvdread_version.tar.gz) # }}} # unpack_source() {{{ unpack_source() { @@ -74,8 +73,6 @@ build() { xbmc-$version-$_codename/tools/depends/native/TexturePacker/src/autogen.sh \ xbmc-$version-$_codename/tools/depends/native/JsonSchemaBuilder/src/autogen.sh - patch -Np1 -d xbmc-$version-$_codename -i $SRC/23453.patch - cmake -S xbmc-$version-$_codename -B build -G Ninja $KODI_EXTRA \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \