summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2016-10-29 17:47:52 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-06 23:35:33 +0000
commitcd08dce163b4122c44deb51fc7b9cb2baa383f17 (patch)
tree351a5a40fc8dd7b9503faec704b5f43d6a38e761 /meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
parent3a6612a81197d2e1ebefcfd5cd9576d91d2ea08b (diff)
downloadpoky-cd08dce163b4122c44deb51fc7b9cb2baa383f17.tar.gz
weston: upgrade from 1.11.0 to 1.11.1
* Refresh patches to apply cleanly without hunk on 1.11.1 (no changes): - 0001-make-error-portable.patch - 0001-configure.ac-Fix-wayland-protocols-path.patch - 0001-shared-include-stdint.h-for-int32_t.patch - 0001-weston-launch-Provide-a-default-version-that-doesn-t.patch * Remove make-weston-launch-exit-for-unrecognized-option.patch applied upstream https://cgit.freedesktop.org/wayland/weston/commit/?h=1.11&id=fc3dd183 * Add 0001-Add-configuration-option-for-no-input-device.patch backported from upstream https://cgit.freedesktop.org/wayland/weston/commit/?id=75b7197f (From OE-Core rev: b6864b13b01f466dcb8602a08f99d6d2a7a3d48b) Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> 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/weston/0001-configure.ac-Fix-wayland-protocols-path.patch')
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
index 00118d78bb..edd3b918f6 100644
--- a/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch
@@ -13,14 +13,12 @@ breaks multilib weston as it would point to multilib sysroot when the
13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14Upstream-Status: Inappropriate [embedded specific] 14Upstream-Status: Inappropriate [embedded specific]
15--- 15---
16 configure.ac | 2 +- 16 configure.ac | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
18 18
19diff --git a/configure.ac b/configure.ac
20index bc7c329..15a05d3 100644
21--- a/configure.ac 19--- a/configure.ac
22+++ b/configure.ac 20+++ b/configure.ac
23@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0]) 21@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [lib
24 PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) 22 PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
25 23
26 PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2], 24 PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2],
@@ -29,6 +27,3 @@ index bc7c329..15a05d3 100644
29 AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) 27 AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
30 28
31 AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, 29 AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],,
32--
332.1.4
34