summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-03-02 16:38:34 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-04 14:27:06 +0000
commit74a8b244ded9a914ca3f2cfca917a223b9e628c9 (patch)
tree26ef8027e7aed17b3a7bf4ac9ffa271e8fa606b4 /meta/recipes-graphics
parentd39298688668f273584b76fce4a6ed51a4a7c278 (diff)
downloadpoky-74a8b244ded9a914ca3f2cfca917a223b9e628c9.tar.gz
xserver-xorg: Fix build errors with clang
(From OE-Core rev: b11725db2d5549dc45d8ae36fbf94a5c8e342d69) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch36
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
new file mode 100644
index 0000000000..c0c242814b
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
@@ -0,0 +1,36 @@
1From 8a382c015cd3c69fcfc146ef03dcbf30c77ff207 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 1 Mar 2019 09:47:57 -0800
4Subject: [PATCH] test/xtest: Initialize array with braces
5
6Fixes an error when extra warnings are enabled, this is caught with clang
7
8test/xtest.c:64:23: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
9 WindowRec root = {0};
10 ^
11 {}
121 error generated.
13
14Upstream-Status: Pending
15
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 test/xtest.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/test/xtest.c b/test/xtest.c
22index fc5e433..d7e6620 100644
23--- a/test/xtest.c
24+++ b/test/xtest.c
25@@ -61,7 +61,7 @@ xtest_init_devices(void)
26 {
27 ScreenRec screen = {0};
28 ClientRec server_client = {0};
29- WindowRec root = {0};
30+ WindowRec root = {{0}};
31 WindowOptRec optional = {0};
32
33 /* random stuff that needs initialization */
34--
352.21.0
36
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
index 3f55987bba..ad99d6bece 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
@@ -3,6 +3,7 @@ require xserver-xorg.inc
3SRC_URI += "file://musl-arm-inb-outb.patch \ 3SRC_URI += "file://musl-arm-inb-outb.patch \
4 file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ 4 file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
5 file://pkgconfig.patch \ 5 file://pkgconfig.patch \
6 file://0001-test-xtest-Initialize-array-with-braces.patch \
6 " 7 "
7SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650" 8SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650"
8SRC_URI[sha256sum] = "fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee" 9SRC_URI[sha256sum] = "fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee"