diff --git a/packages/devel/ccache/package.mk b/packages/devel/ccache/package.mk index d1d69c041c..6bc50f83c7 100644 --- a/packages/devel/ccache/package.mk +++ b/packages/devel/ccache/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ccache" -PKG_VERSION="4.10" -PKG_SHA256="83630b5e922b998ab2538823e0cad962c0f956fad1fcf443dd5288269a069660" +PKG_VERSION="4.10.1" +PKG_SHA256="3a43442ce3916ea48bb6ccf6f850891cbff01d1feddff7cd4bbd49c5cf1188f6" PKG_LICENSE="GPL" PKG_SITE="https://ccache.dev/download.html" PKG_URL="https://github.com/ccache/ccache/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/devel/ccache/patches/ccache-0001-fix-libfmt-detection.patch b/packages/devel/ccache/patches/ccache-0001-fix-libfmt-detection.patch new file mode 100644 index 0000000000..e86e88a67a --- /dev/null +++ b/packages/devel/ccache/patches/ccache-0001-fix-libfmt-detection.patch @@ -0,0 +1,77 @@ +From 71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= +Date: Tue, 2 Jul 2024 15:46:44 +0200 +Subject: [PATCH] build: Try harder to determine FMT_VERSION (#1478) + +fmt-11.0 moved the FMT_VERSION from core.h to base.h, so try the +new header first and then fall back to the old one. + +Closes: #1477 +--- + cmake/FindFmt.cmake | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake +index 55126a3172..0619f4615e 100644 +--- a/cmake/FindFmt.cmake ++++ b/cmake/FindFmt.cmake +@@ -3,11 +3,19 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY) + if(DEP_FMT STREQUAL "BUNDLED") + message(STATUS "Using bundled Fmt as requested") + else() +- find_path(FMT_INCLUDE_DIR fmt/core.h) ++ find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h) + find_library(FMT_LIBRARY fmt) + if(FMT_INCLUDE_DIR AND FMT_LIBRARY) +- file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h) +- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}") ++ file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h) ++ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}") ++ if("${CMAKE_MATCH_0}" STREQUAL "") ++ file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h) ++ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}") ++ endif() ++ if("${CMAKE_MATCH_0}" STREQUAL "") ++ message(FATAL_ERROR "FMT_VERSION not found") ++ return() ++ endif() + math(EXPR _fmt_major "${CMAKE_MATCH_1} / 10000") + math(EXPR _fmt_minor "${CMAKE_MATCH_1} / 100 % 100") + math(EXPR _fmt_patch "${CMAKE_MATCH_1} % 100") +From 3b09afc5f792f0bd0a15cf6b8408ea40eb069787 Mon Sep 17 00:00:00 2001 +From: Joel Rosdahl +Date: Tue, 2 Jul 2024 17:05:43 +0200 +Subject: [PATCH] build: Fix detection of Fmt version for Fmt<11 + +Fixes regression in 71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1. +--- + cmake/FindFmt.cmake | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake +index 0619f4615e..7c39291eca 100644 +--- a/cmake/FindFmt.cmake ++++ b/cmake/FindFmt.cmake +@@ -3,15 +3,16 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY) + if(DEP_FMT STREQUAL "BUNDLED") + message(STATUS "Using bundled Fmt as requested") + else() +- find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h) ++ find_path(FMT_INCLUDE_DIR NAMES fmt/base.h fmt/core.h) + find_library(FMT_LIBRARY fmt) + if(FMT_INCLUDE_DIR AND FMT_LIBRARY) +- file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h) +- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}") +- if("${CMAKE_MATCH_0}" STREQUAL "") +- file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h) +- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}") ++ if(EXISTS "${FMT_INCLUDE_DIR}/fmt/base.h") ++ set(_fmt_h base.h) ++ else() ++ set(_fmt_h core.h) + endif() ++ file(READ "${FMT_INCLUDE_DIR}/fmt/${_fmt_h}" _fmt_h_content) ++ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_h_content}") + if("${CMAKE_MATCH_0}" STREQUAL "") + message(FATAL_ERROR "FMT_VERSION not found") + return()