diff options
author | Valentin Popa <valentin.popa@intel.com> | 2014-02-13 15:45:19 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-17 15:28:59 +0000 |
commit | e7d41d3a273adfefc5ca8a3b5562d3cd763739f1 (patch) | |
tree | 3a4fa73060f370700864c1ee8d0c6a4aacd53f1d /meta/recipes-graphics/wayland/wayland | |
parent | c8cf900e4e1b51515d9a08dd32740f52c467fe7f (diff) | |
download | poky-e7d41d3a273adfefc5ca8a3b5562d3cd763739f1.tar.gz |
wayland: upgrade to 1.4.0
(*) tested on qemux86 and genericx86 with
core-image-weston and core-image-sato
(From OE-Core rev: 46100431a726010645824a84850fd7bef8cc923b)
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland/wayland')
-rw-r--r-- | meta/recipes-graphics/wayland/wayland/just-scanner.patch | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/meta/recipes-graphics/wayland/wayland/just-scanner.patch b/meta/recipes-graphics/wayland/wayland/just-scanner.patch index 234a9c5f79..ae9935e089 100644 --- a/meta/recipes-graphics/wayland/wayland/just-scanner.patch +++ b/meta/recipes-graphics/wayland/wayland/just-scanner.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From f674544d4f6f5f763e449207da77a561b22eff97 Mon Sep 17 00:00:00 2001 | ||
2 | From: Valentin Popa <valentin.popa@intel.com> | ||
3 | Date: Fri, 7 Feb 2014 16:36:47 +0200 | ||
4 | Subject: [PATCH] just scanner | ||
5 | |||
1 | We only build wayland-native for the scanner, so disable the bits we don't | 6 | We only build wayland-native for the scanner, so disable the bits we don't |
2 | actually need. This gives us a small speed up but importantly should allow | 7 | actually need. This gives us a small speed up but importantly should allow |
3 | wayland-native to compile on older hosts such as CentOS 5 which currently fails: | 8 | wayland-native to compile on older hosts such as CentOS 5 which currently fails: |
@@ -10,22 +15,27 @@ wayland-native to compile on older hosts such as CentOS 5 which currently fails: | |||
10 | 15 | ||
11 | Upstream-Status: Inappropriate | 16 | Upstream-Status: Inappropriate |
12 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 17 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
18 | Signed-off-by: Valentin Popa <valentin.popa@intel.com> | ||
19 | --- | ||
20 | Makefile.am | 2 +- | ||
21 | src/Makefile.am | 2 +- | ||
22 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
13 | 23 | ||
14 | diff --git a/Makefile.am b/Makefile.am | 24 | diff --git a/Makefile.am b/Makefile.am |
15 | index 306d7b3..571fe89 100644 | 25 | index 99607b0..ecce1f1 100644 |
16 | --- a/Makefile.am | 26 | --- a/Makefile.am |
17 | +++ b/Makefile.am | 27 | +++ b/Makefile.am |
18 | @@ -2,7 +2,7 @@ if BUILD_DOCS | 28 | @@ -2,7 +2,7 @@ if BUILD_DOCS |
19 | doc_subdir = doc | 29 | doc_subdir = doc |
20 | endif | 30 | endif |
21 | 31 | ||
22 | -SUBDIRS = src protocol $(doc_subdir) tests cursor | 32 | -SUBDIRS = protocol src $(doc_subdir) tests cursor |
23 | +SUBDIRS = src protocol $(doc_subdir) | 33 | +SUBDIRS = protocol src $(doc_subdir) |
24 | 34 | ||
25 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} | 35 | ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |
26 | 36 | ||
27 | diff --git a/src/Makefile.am b/src/Makefile.am | 37 | diff --git a/src/Makefile.am b/src/Makefile.am |
28 | index e1d04ea..702342e 100644 | 38 | index 15f44a5..b938d17 100644 |
29 | --- a/src/Makefile.am | 39 | --- a/src/Makefile.am |
30 | +++ b/src/Makefile.am | 40 | +++ b/src/Makefile.am |
31 | @@ -1,4 +1,4 @@ | 41 | @@ -1,4 +1,4 @@ |
@@ -34,3 +44,6 @@ index e1d04ea..702342e 100644 | |||
34 | noinst_LTLIBRARIES = libwayland-util.la | 44 | noinst_LTLIBRARIES = libwayland-util.la |
35 | 45 | ||
36 | include_HEADERS = \ | 46 | include_HEADERS = \ |
47 | -- | ||
48 | 1.8.3.2 | ||
49 | |||