sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: e2f45c6284f0a26cc858f9ae5887a4c1ef844d96)

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tim Orling 2014-05-30 08:52:10 -07:00 committed by Richard Purdie
parent dd1dacf7bd
commit dfe49a11fa
3 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch
View File

@ -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

43
meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch Normal file
View File

@ -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

2
meta/recipes-graphics/wayland/weston_1.5.0.bb
View File

@ -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"