diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-07-20 10:44:13 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-23 13:55:25 +0100 |
commit | 9b68b63b6c6a3efd49626d66fd0237e40f9bf5da (patch) | |
tree | 29d6ac08bc2a5e7f4f40f5ccfdd8c721d5d7aecc /meta | |
parent | ca282da0b8b2b7372b12f0b14820adcced8d0374 (diff) | |
download | poky-9b68b63b6c6a3efd49626d66fd0237e40f9bf5da.tar.gz |
xserver-xorg: update 21.1.3 -> 21.1.4
(From OE-Core rev: d683f2a1fbe65b52d82f55a2e38aa75fc105a338)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch | 90 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb) | 7 |
2 files changed, 3 insertions, 94 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch deleted file mode 100644 index df9332fae7..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch +++ /dev/null | |||
@@ -1,90 +0,0 @@ | |||
1 | From 12041ad0610f1345d6b9994c32943fd4dd01f65d Mon Sep 17 00:00:00 2001 | ||
2 | From: Olivier Fourdan <ofourdan@redhat.com> | ||
3 | Date: Thu, 20 Jan 2022 10:20:38 +0100 | ||
4 | Subject: [PATCH] render: Fix build with gcc 12 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | The xserver fails to compile with the latest gcc 12: | ||
10 | |||
11 | render/picture.c: In function ‘CreateSolidPicture’: | ||
12 | render/picture.c:874:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[16]’ [-Werror=array-bounds] | ||
13 | 874 | pPicture->pSourcePict->type = SourcePictTypeSolidFill; | ||
14 | | ^~ | ||
15 | render/picture.c:868:45: note: object of size 16 allocated by ‘malloc’ | ||
16 | 868 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill)); | ||
17 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
18 | render/picture.c: In function ‘CreateLinearGradientPicture’: | ||
19 | render/picture.c:906:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds] | ||
20 | 906 | pPicture->pSourcePict->linear.type = SourcePictTypeLinear; | ||
21 | | ^~ | ||
22 | render/picture.c:899:45: note: object of size 32 allocated by ‘malloc’ | ||
23 | 899 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient)); | ||
24 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
25 | render/picture.c: In function ‘CreateConicalGradientPicture’: | ||
26 | render/picture.c:989:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds] | ||
27 | 989 | pPicture->pSourcePict->conical.type = SourcePictTypeConical; | ||
28 | | ^~ | ||
29 | render/picture.c:982:45: note: object of size 32 allocated by ‘malloc’ | ||
30 | 982 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient)); | ||
31 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
32 | cc1: some warnings being treated as errors | ||
33 | ninja: build stopped: subcommand failed. | ||
34 | |||
35 | This is because gcc 12 has become stricter and raises a warning now. | ||
36 | |||
37 | Fix the warning/error by allocating enough memory to store the union | ||
38 | struct. | ||
39 | |||
40 | Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/c6b0dcb82d4db07a2f32c09a8c09c85a5f57248e] | ||
41 | Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> | ||
42 | Acked-by: Michel Dänzer <mdaenzer@redhat.com> | ||
43 | Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1256 | ||
44 | --- | ||
45 | render/picture.c | 8 ++++---- | ||
46 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
47 | |||
48 | diff --git a/render/picture.c b/render/picture.c | ||
49 | index afa0d25..2be4b19 100644 | ||
50 | --- a/render/picture.c | ||
51 | +++ b/render/picture.c | ||
52 | @@ -865,7 +865,7 @@ CreateSolidPicture(Picture pid, xRenderColor * color, int *error) | ||
53 | } | ||
54 | |||
55 | pPicture->id = pid; | ||
56 | - pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill)); | ||
57 | + pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); | ||
58 | if (!pPicture->pSourcePict) { | ||
59 | *error = BadAlloc; | ||
60 | free(pPicture); | ||
61 | @@ -896,7 +896,7 @@ CreateLinearGradientPicture(Picture pid, xPointFixed * p1, xPointFixed * p2, | ||
62 | } | ||
63 | |||
64 | pPicture->id = pid; | ||
65 | - pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient)); | ||
66 | + pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); | ||
67 | if (!pPicture->pSourcePict) { | ||
68 | *error = BadAlloc; | ||
69 | free(pPicture); | ||
70 | @@ -936,7 +936,7 @@ CreateRadialGradientPicture(Picture pid, xPointFixed * inner, | ||
71 | } | ||
72 | |||
73 | pPicture->id = pid; | ||
74 | - pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictRadialGradient)); | ||
75 | + pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); | ||
76 | if (!pPicture->pSourcePict) { | ||
77 | *error = BadAlloc; | ||
78 | free(pPicture); | ||
79 | @@ -979,7 +979,7 @@ CreateConicalGradientPicture(Picture pid, xPointFixed * center, xFixed angle, | ||
80 | } | ||
81 | |||
82 | pPicture->id = pid; | ||
83 | - pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient)); | ||
84 | + pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); | ||
85 | if (!pPicture->pSourcePict) { | ||
86 | *error = BadAlloc; | ||
87 | free(pPicture); | ||
88 | -- | ||
89 | 2.35.1 | ||
90 | |||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb index 1f53ab5177..b9cbc9989e 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb | |||
@@ -1,10 +1,9 @@ | |||
1 | require xserver-xorg.inc | 1 | require xserver-xorg.inc |
2 | 2 | ||
3 | SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ | 3 | SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ |
4 | file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ | 4 | file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ |
5 | file://0001-render-Fix-build-with-gcc-12.patch \ | 5 | " |
6 | " | 6 | SRC_URI[sha256sum] = "5cc4be8ee47edb58d4a90e603a59d56b40291ad38371b0bd2471fc3cbee1c587" |
7 | SRC_URI[sha256sum] = "61d6aad5b6b47a116b960bd7f0cba4ee7e6da95d6bb0b127bde75d7d1acdebe5" | ||
8 | 7 | ||
9 | # These extensions are now integrated into the server, so declare the migration | 8 | # These extensions are now integrated into the server, so declare the migration |
10 | # path for in-place upgrades. | 9 | # path for in-place upgrades. |