diff options
| -rw-r--r-- | meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch | 3 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch | 22 |
2 files changed, 15 insertions, 10 deletions
diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch index 9fb1252284..ad3526d984 100644 --- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch +++ b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch @@ -21,8 +21,7 @@ Index: wayland-1.14.0/src/wayland-scanner.pc.in =================================================================== --- wayland-1.14.0.orig/src/wayland-scanner.pc.in +++ wayland-1.14.0/src/wayland-scanner.pc.in -@@ -1,8 +1,8 @@ - prefix=@prefix@ +@@ -2,7 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ datarootdir=@datarootdir@ pkgdatadir=@datadir@/@PACKAGE@ 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 e2213aca60..0671a45044 100644 --- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch +++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch @@ -16,9 +16,11 @@ Upstream-Status: Submitted 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/weston-error.h ---- a/configure.ac -+++ b/configure.ac -@@ -60,6 +60,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], +Index: weston-3.0.0/configure.ac +=================================================================== +--- weston-3.0.0.orig/configure.ac ++++ weston-3.0.0/configure.ac +@@ -103,6 +103,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], [[#include <time.h>]]) AC_CHECK_HEADERS([execinfo.h]) @@ -26,9 +28,11 @@ Upstream-Status: Submitted + AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) - COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2" + # check for libdrm as a build-time dependency only +Index: weston-3.0.0/libweston/weston-error.h +=================================================================== --- /dev/null -+++ b/libweston/weston-error.h ++++ weston-3.0.0/libweston/weston-error.h @@ -0,0 +1,20 @@ +#ifndef _WESTON_ERROR_H +#define _WESTON_ERROR_H @@ -50,8 +54,10 @@ Upstream-Status: Submitted + +#endif + ---- a/libweston/weston-launch.c -+++ b/libweston/weston-launch.c +Index: weston-3.0.0/libweston/weston-launch.c +=================================================================== +--- weston-3.0.0.orig/libweston/weston-launch.c ++++ weston-3.0.0/libweston/weston-launch.c @@ -33,7 +33,6 @@ #include <poll.h> #include <errno.h> @@ -60,7 +66,7 @@ Upstream-Status: Submitted #include <getopt.h> #include <sys/types.h> -@@ -59,6 +58,7 @@ +@@ -60,6 +59,7 @@ #endif #include "weston-launch.h" |