weston: drop superfluous --disable-lcms
PATCH 1/2 weston: drop superfluous --disable-lcms
From: Tim Orling <[email protected]>
Thank you to Henning Heinold for the catch. "Is this needed when you use PACKAGECONFIG later on?"
--- meta/recipes-graphics/wayland/weston_1.5.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston_1.5.0.bb +1 -1
@@ -26,7 +26,7 @@ EXTRA_OECONF = "--enable-setuid-install \ --disable-libunwind \ --disable-rpi-compositor \ --disable-rdp-compositor \ - --disable-lcms" + " PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
Signature · 1 line
1.8.3.2
PATCH 2/2 weston: fix make-lcms-configurable.patch
From: Tim Orling <[email protected]>
In AS_IF([test "x$enable_lcms" != "no"],
"no" should have been "xno"
--- meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch +1 -1
@@ -11,7 +11,7 @@ Index: weston-1.5.0/configure.ac + [disable lcms support]),, + enable_lcms=yes) + -+AS_IF([test "x$enable_lcms" != "no"], [ ++AS_IF([test "x$enable_lcms" != "xno"], [ PKG_CHECK_MODULES(LCMS, lcms2, - [have_lcms=yes], [have_lcms=no]) + [have_lcms=yes], [have_lcms=no])],
Signature · 1 line
1.8.3.2
Re: [PATCH 2/2] weston: fix make-lcms-configurable.patch
Quoted 2 lines · Tim Orling
In AS_IF([test "x$enable_lcms" != "no"],
"no" should have been "xno"
This patch doesn't quite satisfy the general goal we have of being fully deterministic: if --enable-lcms is specified but the lcms dependency isn't satisfied (i.e. it gained a version requirement and we didn't have it) then configure would happily and silently disable lcms.
A small tweak so that it's a fatal error if lcms is specified but the deps are not present would be good. Also have you approached upstream about this patch?
Ross
PATCH v2 1/1 weston: make lcms explicitly configurable
From: Tim Orling <[email protected]>
Per Ross's comment, make --enable-lcms deterministic. Follow upstream style to make it more likely to be merged upstream.
--- .../wayland/weston/make-lcms-configurable.patch | 22 ----------- .../weston/make-lcms-explicitly-configurable.patch | 43 ++++++++++++++++++++++ meta/recipes-graphics/wayland/weston_1.5.0.bb | 2 +- 3 files changed, 44 insertions(+), 23 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch create mode 100644 meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch
meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch deleted +0 -22
@@ -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], [AC_MSG_ERROR([lcms enabled but not found])])], -+ [have_lcms=no]) -+ - if test "x$have_lcms" = xyes; then - AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) - fi
meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch new file +43 -0
43 lines not on this page · raw message
meta/recipes-graphics/wayland/weston_1.5.0.bb +1 -1
@@ -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"
Signature · 1 line
1.8.3.2