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> --- Upstream-Status: Submitted - configure.ac | 2 ++ - src/weston-error.h | 20 ++++++++++++++++++++ - src/weston-launch.c | 2 +- + 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,[], +@@ -60,6 +60,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], [[#include <time.h>]]) AC_CHECK_HEADERS([execinfo.h]) @@ -28,10 +26,7 @@ index 263fc22..f52cd62 100644 + 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 + COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2" --- /dev/null +++ b/src/weston-error.h @@ -0,0 +1,20 @@ @@ -55,11 +50,9 @@ index 0000000..2089d02 + +#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 @@ +@@ -33,7 +33,6 @@ #include <poll.h> #include <errno.h> @@ -67,7 +60,7 @@ index 10c66de..3e6d30a 100644 #include <getopt.h> #include <sys/types.h> -@@ -56,6 +55,7 @@ +@@ -59,6 +58,7 @@ #endif #include "weston-launch.h" @@ -75,6 +68,3 @@ index 10c66de..3e6d30a 100644 #define DRM_MAJOR 226 --- -2.1.4 - |