summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch69
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch23
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb35
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.24.0.bb14
4 files changed, 14 insertions, 127 deletions
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch
deleted file mode 100644
index 8cb76c35d6..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From 6c52693d264ca3dc8e15a92f56cf3a636639bb6c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
3Date: Fri, 28 Oct 2022 22:17:15 +0300
4Subject: [PATCH] freetype: Fix function signatures to match without casts
5
6Clang 16 has got a new stricter warning for casts of function types
7(see https://github.com/llvm/llvm-project/commit/1aad641c793090b4d036c03e737df2ebe2c32c57).
8
9This new warning gets included as part of the existing error
10diagnostic setting of -Wcast-function-type.
11
12This fixes errors like these:
13
14../src/hb-ft.cc:1011:34: error: cast from 'void (*)(FT_Face)' (aka 'void (*)(FT_FaceRec_ *)') to 'FT_Generic_Finalizer' (aka 'void (*)(void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
15 ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize;
16 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
18Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169]
19---
20 src/hb-ft.cc | 10 ++++++----
21 1 file changed, 6 insertions(+), 4 deletions(-)
22
23diff --git a/src/hb-ft.cc b/src/hb-ft.cc
24index a6beb9f0f..a35e75b18 100644
25--- a/src/hb-ft.cc
26+++ b/src/hb-ft.cc
27@@ -729,8 +729,9 @@ hb_ft_face_create_referenced (FT_Face ft_face)
28 }
29
30 static void
31-hb_ft_face_finalize (FT_Face ft_face)
32+hb_ft_face_finalize (void *arg)
33 {
34+ FT_Face ft_face = (FT_Face) arg;
35 hb_face_destroy ((hb_face_t *) ft_face->generic.data);
36 }
37
38@@ -762,7 +763,7 @@ hb_ft_face_create_cached (FT_Face ft_face)
39 ft_face->generic.finalizer (ft_face);
40
41 ft_face->generic.data = hb_ft_face_create (ft_face, nullptr);
42- ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize;
43+ ft_face->generic.finalizer = hb_ft_face_finalize;
44 }
45
46 return hb_face_reference ((hb_face_t *) ft_face->generic.data);
47@@ -949,8 +950,9 @@ get_ft_library ()
48 }
49
50 static void
51-_release_blob (FT_Face ft_face)
52+_release_blob (void *arg)
53 {
54+ FT_Face ft_face = (FT_Face) arg;
55 hb_blob_destroy ((hb_blob_t *) ft_face->generic.data);
56 }
57
58@@ -1032,7 +1034,7 @@ hb_ft_font_set_funcs (hb_font_t *font)
59 #endif
60
61 ft_face->generic.data = blob;
62- ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob;
63+ ft_face->generic.finalizer = _release_blob;
64
65 _hb_ft_font_set_funcs (font, ft_face, true);
66 hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
67--
682.39.2
69
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch
deleted file mode 100644
index bc9371553f..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From 6ec375eaafc43a2b3c30a0e0e49447d231d81a67 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 9 May 2017 00:57:10 -0700
4
5---
6Upstream-Status: Pending
7
8 Makefile.am | 2 ++
9 1 file changed, 2 insertions(+)
10
11diff --git a/Makefile.am b/Makefile.am
12index 8568dd2..5efc91e 100644
13--- a/Makefile.am
14+++ b/Makefile.am
15@@ -3,6 +3,8 @@ ACLOCAL_AMFLAGS = -I acinclude
16
17 lib_LTLIBRARIES = libSDL2_ttf.la
18
19+AUTOMAKE_OPTIONS = foreign
20+
21 libSDL2_ttfincludedir = $(includedir)/SDL2
22 libSDL2_ttfinclude_HEADERS = \
23 SDL_ttf.h
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb
deleted file mode 100644
index 6cd4a48aa8..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb
+++ /dev/null
@@ -1,35 +0,0 @@
1SUMMARY = "Simple DirectMedia Layer truetype font library"
2SECTION = "libs"
3DEPENDS = "libsdl2 freetype virtual/egl"
4LICENSE = "Zlib"
5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41cbf59bdea749fe34c1af6d3615f68"
6
7SRC_URI = " \
8 git://github.com/libsdl-org/SDL_ttf.git;branch=release-2.20.x;protocol=https \
9 git://github.com/libsdl-org/freetype.git;branch=VER-2-12-1-SDL;destsuffix=git/external/freetype;name=freetype;protocol=https \
10 git://github.com/libsdl-org/harfbuzz.git;branch=2.9.1-SDL;destsuffix=git/external/harfbuzz;name=harfbuzz;protocol=https \
11 file://0001-freetype-Fix-function-signatures-to-match-without-ca.patch;patchdir=external/harfbuzz \
12 file://automake_foreign.patch \
13"
14SRCREV = "89d1692fd8fe91a679bb943d377bfbd709b52c23"
15SRCREV_freetype = "6fc77cee03e078e97afcee0c0e06a2d3274b9a29"
16SRCREV_harfbuzz = "43931e3e596c04044861770b831c8f9452e2d3b0"
17
18SRCREV_FORMAT .= "_freetype_harfbuzz"
19
20S = "${WORKDIR}/git"
21
22inherit autotools pkgconfig features_check
23
24# links to libGL.so
25REQUIRED_DISTRO_FEATURES += "opengl"
26
27do_configure:prepend() {
28 # Removing these files fixes a libtool version mismatch.
29 MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
30
31 for i in ${MACROS}; do
32 rm -f ${S}/acinclude/$i
33 done
34}
35ASNEEDED = ""
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.24.0.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.24.0.bb
new file mode 100644
index 0000000000..ae9a430cf5
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.24.0.bb
@@ -0,0 +1,14 @@
1SUMMARY = "Simple DirectMedia Layer truetype font library"
2SECTION = "libs"
3DEPENDS = "libsdl2 freetype virtual/egl"
4LICENSE = "Zlib"
5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
6
7SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz"
8SRC_URI[sha256sum] = "0b2bf1e7b6568adbdbc9bb924643f79d9dedafe061fa1ed687d1d9ac4e453bfd"
9
10inherit cmake pkgconfig
11
12S = "${UNPACKDIR}/SDL2_ttf-${PV}"
13
14FILES:${PN} += "${datadir}/licenses"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-11 01:32:42 +0000