diff options
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, 43 insertions, 0 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 new file mode 100644 index 0000000000..35e6d6ff58 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch | |||
| @@ -0,0 +1,43 @@ | |||
| 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 | ||