diff options
| author | Tim Orling <TicoTimo@gmail.com> | 2014-05-30 08:52:10 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-01 14:28:36 +0100 |
| commit | e2f45c6284f0a26cc858f9ae5887a4c1ef844d96 (patch) | |
| tree | 1a249eb915cf35038786e5d47830849421fe52cc | |
| parent | 1942c417d94e0b4e39613b15a632482b557a51d0 (diff) | |
| download | openembedded-core-e2f45c6284f0a26cc858f9ae5887a4c1ef844d96.tar.gz openembedded-core-e2f45c6284f0a26cc858f9ae5887a4c1ef844d96.tar.bz2 openembedded-core-e2f45c6284f0a26cc858f9ae5887a4c1ef844d96.zip | |
weston: make lcms explicitly configurable
Per Ross's comment, make --enable-lcms deterministic.
Follow upstream style to make it more likely to be merged upstream.
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 44 insertions, 23 deletions
diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch deleted file mode 100644 index ef145b8473..0000000000 --- a/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: weston-1.5.0/configure.ac -=================================================================== ---- weston-1.5.0.orig/configure.ac -+++ weston-1.5.0/configure.ac -@@ -491,8 +491,16 @@ AC_ARG_ENABLE(demo-clients-install, - enable_demo_clients_install=no) - AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) - -+AC_ARG_ENABLE(lcms, -+ AS_HELP_STRING([--disable-lcms], -+ [disable lcms support]),, -+ enable_lcms=yes) -+ -+AS_IF([test "x$enable_lcms" != "xno"], [ - PKG_CHECK_MODULES(LCMS, lcms2, -- [have_lcms=yes], [have_lcms=no]) -+ [have_lcms=yes], [have_lcms=no])], -+ [have_lcms=no]) -+ - if test "x$have_lcms" = xyes; then - AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) - fi 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 @@ +weston-1.5.0/configure.ac: make lcms explicitly configurable + +The lcms package is outside of openembedded-core, so make it +explicitly configurable. Make it deterministic, so that if lcms +dependencies are missing, autoconf throws a fatal error. Follow +upstream style to make it more likely to be merged. + +Upstream-Status: Pending + +Index: weston-1.5.0/configure.ac +=================================================================== +--- weston-1.5.0.orig/configure.ac ++++ weston-1.5.0/configure.ac +@@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install, + enable_demo_clients_install=no) + AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) + +-PKG_CHECK_MODULES(LCMS, lcms2, +- [have_lcms=yes], [have_lcms=no]) +-if test "x$have_lcms" = xyes; then +- AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) ++AC_ARG_ENABLE(lcms, ++ AS_HELP_STRING([--disable-lcms], ++ [Disable lcms support]),, ++ enable_lcms=auto) ++AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes]) ++if test "x$enable_lcms" != "xno"; then ++ PKG_CHECK_MODULES(LCMS, ++ lcms2, ++ [have_lcms=yes], ++ [have_lcms=no]) ++ if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then ++ AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found]) ++ fi ++ if test "x$have_lcms" = "xyes"; then ++ enable_lcms=yes ++ AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) ++ fi + fi +-AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) + + AC_PATH_PROG([wayland_scanner], [wayland-scanner]) + if test x$wayland_scanner = x; then diff --git a/meta/recipes-graphics/wayland/weston_1.5.0.bb b/meta/recipes-graphics/wayland/weston_1.5.0.bb index 6a79e32542..5573a06260 100644 --- a/meta/recipes-graphics/wayland/weston_1.5.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.5.0.bb @@ -9,7 +9,7 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop \ file://disable-wayland-scanner-pkg-check.patch \ - file://make-lcms-configurable.patch" + file://make-lcms-explicitly-configurable.patch" SRC_URI[md5sum] = "8eb40d230efc2411f083c20656534780" SRC_URI[sha256sum] = "06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684" |