Patchwork [RFC,05/18] libx11: move xcms disabling to PACKAGECONFIG in libx11.inc

login
register
mail settings
Submitter Ross Burton
Date Sept. 11, 2012, 7:17 p.m.
Message ID <1347391088-30390-5-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/36355/
State Accepted
Commit ea17d1365b0425b0f6ddd4daf8d166116ac26f26
Headers show

Comments

Ross Burton - Sept. 11, 2012, 7:17 p.m.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb |    2 +-
 meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb |    2 +-
 meta/recipes-graphics/xorg-lib/libx11.inc           |    6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

Patch

diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index e6aa63f..dd9e7d9 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -25,6 +25,6 @@  DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
 
 FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11"
 
-EXTRA_OECONF += "--disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
+EXTRA_OECONF += "--disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
 CFLAGS += "-D_GNU_SOURCE"
 
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
index e8661f3..9e88d45 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
@@ -19,4 +19,4 @@  RPROVIDES_${PN}-locale = "libx11-locale"
 SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
 SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
 
-EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xcms "
+EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/"
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index fb1daf2..22b26cc 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