kodi-wayland: 20.0 -> 20.1

This commit is contained in:
Tim Biermann 2023-03-12 12:06:47 +01:00
parent 6d3eee5307
commit 68d39ec106
Signed by: tb
GPG Key ID: 42F8B4E30B673606
3 changed files with 5 additions and 35 deletions

View File

@ -1,10 +1,9 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3y6SWG1s+nvp+BAEx4nmyyiqYVunKOKoorsIOICtJLWlIYQpmF09C3cEQGcfqtWxg7zAIItw22hqHZBi0oZq9Qw=
SHA256 (Pkgfile) = 73442c890479f4e76d7b8582403676cc93159a3a761787ce1f6364c9a099223c
RWSagIOpLGJF39Ivjw0RZvex6p/Ez0j7DidEpnAsikAuZOzatpdqPmpOKAJ4Rb6mhcsrjqjThAfWm/PnthSihmAvTZI6bv7XSgU=
SHA256 (Pkgfile) = f1bb38e7d9df4db99f245d8afdc33f38787d92ca829b03ae62b2318e6c214c43
SHA256 (.footprint) = b7344ab259de5a27ce4cae98f25bc6ff4a07609b949d8813bc71eefc64572440
SHA256 (xbmc-20.0-Nexus.tar.gz) = 4c75add8b9ea44924b6ee45f94439545676033f35f5993908871e3dded527b79
SHA256 (xbmc-20.1-Nexus.tar.gz) = cd4158b2bc2d9593ad2f5c1cd2494957ab726b13d8379bbfb09d7d36df7b7d7e
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 (22658.patch) = b970818a13508aacee149bfa7a791b442efd8522a6f6eba6d923c20f2927d1c5

View File

@ -1,26 +0,0 @@
From 5ce034ff98754d1b0e8e9eda2afcab595b9f4f82 Mon Sep 17 00:00:00 2001
From: CrystalP <crystalp@kodi.tv>
Date: Mon, 30 Jan 2023 22:53:18 -0500
Subject: [PATCH] render the .notdef characters to fix drawing of text with
unicode chars missing in font
---
xbmc/guilib/GUIFontTTF.cpp | 5 -----
1 file changed, 5 deletions(-)
diff --git a/xbmc/guilib/GUIFontTTF.cpp b/xbmc/guilib/GUIFontTTF.cpp
index 33e32e8954a80..6b38fb0cbbc0c 100644
--- a/xbmc/guilib/GUIFontTTF.cpp
+++ b/xbmc/guilib/GUIFontTTF.cpp
@@ -492,11 +492,6 @@ void CGUIFontTTF::DrawTextInternal(CGraphicContext& context,
// grab the next character
Character* ch = &characters.front();
- if (ch->m_glyphAndStyle == 0)
- {
- characters.pop();
- continue;
- }
if ((text[glyph.m_glyphInfo.cluster] & 0xffff) == static_cast<character_t>('\t'))
{

View File

@ -5,7 +5,7 @@
# Optional: alsa-lib avahi bluez dav1d libmicrohttpd libnfs libva libva-vdpau-driver libxslt mariadb mysql pipewire pulseaudio
name=kodi-wayland
version=20.0
version=20.1
release=1
# version variables {{{
@ -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_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
22658.patch)
https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-wayland/}-libdvdread-$_libdvdread_version.tar.gz)
# }}}
# unpack_source() {{{
unpack_source() {
@ -72,8 +71,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/22658.patch
cmake -S xbmc-$version-$_codename -B build -G Ninja $KODI_EXTRA \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_INSTALL_LIBDIR=lib \