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 | 24 |
1 files changed, 7 insertions, 17 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 148848d8d2..f7b52843d9 100644 --- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch +++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch | |||
@@ -10,17 +10,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | --- | 10 | --- |
11 | Upstream-Status: Submitted | 11 | Upstream-Status: Submitted |
12 | 12 | ||
13 | configure.ac | 2 ++ | 13 | configure.ac | 2 ++ |
14 | src/weston-error.h | 20 ++++++++++++++++++++ | 14 | src/weston-error.h | 20 ++++++++++++++++++++ |
15 | src/weston-launch.c | 2 +- | 15 | src/weston-launch.c | 2 +- |
16 | 3 files changed, 23 insertions(+), 1 deletion(-) | 16 | 3 files changed, 23 insertions(+), 1 deletion(-) |
17 | create mode 100644 src/weston-error.h | 17 | create mode 100644 src/weston-error.h |
18 | 18 | ||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index 263fc22..f52cd62 100644 | ||
21 | --- a/configure.ac | 19 | --- a/configure.ac |
22 | +++ b/configure.ac | 20 | +++ b/configure.ac |
23 | @@ -57,6 +57,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], | 21 | @@ -60,6 +60,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], |
24 | [[#include <time.h>]]) | 22 | [[#include <time.h>]]) |
25 | AC_CHECK_HEADERS([execinfo.h]) | 23 | AC_CHECK_HEADERS([execinfo.h]) |
26 | 24 | ||
@@ -28,10 +26,7 @@ index 263fc22..f52cd62 100644 | |||
28 | + | 26 | + |
29 | AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) | 27 | AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) |
30 | 28 | ||
31 | COMPOSITOR_MODULES="wayland-server >= 1.7.93 pixman-1 >= 0.25.2" | 29 | COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2" |
32 | diff --git a/src/weston-error.h b/src/weston-error.h | ||
33 | new file mode 100644 | ||
34 | index 0000000..2089d02 | ||
35 | --- /dev/null | 30 | --- /dev/null |
36 | +++ b/src/weston-error.h | 31 | +++ b/src/weston-error.h |
37 | @@ -0,0 +1,20 @@ | 32 | @@ -0,0 +1,20 @@ |
@@ -55,11 +50,9 @@ index 0000000..2089d02 | |||
55 | + | 50 | + |
56 | +#endif | 51 | +#endif |
57 | + | 52 | + |
58 | diff --git a/src/weston-launch.c b/src/weston-launch.c | ||
59 | index 10c66de..3e6d30a 100644 | ||
60 | --- a/src/weston-launch.c | 53 | --- a/src/weston-launch.c |
61 | +++ b/src/weston-launch.c | 54 | +++ b/src/weston-launch.c |
62 | @@ -30,7 +30,6 @@ | 55 | @@ -33,7 +33,6 @@ |
63 | #include <poll.h> | 56 | #include <poll.h> |
64 | #include <errno.h> | 57 | #include <errno.h> |
65 | 58 | ||
@@ -67,7 +60,7 @@ index 10c66de..3e6d30a 100644 | |||
67 | #include <getopt.h> | 60 | #include <getopt.h> |
68 | 61 | ||
69 | #include <sys/types.h> | 62 | #include <sys/types.h> |
70 | @@ -56,6 +55,7 @@ | 63 | @@ -59,6 +58,7 @@ |
71 | #endif | 64 | #endif |
72 | 65 | ||
73 | #include "weston-launch.h" | 66 | #include "weston-launch.h" |
@@ -75,6 +68,3 @@ index 10c66de..3e6d30a 100644 | |||
75 | 68 | ||
76 | #define DRM_MAJOR 226 | 69 | #define DRM_MAJOR 226 |
77 | 70 | ||
78 | -- | ||
79 | 2.1.4 | ||
80 | |||