summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:02 -0800
commit07dd613a668a40cdeca761424b2d9d7d883494db (patch)
tree6c59ffe7b99f38de2d8546a33acd0ab453bbafab /meta/recipes-graphics/wayland
parentb2998df0841d412bbf15f3307510e95602cf27a7 (diff)
downloadpoky-07dd613a668a40cdeca761424b2d9d7d883494db.tar.gz
wayland: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 320f03b8492e5259c45e7c59b62571d5a827ee59) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland')
-rw-r--r--meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch3
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch22
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
21=================================================================== 21===================================================================
22--- wayland-1.14.0.orig/src/wayland-scanner.pc.in 22--- wayland-1.14.0.orig/src/wayland-scanner.pc.in
23+++ wayland-1.14.0/src/wayland-scanner.pc.in 23+++ wayland-1.14.0/src/wayland-scanner.pc.in
24@@ -1,8 +1,8 @@ 24@@ -2,7 +2,7 @@ prefix=@prefix@
25 prefix=@prefix@
26 exec_prefix=@exec_prefix@ 25 exec_prefix=@exec_prefix@
27 datarootdir=@datarootdir@ 26 datarootdir=@datarootdir@
28 pkgdatadir=@datadir@/@PACKAGE@ 27 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
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--- a/configure.ac 19Index: weston-3.0.0/configure.ac
20+++ b/configure.ac 20===================================================================
21@@ -60,6 +60,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], 21--- weston-3.0.0.orig/configure.ac
22+++ weston-3.0.0/configure.ac
23@@ -103,6 +103,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
22 [[#include <time.h>]]) 24 [[#include <time.h>]])
23 AC_CHECK_HEADERS([execinfo.h]) 25 AC_CHECK_HEADERS([execinfo.h])
24 26
@@ -26,9 +28,11 @@ Upstream-Status: Submitted
26+ 28+
27 AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) 29 AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
28 30
29 COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2" 31 # check for libdrm as a build-time dependency only
32Index: weston-3.0.0/libweston/weston-error.h
33===================================================================
30--- /dev/null 34--- /dev/null
31+++ b/libweston/weston-error.h 35+++ weston-3.0.0/libweston/weston-error.h
32@@ -0,0 +1,20 @@ 36@@ -0,0 +1,20 @@
33+#ifndef _WESTON_ERROR_H 37+#ifndef _WESTON_ERROR_H
34+#define _WESTON_ERROR_H 38+#define _WESTON_ERROR_H
@@ -50,8 +54,10 @@ Upstream-Status: Submitted
50+ 54+
51+#endif 55+#endif
52+ 56+
53--- a/libweston/weston-launch.c 57Index: weston-3.0.0/libweston/weston-launch.c
54+++ b/libweston/weston-launch.c 58===================================================================
59--- weston-3.0.0.orig/libweston/weston-launch.c
60+++ weston-3.0.0/libweston/weston-launch.c
55@@ -33,7 +33,6 @@ 61@@ -33,7 +33,6 @@
56 #include <poll.h> 62 #include <poll.h>
57 #include <errno.h> 63 #include <errno.h>
@@ -60,7 +66,7 @@ Upstream-Status: Submitted
60 #include <getopt.h> 66 #include <getopt.h>
61 67
62 #include <sys/types.h> 68 #include <sys/types.h>
63@@ -59,6 +58,7 @@ 69@@ -60,6 +59,7 @@
64 #endif 70 #endif
65 71
66 #include "weston-launch.h" 72 #include "weston-launch.h"