From 02f5061eb01c32427ec953f5cd5b367244f2a360 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 26 Oct 2025 22:18:17 +0100 Subject: [PATCH] package/libheif: needs threads since v1.20.1 Buildroot commit accb006d9b62079b56bc1f1388b558a60dde277a bumped libheif to version 1.20.1 which includes several commits unconditionally depen- ding on std::mutex which requires a toolchain with threads: https://github.com/strukturag/libheif/commit/14f956726c79747fc1fb8c041ed767c1632704eb https://github.com/strukturag/libheif/commit/6bb8cdaa8a7ba78066c899c3791546b80051c70a Add dependency to BR2_TOOLCHAIN_HAS_THREADS to Config.in, remove configure options handling non-threaded toolchains and adjust a Config.in comment of the only dependee kodi-imagedecoder-heif. Fixes: https://autobuild.buildroot.net/results/28b/28bf68147382dada33cbf9b299396dfdee3fbbe6/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-imagedecoder-heif/Config.in | 2 +- package/libheif/Config.in | 6 ++++-- package/libheif/libheif.mk | 7 ------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/package/kodi-imagedecoder-heif/Config.in b/package/kodi-imagedecoder-heif/Config.in index d0950385a0..f41b164ff4 100644 --- a/package/kodi-imagedecoder-heif/Config.in +++ b/package/kodi-imagedecoder-heif/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_KODI_IMAGEDECODER_HEIF bool "kodi-imagedecoder-heif" depends on BR2_INSTALL_LIBSTDCPP # libde265, libheif, tinyxml2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libde265 + depends on BR2_TOOLCHAIN_HAS_THREADS # libde265, libheif depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 # libheif depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libheif select BR2_PACKAGE_LIBDE265 diff --git a/package/libheif/Config.in b/package/libheif/Config.in index 1452cf2718..0ae86a07f4 100644 --- a/package/libheif/Config.in +++ b/package/libheif/Config.in @@ -3,11 +3,13 @@ config BR2_PACKAGE_LIBHEIF depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS help libheif is an HEIF and AVIF file format decoder and encoder. https://github.com/strukturag/libheif -comment "libheif needs a toolchain w/ C++, gcc >= 4.8" +comment "libheif needs a toolchain w/ C++, threads, gcc >= 4.8" depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libheif/libheif.mk b/package/libheif/libheif.mk index 13e8295b0e..d82ec6a0ec 100644 --- a/package/libheif/libheif.mk +++ b/package/libheif/libheif.mk @@ -72,17 +72,10 @@ else LIBHEIF_CONF_OPTS += -DWITH_X265=OFF endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBHEIF_CONF_OPTS += -DENABLE_MULTITHREADING_SUPPORT=ON ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_64735),y) LIBHEIF_CONF_OPTS += -DENABLE_PARALLEL_TILE_DECODING=OFF else LIBHEIF_CONF_OPTS += -DENABLE_PARALLEL_TILE_DECODING=ON endif -else -LIBHEIF_CONF_OPTS += \ - -DENABLE_MULTITHREADING_SUPPORT=OFF \ - -DENABLE_PARALLEL_TILE_DECODING=OFF -endif $(eval $(cmake-package))