package/cmake: bump version to 3.26.4
PATCH v2 1/3 package/cmake: bump version to 3.26.4
---
v2: no changes
.../cmake/0001-rename-cmake-rootfile.patch | 6 ++++-- package/cmake/Config.in.host | 20 +++++++++++++++++++ package/cmake/cmake.hash | 6 +++--- package/cmake/cmake.mk | 4 ++-- 4 files changed, 29 insertions(+), 7 deletions(-)
package/cmake/0001-rename-cmake-rootfile.patch +4 -2
@@ -12,10 +12,12 @@ This buildroot-specific patch makes sure ctest looks also for [Vincent: tweak patch for 3.6.3] [James: tweak patch for 3.15.4] +[Bernd: tweak patch for 3.26.4] Signed-off-by: Davide Viti <[email protected]> Signed-off-by: Vicente Olivert Riera <[email protected]> Signed-off-by: James Hilliard <[email protected]> +Signed-off-by: Bernd Kuhls <[email protected]> --- Source/cmake.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
@@ -24,8 +26,8 @@ diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 3772f09985..c317e4af38 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx -@@ -1009,7 +1009,12 @@ int cmake::AddCMakePaths() - "Path to cpack program executable.", cmStateEnums::INTERNAL); +@@ -1668,7 +1668,12 @@ int cmake::AddCMakePaths() + cmStateEnums::INTERNAL); #endif if (!cmSystemTools::FileExists( - (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake"))) {
package/cmake/Config.in.host +20 -0
@@ -27,10 +27,30 @@ config BR2_HOST_CMAKE_AT_LEAST_3_22 bool select BR2_HOST_CMAKE_AT_LEAST_3_21 +config BR2_HOST_CMAKE_AT_LEAST_3_23 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_22 + +config BR2_HOST_CMAKE_AT_LEAST_3_24 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_23 + +config BR2_HOST_CMAKE_AT_LEAST_3_25 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_24 + +config BR2_HOST_CMAKE_AT_LEAST_3_26 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_25 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_HOST_CMAKE_AT_LEAST string + default "3.26" if BR2_HOST_CMAKE_AT_LEAST_3_26 + default "3.25" if BR2_HOST_CMAKE_AT_LEAST_3_25 + default "3.24" if BR2_HOST_CMAKE_AT_LEAST_3_24 + default "3.23" if BR2_HOST_CMAKE_AT_LEAST_3_23 default "3.22" if BR2_HOST_CMAKE_AT_LEAST_3_22 default "3.21" if BR2_HOST_CMAKE_AT_LEAST_3_21 default "3.20" if BR2_HOST_CMAKE_AT_LEAST_3_20
package/cmake/cmake.hash +3 -3
@@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.22/cmake-3.22.3-SHA-256.txt -sha256 9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0 cmake-3.22.3.tar.gz +# From https://cmake.org/files/v3.26/cmake-3.26.4-SHA-256.txt +sha256 313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208 cmake-3.26.4.tar.gz # Locally calculated -sha256 f1a4326266aada65b307dac05161a9d02d3dba4fb08b50cb26e3c24cc8a86e97 Copyright.txt +sha256 4a01ccf2dc580ba570d02bc015bbe0ec92f1f318717aae9540ba841ba7946756 Copyright.txt
package/cmake/cmake.mk +2 -2
@@ -5,8 +5,8 @@ ################################################################################ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y -CMAKE_VERSION_MAJOR = 3.22 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 +CMAKE_VERSION_MAJOR = 3.26 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).4 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt
Signature · 6 lines
2.39.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 2/3 package/kodi: needs host-cmake >= 3.24
Building kodi with cmake version 3.22.3 provided by buildroot is broken
-- Found Python3: /home/buildroot/br6/output/per-package/kodi/host/x86_
64-buildroot-linux-gnu/sysroot/usr/include/python3.11 (found suitable
exact version "3.11.4") found components: Development Development. Module Development.Embed
-- Could NOT find Python3 (missing: Interpreter) (Required is exact
version "3.11")
Reason given by package:
Interpreter: Cannot run the interpreter "/home/buildroot/br6/ output/per-package/kodi/host/x86_64-buildroot-linux-gnu/sysroot/ usr/bin/python3"
CMake Error at cmake/scripts/common/Macros.cmake:432 (message):
PYTHON enabled but not found
Call Stack (most recent call first):
CMakeLists.txt:214 (core_optional_dep)
using this defconfig
BR2_x86_64=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_FORCE_HOST_BUILD=y
BR2_PER_PACKAGE_DIRECTORIES=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_KODI=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_PYTHON3_PY_ONLY=y
BR2_PACKAGE_HOST_CMAKE=y
due to "BR2_FORCE_HOST_BUILD=y".
The cmake version provided by my distro is 3.25.1 which works fine.
Adding "CMAKE_FIND_DEBUG_MODE TRUE" to the "find_package(Python3 [...]" call in Kodi's cmake/modules/FindPython.cmake and comparing the logfile of both cmake versions shows that 3.25.1 adds
CMAKE_FIND_USE_INSTALL_PREFIX: 1
while searching for python3.
This option was introduced in cmake 3.24:
https://cmake.org/cmake/help/latest/variable/CMAKE_FIND_USE_INSTALL_PREFIX.html
After introducing this fix it turns out that 0002-cmake-modules-fix-python-detection.patch is not needed anymore so we remove this patch.
---
v2: removed 0002-cmake-modules-fix-python-detection.patch
...2-cmake-modules-fix-python-detection.patch | 28 ------------------- package/kodi/Config.in | 1 + 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 package/kodi/0002-cmake-modules-fix-python-detection.patch
package/kodi/0002-cmake-modules-fix-python-detection.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From c29c1e762e126fdb46a19fc15bcb465cf1cd6c76 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" <[email protected]> -Date: Sun, 7 May 2023 11:18:00 +0200 -Subject: [PATCH] cmake/modules: fix python detection - -Signed-off-by: Bernd Kuhls <[email protected]> -Signed-off-by: Yann E. MORIN <[email protected]> -Upstream: https://github.com/xbmc/xbmc/pull/23230 ---- - cmake/modules/FindPython.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake -index 782c0f51f6..a013cccf80 100644 ---- a/cmake/modules/FindPython.cmake -+++ b/cmake/modules/FindPython.cmake -@@ -60,7 +60,7 @@ endif() - - find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development) - if(CORE_SYSTEM_NAME STREQUAL linux) -- if(HOST_CAN_EXECUTE_TARGET) -+ if(HOST_CAN_EXECUTE_TARGET OR DEFINED PYTHON_EXECUTABLE) - find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter) - else() - find_package(Python3 COMPONENTS Interpreter) --- -2.25.1 -
package/kodi/Config.in +1 -0
@@ -66,6 +66,7 @@ menuconfig BR2_PACKAGE_KODI depends on BR2_PACKAGE_PYTHON3 depends on !BR2_PACKAGE_PYTHON3_PYC_ONLY select BR2_NEEDS_HOST_JAVA + select BR2_HOST_CMAKE_AT_LEAST_3_24 select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_GPL select BR2_PACKAGE_FFMPEG_POSTPROC
Signature · 6 lines
2.39.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 3/3 package/kodi: fix filenames of kodi host utils
In reply to Bernd KuhlsThe variables WITH_JSONSCHEMABUILDER & WITH_TEXTUREPACKER are defined as directories:
https://github.com/xbmc/xbmc/blob/master/cmake/modules/buildtools/FindJsonSchemaBuilder.cmake
https://github.com/xbmc/xbmc/blob/master/cmake/modules/buildtools/FindTexturePacker.cmake
and during configure kodi searches these directories for usable binaries with the name scheme.
${APP_NAME_LC}-JsonSchemaBuilder
${APP_NAME_LC}-TexturePacker
which translates to kodi-JsonSchemaBuilder and kodi-TexturePacker.
--- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/kodi.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +1 -1
@@ -20,7 +20,7 @@ HOST_KODI_JSONSCHEMABUILDER_CONF_OPTS = \ define HOST_KODI_JSONSCHEMABUILDER_INSTALL_CMDS $(INSTALL) -m 755 -D \ $(@D)/tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder \ - $(HOST_DIR)/bin/JsonSchemaBuilder + $(HOST_DIR)/bin/kodi-JsonSchemaBuilder endef $(eval $(host-cmake-package))
package/kodi-texturepacker/kodi-texturepacker.mk +1 -1
@@ -35,7 +35,7 @@ HOST_KODI_TEXTUREPACKER_CONF_OPTS += \ define HOST_KODI_TEXTUREPACKER_INSTALL_CMDS $(INSTALL) -m 755 -D \ $(@D)/tools/depends/native/TexturePacker/TexturePacker \ - $(HOST_DIR)/bin/TexturePacker + $(HOST_DIR)/bin/kodi-TexturePacker endef $(eval $(host-cmake-package))
package/kodi/kodi.mk +2 -2
@@ -87,8 +87,8 @@ KODI_CONF_OPTS += \ -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ -DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \ -DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \ - -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ - -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ + -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/ \ + -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/ \ -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ -DLIBDVDNAV_URL=$(KODI_DL_DIR)/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \ -DLIBDVDREAD_URL=$(KODI_DL_DIR)/kodi-libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz
Signature · 6 lines
2.39.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
package/cmake/cmake.hash line 5
Quoted 3 lines · On Tue, 18 Jul 2023 22:59:08 +0200 Bernd Kuhls <[email protected]> wrote:
# Locally calculated
package/cmake/cmake.hash +1
-1-sha256 f1a4326266aada65b307dac05161a9d02d3dba4fb08b50cb26e3c24cc8a86e97 Copyright.txt +sha256 4a01ccf2dc580ba570d02bc015bbe0ec92f1f318717aae9540ba841ba7946756 Copyright.txt
You're updating the hash of the license file here, but it is not explained in your commit log. Could you adjust this?
Thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot