diff options
author | Tim Orling <TicoTimo@gmail.com> | 2014-05-22 09:02:20 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-27 16:11:54 +0100 |
commit | 0882d265d83bcf816c1513cf594cdd35a309af8c (patch) | |
tree | c6c57740a267d8e4e8808d0533c37912d2de9cb5 /meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch | |
parent | 87e2ce604e6fbe2814a923e5077ad4d0a562e790 (diff) | |
download | poky-0882d265d83bcf816c1513cf594cdd35a309af8c.tar.gz |
weston: upgrade to 1.5.0
* replace 0001-remove-dependence-on-wayland-scanner-flags.patch with
disable-wayland-scanner-pkg-check.patch
* add make-lcms-configureable.patch (WIP... needs work)
= fix for JaMa test-dependencies
(From OE-Core rev: 7c40efb62f34f866c98a0b2df50d66c60d76143a)
Signed-off-by: Tim Orling <TicoTimo@gmail.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/weston/make-lcms-configurable.patch')
-rw-r--r-- | meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch new file mode 100644 index 0000000000..817ac70a15 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Index: weston-1.5.0/configure.ac | ||
2 | =================================================================== | ||
3 | --- weston-1.5.0.orig/configure.ac | ||
4 | +++ weston-1.5.0/configure.ac | ||
5 | @@ -491,8 +491,16 @@ AC_ARG_ENABLE(demo-clients-install, | ||
6 | enable_demo_clients_install=no) | ||
7 | AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) | ||
8 | |||
9 | +AC_ARG_ENABLE(lcms, | ||
10 | + AS_HELP_STRING([--disable-lcms], | ||
11 | + [disable lcms support]),, | ||
12 | + enable_lcms=yes) | ||
13 | + | ||
14 | +AS_IF([test "x$enable_lcms" != "no"], [ | ||
15 | PKG_CHECK_MODULES(LCMS, lcms2, | ||
16 | - [have_lcms=yes], [have_lcms=no]) | ||
17 | + [have_lcms=yes], [have_lcms=no])], | ||
18 | + [have_lcms=no]) | ||
19 | + | ||
20 | if test "x$have_lcms" = xyes; then | ||
21 | AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) | ||
22 | fi | ||