commit 6d3eee530743ab5405fb757b56c64d58ccc2081e Author: Tim Biermann <tbier@posteo.de> Date: Sun Mar 12 11:55:39 2023 +0100 kodi-gbm: 20.0 -> 20.1 diff --git a/kodi-gbm/.signature b/kodi-gbm/.signature index 56c03b555..507c00ec8 100644 --- a/kodi-gbm/.signature +++ b/kodi-gbm/.signature @@ -1,10 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wLVSLNuMMXLcwH5SZLcIYMWqY7+NlTR22MizeZBf/scceeToTAbgrVDOPzIxGvHoguaNo6VOeMmo8yH5v53ngA= -SHA256 (Pkgfile) = dc47a44f8baea2975cce9d00de3e9e866ab3455d02b9d179675a876ce7512e69 +RWSagIOpLGJF3+Xjqp5napco65Igv8401scg54dtRMxR1s//pvrSlNQkQVU1H1UC4zxGCvDsz8dGJe9laYO6h2ntGBm6ME4CRw0= +SHA256 (Pkgfile) = 35dd8535a5f99f13cf176de2f728bf1d5ccff003098323fef5e0954e68c419a9 SHA256 (.footprint) = e130bcf8d996eeb4e3a3047bfb990ae29c30040cd31abcb3e9d3c0796c949563 -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 diff --git a/kodi-gbm/22658.patch b/kodi-gbm/22658.patch deleted file mode 100644 index 8f0998d50..000000000 --- a/kodi-gbm/22658.patch +++ /dev/null @@ -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')) - { diff --git a/kodi-gbm/Pkgfile b/kodi-gbm/Pkgfile index a665fcbbb..3449a535d 100644 --- a/kodi-gbm/Pkgfile +++ b/kodi-gbm/Pkgfile @@ -5,7 +5,7 @@ # Optional: alsa-lib avahi bluez dav1d libmicrohttpd libnfs libnghttp2 libva libva-vdpau-driver libxslt mariadb mysql pipewire pulseaudio name=kodi-gbm -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_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 - 22658.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/22658.patch - cmake -S xbmc-$version-$_codename -B build -G Ninja $KODI_EXTRA \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \