taisei: Upgrade to 1.4.3

Drop 0001-util-consideredharmful-Use-overloadable-func-attribu.patch
which is fixed differently upstream [1]

Specify strip=false via meson cmdline and avoid patching sources

Move dependency to libsdl3 instead of libsdl2 which is required in this
version

[1] 6a0c1c8bf0

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2025-07-11 09:56:23 -07:00
parent 55dac2d04d
commit 5901e29e37
No known key found for this signature in database
GPG Key ID: BB053355919D3314
3 changed files with 5 additions and 94 deletions

View File

@ -1,29 +0,0 @@
From 6c86f8aea2a29c33af3f212afa9f0ea180822d1e Mon Sep 17 00:00:00 2001
From: Thomas Perrot <thomas.perrot@bootlin.com>
Date: Wed, 6 Nov 2024 21:02:54 +0100
Subject: [PATCH] Remove strip option from executable build
To improve debugging experience, OE tasks will strip binaries.
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
---
meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/meson.build b/meson.build
index 88d4d53263ae..8a1f540836e0 100644
--- a/meson.build
+++ b/meson.build
@@ -73,7 +73,6 @@ project('taisei', 'c',
# You may want to change these for a debug build dir
'buildtype=release',
- 'strip=true',
'b_lto=true',
'b_ndebug=if-release',
]
--
2.47.0

View File

@ -1,58 +0,0 @@
From 6f40a8cfbc4dd5ca4c3156338e8e35f25d4d4599 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 22 Nov 2024 01:16:25 -0800
Subject: [PATCH] util/consideredharmful: Use overloadable func attribute with
clang
When building with glibc HEAD, it has fortified headers with clang as well
and clang reports errors e.g.
| ../git/src/util/consideredharmful.h:33:7: error: redeclaration of 'strncat' must have the 'overloadable' attribute
| 33 | char* strncat();
| | ^
| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/taisei/1.4.2/recipe-sysroot/usr/include/bits/string_fortified.h:145:8: note: previous overload of function is here
| 145 | __NTH (strncat (__fortify_clang_overload_arg (char *, __restrict, __dest),
| | ^
Upstream-Status: Submitted [https://github.com/taisei-project/taisei/pull/393]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/util/consideredharmful.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/src/util/consideredharmful.h
+++ b/src/util/consideredharmful.h
@@ -8,6 +8,7 @@
#pragma once
#include "taisei.h"
+#include "util/compat.h"
#include <stdio.h>
@@ -24,17 +25,23 @@ PRAGMA(GCC diagnostic ignored "-Wstrict-
// clang generates lots of these warnings with _FORTIFY_SOURCE
PRAGMA(GCC diagnostic ignored "-Wignored-attributes")
+#ifdef __GLIBC__
+#define OVERLOADABLE __attribute__((overloadable))
+#else
+#define OVERLOADABLE
+#endif
+
#undef fopen
attr_deprecated("Use vfs_open or SDL_RWFromFile instead")
FILE* fopen();
#undef strncat
attr_deprecated("This function likely doesn't do what you expect, use strlcat")
-char* strncat();
+char* OVERLOADABLE strncat();
#undef strncpy
attr_deprecated("This function likely doesn't do what you expect, use strlcpy")
-char* strncpy();
+char* OVERLOADABLE strncpy();
#undef errx
attr_deprecated("Use log_fatal instead")

View File

@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1a11ffd7e1bdd1d3156cecec60a2846f"
DEPENDS = "\
cglm \
freetype \
virtual/libsdl2 \
libsdl3 \
libwebp \
opusfile \
zstd \
@ -32,12 +32,8 @@ RDEPENDS_${PN} = "\
zlib \
"
SRC_URI = "gitsm://github.com/taisei-project/taisei.git;branch=v1.4.x;protocol=https \
file://0001-util-consideredharmful-Use-overloadable-func-attribu.patch \
file://0001-Remove-strip-option-from-executable-build.patch"
SRCREV = "c098579d4fa0f004ccc204c5bc46eac3717cba28"
SRC_URI = "gitsm://github.com/taisei-project/taisei.git;branch=v1.4.x;protocol=https;tag=v${PV}"
SRCREV = "02b7c71ae7d7a53202378e384f2cb26df9164f22"
inherit features_check meson mime mime-xdg pkgconfig python3native
@ -49,4 +45,6 @@ PACKAGECONFIG[a_null] = "-Da_null=true,-Da_null=false"
PACKAGECONFIG[developer] = "-Ddeveloper=true,-Ddeveloper=false"
PACKAGECONFIG[docs] = "-Ddocs=true,-Ddocs=false,python3-docutils-native"
EXTRA_OEMESON += "-Dstrip=false"
FILES:${PN} += "${datadir}"