diff options
Diffstat (limited to 'meta-oe/recipes-graphics/libsdl/libsdl2-ttf')
-rw-r--r-- | meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch | 69 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch | 23 |
2 files changed, 0 insertions, 92 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 @@ | |||
1 | From 6c52693d264ca3dc8e15a92f56cf3a636639bb6c Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st> | ||
3 | Date: Fri, 28 Oct 2022 22:17:15 +0300 | ||
4 | Subject: [PATCH] freetype: Fix function signatures to match without casts | ||
5 | |||
6 | Clang 16 has got a new stricter warning for casts of function types | ||
7 | (see https://github.com/llvm/llvm-project/commit/1aad641c793090b4d036c03e737df2ebe2c32c57). | ||
8 | |||
9 | This new warning gets included as part of the existing error | ||
10 | diagnostic setting of -Wcast-function-type. | ||
11 | |||
12 | This 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 | |||
18 | Upstream-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 | |||
23 | diff --git a/src/hb-ft.cc b/src/hb-ft.cc | ||
24 | index 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 | -- | ||
68 | 2.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 @@ | |||
1 | From 6ec375eaafc43a2b3c30a0e0e49447d231d81a67 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 9 May 2017 00:57:10 -0700 | ||
4 | |||
5 | --- | ||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Makefile.am | 2 ++ | ||
9 | 1 file changed, 2 insertions(+) | ||
10 | |||
11 | diff --git a/Makefile.am b/Makefile.am | ||
12 | index 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 | ||