From 5842947c3dc932b4234680a07a473be4b56abcb9 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 11 Sep 2012 20:18:00 +0100 Subject: libx11: make bigfont an optional (disabled by default) packageconfig option (From OE-Core rev: eb4e584de23ebaf2d8f54404dcf12a5aed1a37a1) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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 85fdbe7dd9..d56aa23918 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 -- cgit v1.2.3-54-g00ecf