Signed-off-by: Ross Burton <[email protected]>
---
meta/recipes-graphics/xorg-lib/libx11.inc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc
b/meta/recipes-graphics/xorg-lib/libx11.inc
index 85fdbe7..d56aa23 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,7 +11,7 @@ inherit siteinfo
FILESPATH = "${FILE_DIRNAME}/libx11"
PE = "1"
-INC_PR = "r6"
+INC_PR = "r7"
PROVIDES = "virtual/libx11"
@@ -20,7 +20,7 @@ LICENSE = "MIT & MIT-style & BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto"
-DEPENDS += "xf86bigfontproto xproto-native"
+DEPENDS += "xproto-native"
PACKAGES =+ "${PN}-xcb"
@@ -30,9 +30,11 @@ FILES_${PN}-locale += "${datadir}/X11/locale
${libdir}/X11/locale"
EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/"
-# Almost nothing uses XCMS
+# Let people with incredibly archaic requirements enable Xcms and BigFont, but
+# disable them by default.
PACKAGECONFIG ??= ""
PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
+PACKAGECONFIG[bigfont] =
"--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfontproto"
do_compile_prepend() {
cd ${S}/src/util
--
1.7.10
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
