From 6de3ece38346de6df4dafe50179afd3df8a20ea7 Mon Sep 17 00:00:00 2001 From: SupervisedThinking Date: Sat, 8 Oct 2022 22:00:45 +0200 Subject: [PATCH 1/2] harfbuzz: fix build after 5.2.0 update - seems like the ICU detection broken now and pulls ins system ICU files which leads to `HAVE_ICU` defined and ends up with a broken build ``` [69/79] Compiling C++ object src/libharfbuzz-icu.so.0.50200.0.p/hb-icu.cc.o FAILED: src/libharfbuzz-icu.so.0.50200.0.p/hb-icu.cc.o /mnt/build/LibreELEC-RR/build.LibreELEC-x11.x86_64-11.0-devel/toolchain/bin/x86_64-libreelec-linux-gnu-g++ -Isrc/libharfbuzz-icu.so.0.50200.0.p -Isrc -I../src -I. -I.. -I/usr/include -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wnon-virtual-dtor -std=c++11 -fno-rtti -O0 -fno-exceptions -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -DHAVE_CONFIG_H -march=x86-64-v2 -Wall -pipe -O2 -fomit-frame-pointer -DNDEBUG -fPIC -Wno-non-virtual-dtor -MD -MQ src/libharfbuzz-icu.so.0.50200.0.p/hb-icu.cc.o -MF src/libharfbuzz-icu.so.0.50200.0.p/hb-icu.cc.o.d -o src/libharfbuzz-icu.so.0.50200.0.p/hb-icu.cc.o -c ../src/hb-icu.cc CROSS COMPILE Badness: /usr/include in INCLUDEPATH: /usr/include cc1plus: internal compiler error: in add_path, at incpath.cc:481 0x6b83d4 _start ../sysdeps/x86_64/start.S:115 Please submit a full bug report, with preprocessed source (by using -freport-bug). Please include the complete backtrace with any bug report. See for instructions. ``` --- .../patches/harfbuzz-100.01-fix-meson-icu-opts.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/graphics/harfbuzz/patches/harfbuzz-100.01-fix-meson-icu-opts.patch diff --git a/packages/graphics/harfbuzz/patches/harfbuzz-100.01-fix-meson-icu-opts.patch b/packages/graphics/harfbuzz/patches/harfbuzz-100.01-fix-meson-icu-opts.patch new file mode 100644 index 0000000000..990c45c5da --- /dev/null +++ b/packages/graphics/harfbuzz/patches/harfbuzz-100.01-fix-meson-icu-opts.patch @@ -0,0 +1,12 @@ +--- a/meson.build ++++ b/meson.build +@@ -109,7 +109,7 @@ + if not icu_dep.found() + # Try cmake name + icu_dep = dependency('ICU', +- required: false, ++ required: get_option('icu'), + components: 'uc', + method: 'cmake') + endif + From f77a60fb40ce60bc5345b7c00bb96fe25093f1f5 Mon Sep 17 00:00:00 2001 From: SupervisedThinking Date: Sun, 9 Oct 2022 23:29:17 +0200 Subject: [PATCH 2/2] harfbuzz: update to 5.3.0 --- packages/graphics/harfbuzz/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/harfbuzz/package.mk b/packages/graphics/harfbuzz/package.mk index c65548a84c..4f765df117 100644 --- a/packages/graphics/harfbuzz/package.mk +++ b/packages/graphics/harfbuzz/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="harfbuzz" -PKG_VERSION="5.2.0" -PKG_SHA256="735a94917b47936575acb4d4fa7e7986522f8a89527e4635721474dee2bc942c" +PKG_VERSION="5.3.0" +PKG_SHA256="a05e19e3f52da24ed071522f0fddf872157d7d25e869cfd156cd6f1e81c42152" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz" PKG_URL="https://github.com/harfbuzz/harfbuzz/releases/download/${PKG_VERSION}/harfbuzz-${PKG_VERSION}.tar.xz"