spdlog: Upgrade to 1.15.0
PATCH 1/2 spdlog: Upgrade to 1.15.0
Use bundled fmt, it still needs 11.0.x and one in OE-core has moved to 11.1.x
Signed-off-by Khem Raj <[email protected]>
---
.../spdlog/{spdlog_1.14.1.bb => spdlog_1.15.0.bb} | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta-oe/recipes-support/spdlog/{spdlog_1.14.1.bb => spdlog_1.15.0.bb} (79%)meta-oe/recipes-support/spdlog/spdlog_1.15.0.bb renamed from meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb +2 -4
@@ -3,16 +3,14 @@ HOMEPAGE = "https://github.com/gabime/spdlog/wiki" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=9573510928429ad0cbe5ba4de77546e9" -SRCREV = "27cb4c76708608465c413f6d0e6b8d99a4d84302" +SRCREV = "8e5613379f5140fefb0b60412fbf1f5406e7c7f8" SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x" -DEPENDS = "fmt" - S = "${WORKDIR}/git" inherit cmake # no need to build example & tests & benchmarks on pure yocto -EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLE=off -DSPDLOG_FMT_EXTERNAL=on" +EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLE=off -DSPDLOG_FMT_EXTERNAL=off" BBCLASSEXTEND = "native"
PATCH 2/2 mariadb: Upgrade to 10.11.10
Drop 0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch its already in this version
Signed-off-by Khem Raj <[email protected]>
---
..._10.11.9.bb => mariadb-native_10.11.10.bb} | 0
meta-oe/recipes-dbs/mysql/mariadb.inc | 3 +--
...ction-as-deleter-prototype-in-unique.patch | 26 -------------------
...mariadb_10.11.9.bb => mariadb_10.11.10.bb} | 0
4 files changed, 1 insertion(+), 28 deletions(-)
rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.11.9.bb => mariadb-native_10.11.10.bb} (100%)
delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch
rename meta-oe/recipes-dbs/mysql/{mariadb_10.11.9.bb => mariadb_10.11.10.bb} (100%)meta-oe/recipes-dbs/mysql/mariadb-native_10.11.10.bb renamed from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb +0 -0
meta-oe/recipes-dbs/mysql/mariadb.inc +1 -2
@@ -23,11 +23,10 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ file://lfs64.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ - file://0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch \ file://0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20" +SRC_URI[sha256sum] = "b06a74650b83a16aa9ab098984482b028e75b000674b11ff288772c619a6f022" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags"
meta-oe/recipes-dbs/mysql/mariadb/0001-Use-a-lambda-function-as-deleter-prototype-in-unique.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From 713c21880e25108bf0703433432acca58377cc7b Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 27 Sep 2024 11:55:53 -0700 -Subject: [PATCH] Use a lambda function as deleter prototype in unique_ptr - -Fixes build with clang/libc++ 20+ - -Upstream-Status: Submitted [https://jira.mariadb.org/browse/MDEV-35040] -Signed-off-by: Khem Raj <[email protected]> ---- - extra/mariabackup/backup_copy.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc -index a328f5e0ec7..2ab04b78bce 100644 ---- a/extra/mariabackup/backup_copy.cc -+++ b/extra/mariabackup/backup_copy.cc -@@ -1641,7 +1641,7 @@ is_aria_log_dir_file(const datadir_node_t &node) - bool - copy_back_aria_logs(const char *dstdir) - { -- std::unique_ptr<ds_ctxt_t, void (&)(ds_ctxt_t*)> -+ std::unique_ptr<ds_ctxt_t, std::function<void(ds_ctxt_t*)>> - ds_ctxt_aria_log_dir_path(ds_create(dstdir, DS_TYPE_LOCAL), ds_destroy); - - datadir_node_t node;