summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-11 20:18:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 14:52:57 +0100
commiteb4e584de23ebaf2d8f54404dcf12a5aed1a37a1 (patch)
tree426e4afd43de4112ac988364de7288ec25d435da /meta/recipes-graphics
parenta66e6a7765525d3e18cd81b68c422b3dab81d498 (diff)
downloadopenembedded-core-eb4e584de23ebaf2d8f54404dcf12a5aed1a37a1.tar.gz
openembedded-core-eb4e584de23ebaf2d8f54404dcf12a5aed1a37a1.tar.bz2
openembedded-core-eb4e584de23ebaf2d8f54404dcf12a5aed1a37a1.zip
libx11: make bigfont an optional (disabled by default) packageconfig option
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc8
1 files 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