summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTim Orling <TicoTimo@gmail.com>2014-05-30 08:52:10 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-01 14:29:31 +0100
commitdfe49a11fadb6312dbebe9bb644d1fbfe83171c6 (patch)
tree3af3305e9692bec68cb9a2d9423a5abf929d7d0d /meta
parentdd1dacf7bde252294d63215df6a5d7636110f003 (diff)
downloadpoky-dfe49a11fadb6312dbebe9bb644d1fbfe83171c6.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch22
-rw-r--r--meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch43
-rw-r--r--meta/recipes-graphics/wayland/weston_1.5.0.bb2
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 @@
1Index: weston-1.5.0/configure.ac
2===================================================================
3--- weston-1.5.0.orig/configure.ac
4+++ weston-1.5.0/configure.ac
5@@ -491,8 +491,16 @@ AC_ARG_ENABLE(demo-clients-install,
6 enable_demo_clients_install=no)
7 AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"])
8
9+AC_ARG_ENABLE(lcms,
10+ AS_HELP_STRING([--disable-lcms],
11+ [disable lcms support]),,
12+ enable_lcms=yes)
13+
14+AS_IF([test "x$enable_lcms" != "xno"], [
15 PKG_CHECK_MODULES(LCMS, lcms2,
16- [have_lcms=yes], [have_lcms=no])
17+ [have_lcms=yes], [have_lcms=no])],
18+ [have_lcms=no])
19+
20 if test "x$have_lcms" = xyes; then
21 AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
22 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 @@
1weston-1.5.0/configure.ac: make lcms explicitly configurable
2
3The lcms package is outside of openembedded-core, so make it
4explicitly configurable. Make it deterministic, so that if lcms
5dependencies are missing, autoconf throws a fatal error. Follow
6upstream style to make it more likely to be merged.
7
8Upstream-Status: Pending
9
10Index: 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
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 \
9 file://weston.png \ 9 file://weston.png \
10 file://weston.desktop \ 10 file://weston.desktop \
11 file://disable-wayland-scanner-pkg-check.patch \ 11 file://disable-wayland-scanner-pkg-check.patch \
12 file://make-lcms-configurable.patch" 12 file://make-lcms-explicitly-configurable.patch"
13SRC_URI[md5sum] = "8eb40d230efc2411f083c20656534780" 13SRC_URI[md5sum] = "8eb40d230efc2411f083c20656534780"
14SRC_URI[sha256sum] = "06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684" 14SRC_URI[sha256sum] = "06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684"
15 15