aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11.inc
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-11 20:17:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 14:52:16 +0100
commitea17d1365b0425b0f6ddd4daf8d166116ac26f26 (patch)
treed6556789e3e01729de3be48b98fc12e4059cb597 /meta/recipes-graphics/xorg-lib/libx11.inc
parentaee98f2ccab4bfff2aca031c2374274f945982f5 (diff)
downloadopenembedded-core-ea17d1365b0425b0f6ddd4daf8d166116ac26f26.tar.gz
libx11: move xcms disabling to PACKAGECONFIG in libx11.inc
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11.inc')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index fb1daf2e0a..22b26cc277 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -9,7 +9,7 @@ require xorg-lib-common.inc
inherit siteinfo
PE = "1"
-INC_PR = "r2"
+INC_PR = "r3"
PROVIDES = "virtual/libx11"
@@ -23,6 +23,10 @@ FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/X
FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+# Almost nothing uses XCMS
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
+
do_compile_prepend() {
cd ${S}/src/util
mv makekeys.c.orig makekeys.c || true