diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-05-16 16:22:50 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-17 21:18:44 +0100 |
commit | d972c6239eb0d7153940ebecb5e3301d51a33110 (patch) | |
tree | ddd3a93bbe1b870573c8075efd6db25cbc08a13d /meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch | |
parent | aac99fb37faf71b9c14a9932b07c943e232323e8 (diff) | |
download | poky-d972c6239eb0d7153940ebecb5e3301d51a33110.tar.gz |
weston: Upgrade 1.9.0 -> 1.10.0
Support for multiple new protocols, many new features:
https://lists.freedesktop.org/archives/wayland-devel/2016-February/027039.html
* Weston now depends on wayland-protocols (which is protocol
collection split off from weston).
* Remove upstreamed patches, add a patch to fix the wayland-protocols
path used during build.
* Use HTTPS for tarball download
(From OE-Core rev: 9965dbeb89537be6ab97dc317b629fb24e5e6bbb)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch')
-rw-r--r-- | meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch deleted file mode 100644 index 35e6d6ff58..0000000000 --- a/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | weston-1.5.0/configure.ac: make lcms explicitly configurable | ||
2 | |||
3 | The lcms package is outside of openembedded-core, so make it | ||
4 | explicitly configurable. Make it deterministic, so that if lcms | ||
5 | dependencies are missing, autoconf throws a fatal error. Follow | ||
6 | upstream style to make it more likely to be merged. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Index: weston-1.5.0/configure.ac | ||
11 | =================================================================== | ||
12 | --- weston-1.5.0.orig/configure.ac | ||
13 | +++ weston-1.5.0/configure.ac | ||
14 | @@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install, | ||
15 | enable_demo_clients_install=no) | ||
16 | AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) | ||
17 | |||
18 | -PKG_CHECK_MODULES(LCMS, lcms2, | ||
19 | - [have_lcms=yes], [have_lcms=no]) | ||
20 | -if test "x$have_lcms" = xyes; then | ||
21 | - AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) | ||
22 | +AC_ARG_ENABLE(lcms, | ||
23 | + AS_HELP_STRING([--disable-lcms], | ||
24 | + [Disable lcms support]),, | ||
25 | + enable_lcms=auto) | ||
26 | +AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes]) | ||
27 | +if test "x$enable_lcms" != "xno"; then | ||
28 | + PKG_CHECK_MODULES(LCMS, | ||
29 | + lcms2, | ||
30 | + [have_lcms=yes], | ||
31 | + [have_lcms=no]) | ||
32 | + if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then | ||
33 | + AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found]) | ||
34 | + fi | ||
35 | + if test "x$have_lcms" = "xyes"; then | ||
36 | + enable_lcms=yes | ||
37 | + AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) | ||
38 | + fi | ||
39 | fi | ||
40 | -AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) | ||
41 | |||
42 | AC_PATH_PROG([wayland_scanner], [wayland-scanner]) | ||
43 | if test x$wayland_scanner = x; then | ||