kodi-wayland: kodi-wayland: added missing dependency: xkeyboard-config; added patch for fmt 10
This commit is contained in:
parent
73cd509c99
commit
a43d5a4dac
GPG Key ID:
42F8B4E30B673606
@ -1,9 +1,10 @@
|
||||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF36Pg5tR9D35+wLRsnBvaQVXMBc9s15C9PUl6ZomnAWafcZGUbtZ7bdm7RourxSOM13OBKy/TPzcpE4J5gRi0Vws=
|
||||
SHA256 (Pkgfile) = 6c585358edfdc26f7a573aa27583399af3674f1ecf0c4a1433b472f4ea964229
|
||||
RWSagIOpLGJF31MYDl9fy55+ggAQ5MdwrBg+OLz7B63GtJNDPQe9tAqtfnViKsiJSxEHUwWvIHMS/bcrWxYFqMjgyP5B6g2IlwU=
|
||||
SHA256 (Pkgfile) = f641d924de6ed4ef6a43529e29a45bf88a2c77536eeab02867d4a5178c600167
|
||||
SHA256 (.footprint) = b7344ab259de5a27ce4cae98f25bc6ff4a07609b949d8813bc71eefc64572440
|
||||
SHA256 (xbmc-20.2-Nexus.tar.gz) = 4e81abf81172812bc8891f69a7a80a2b846298cecaae7b5009725e28a3040c23
|
||||
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
|
||||
|
||||
108
kodi-wayland/23453.patch
Normal file
108
kodi-wayland/23453.patch
Normal file
@ -0,0 +1,108 @@
|
||||
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
|
||||
@ -1,12 +1,12 @@
|
||||
# Description: Open source home theater software, wayland native version
|
||||
# URL: https://kodi.tv/
|
||||
# Maintainer: Tim Biermann, tbier at posteo dot de
|
||||
# Depends on: crossguid dbus flatbuffers fstrcmp glu libass libcdio libdvdread libinput libxkbcommon openjdk17-jdk rapidjson rtmpdump spdlog swig taglib tinyxml waylandpp
|
||||
# Depends on: crossguid dbus flatbuffers fstrcmp glu libass libcdio libdvdread libinput libxkbcommon openjdk17-jdk rapidjson rtmpdump spdlog swig taglib tinyxml waylandpp xkeyboard-config
|
||||
# Optional: alsa-lib avahi bluez dav1d libmicrohttpd libnfs libva libva-vdpau-driver libxslt mariadb mysql pipewire pulseaudio
|
||||
|
||||
name=kodi-wayland
|
||||
version=20.2
|
||||
release=1
|
||||
release=2
|
||||
|
||||
# version variables {{{
|
||||
_codename=Nexus
|
||||
@ -20,7 +20,8 @@ source=(https://github.com/xbmc/xbmc/archive/$version-$_codename/xbmc-$version-$
|
||||
https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version/ffmpeg-$_ffmpeg_version.tar.gz
|
||||
https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version/${name/-wayland/}-libdvdcss-$_libdvdcss_version.tar.gz
|
||||
https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version/${name/-wayland/}-libdvdnav-$_libdvdnav_version.tar.gz
|
||||
https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-wayland/}-libdvdread-$_libdvdread_version.tar.gz)
|
||||
https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-wayland/}-libdvdread-$_libdvdread_version.tar.gz
|
||||
23453.patch)
|
||||
# }}}
|
||||
# unpack_source() {{{
|
||||
unpack_source() {
|
||||
@ -71,6 +72,8 @@ 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 \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user