diff options
Diffstat (limited to 'meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch')
-rw-r--r-- | meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch index 0671a45044..09ec1559ec 100644 --- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch +++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch | |||
@@ -1,26 +1,27 @@ | |||
1 | From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001 | 1 | From ad1d2161c811cff25d1684c33611f300adb753bc Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 May 2015 20:56:00 -0700 | 3 | Date: Fri, 29 May 2015 20:56:00 -0700 |
4 | Subject: [PATCH weston] make error() portable | 4 | Subject: [PATCH] make error() portable |
5 | 5 | ||
6 | error() is not posix but gnu extension so may not be available on all | 6 | error() is not posix but gnu extension so may not be available on all |
7 | kind of systemsi e.g. musl. | 7 | kind of systemsi e.g. musl. |
8 | 8 | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | Upstream-Status: Submitted | 9 | Upstream-Status: Submitted |
12 | 10 | ||
13 | configure.ac | 2 ++ | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | libweston/weston-error.h | 20 ++++++++++++++++++++ | 12 | |
15 | libweston/weston-launch.c | 2 +- | 13 | --- |
14 | configure.ac | 2 ++ | ||
15 | libweston/weston-error.h | 20 ++++++++++++++++++++ | ||
16 | libweston/weston-launch.c | 2 +- | ||
16 | 3 files changed, 23 insertions(+), 1 deletion(-) | 17 | 3 files changed, 23 insertions(+), 1 deletion(-) |
17 | create mode 100644 src/weston-error.h | 18 | create mode 100644 libweston/weston-error.h |
18 | 19 | ||
19 | Index: weston-3.0.0/configure.ac | 20 | diff --git a/configure.ac b/configure.ac |
20 | =================================================================== | 21 | index 7aebbdb..dc9c802 100644 |
21 | --- weston-3.0.0.orig/configure.ac | 22 | --- a/configure.ac |
22 | +++ weston-3.0.0/configure.ac | 23 | +++ b/configure.ac |
23 | @@ -103,6 +103,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], | 24 | @@ -109,6 +109,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], |
24 | [[#include <time.h>]]) | 25 | [[#include <time.h>]]) |
25 | AC_CHECK_HEADERS([execinfo.h]) | 26 | AC_CHECK_HEADERS([execinfo.h]) |
26 | 27 | ||
@@ -29,10 +30,11 @@ Index: weston-3.0.0/configure.ac | |||
29 | AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) | 30 | AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) |
30 | 31 | ||
31 | # check for libdrm as a build-time dependency only | 32 | # check for libdrm as a build-time dependency only |
32 | Index: weston-3.0.0/libweston/weston-error.h | 33 | diff --git a/libweston/weston-error.h b/libweston/weston-error.h |
33 | =================================================================== | 34 | new file mode 100644 |
35 | index 0000000..2089d02 | ||
34 | --- /dev/null | 36 | --- /dev/null |
35 | +++ weston-3.0.0/libweston/weston-error.h | 37 | +++ b/libweston/weston-error.h |
36 | @@ -0,0 +1,20 @@ | 38 | @@ -0,0 +1,20 @@ |
37 | +#ifndef _WESTON_ERROR_H | 39 | +#ifndef _WESTON_ERROR_H |
38 | +#define _WESTON_ERROR_H | 40 | +#define _WESTON_ERROR_H |
@@ -54,10 +56,10 @@ Index: weston-3.0.0/libweston/weston-error.h | |||
54 | + | 56 | + |
55 | +#endif | 57 | +#endif |
56 | + | 58 | + |
57 | Index: weston-3.0.0/libweston/weston-launch.c | 59 | diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c |
58 | =================================================================== | 60 | index 1adcf21..166bf3b 100644 |
59 | --- weston-3.0.0.orig/libweston/weston-launch.c | 61 | --- a/libweston/weston-launch.c |
60 | +++ weston-3.0.0/libweston/weston-launch.c | 62 | +++ b/libweston/weston-launch.c |
61 | @@ -33,7 +33,6 @@ | 63 | @@ -33,7 +33,6 @@ |
62 | #include <poll.h> | 64 | #include <poll.h> |
63 | #include <errno.h> | 65 | #include <errno.h> |
@@ -66,7 +68,7 @@ Index: weston-3.0.0/libweston/weston-launch.c | |||
66 | #include <getopt.h> | 68 | #include <getopt.h> |
67 | 69 | ||
68 | #include <sys/types.h> | 70 | #include <sys/types.h> |
69 | @@ -60,6 +59,7 @@ | 71 | @@ -59,6 +58,7 @@ |
70 | #endif | 72 | #endif |
71 | 73 | ||
72 | #include "weston-launch.h" | 74 | #include "weston-launch.h" |