diff options
| author |   Ronan Le Martret <ronan.lemartret@iot.bzh> | 2017-02-27 10:46:50 +0100 |
|---|---|---|
| committer | Ronan Le Martret <ronan.lemartret@iot.bzh> | 2017-05-03 11:10:04 +0200 |
| commit | 10d0d2392d64bed9aee6f81818390ea5ddd54082 (patch) | |
| tree | 933fe42b414244263fc7fa399e45bedca6482e47 /meta-rcar-gen3/recipes-graphics/wayland/weston/0001-make-error-portable.patch | |
| parent | 6bcdb8b084a45f5526a75bc10aae641da7bbcd73 (diff) | |
[COMMUNITY] cleaned wayland recipes to facilitate maintenance
* move wayland forward port into directory :
recipes-forward-port/wayland_fp_morty
* move renesas fix on forward port into directory :
recipes-forward-port/wayland
* weston recipes bbappend do not overwrite SRC_URI,
replace SRC_URI softly (Easier to maintain).
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Diffstat (limited to 'meta-rcar-gen3/recipes-graphics/wayland/weston/0001-make-error-portable.patch')
| -rw-r--r-- | meta-rcar-gen3/recipes-graphics/wayland/weston/0001-make-error-portable.patch | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta-rcar-gen3/recipes-graphics/wayland/weston/0001-make-error-portable.patch deleted file mode 100644 index 148848d..0000000 --- a/meta-rcar-gen3/recipes-graphics/wayland/weston/0001-make-error-portable.patch +++ /dev/null @@ -1,80 +0,0 @@ -From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 May 2015 20:56:00 -0700 -Subject: [PATCH weston] make error() portable - -error() is not posix but gnu extension so may not be available on all -kind of systemsi e.g. musl. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - configure.ac | 2 ++ - src/weston-error.h | 20 ++++++++++++++++++++ - src/weston-launch.c | 2 +- - 3 files changed, 23 insertions(+), 1 deletion(-) - create mode 100644 src/weston-error.h - -diff --git a/configure.ac b/configure.ac -index 263fc22..f52cd62 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,6 +57,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], - [[#include <time.h>]]) - AC_CHECK_HEADERS([execinfo.h]) - -+AC_CHECK_HEADERS([error.h]) -+ - AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) - - COMPOSITOR_MODULES="wayland-server >= 1.7.93 pixman-1 >= 0.25.2" -diff --git a/src/weston-error.h b/src/weston-error.h -new file mode 100644 -index 0000000..2089d02 ---- /dev/null -+++ b/src/weston-error.h -@@ -0,0 +1,20 @@ -+#ifndef _WESTON_ERROR_H -+#define _WESTON_ERROR_H -+ -+#if defined(HAVE_ERROR_H) -+#include <error.h> -+#else -+#include <err.h> -+#include <string.h> -+#define _weston_error(S, E, F, ...) do { \ -+ if (E) \ -+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ -+ else \ -+ err(S, F, ##__VA_ARGS__); \ -+} while(0) -+ -+#define error _weston_error -+#endif -+ -+#endif -+ -diff --git a/src/weston-launch.c b/src/weston-launch.c -index 10c66de..3e6d30a 100644 ---- a/src/weston-launch.c -+++ b/src/weston-launch.c -@@ -30,7 +30,6 @@ - #include <poll.h> - #include <errno.h> - --#include <error.h> - #include <getopt.h> - - #include <sys/types.h> -@@ -56,6 +55,7 @@ - #endif - - #include "weston-launch.h" -+#include "weston-error.h" - - #define DRM_MAJOR 226 - --- -2.1.4 - |