summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-10-22 09:31:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-22 14:57:26 +0100
commit06d27cf0fbcc4004e6f456880eca49893c9290bf (patch)
treeb7aba0ef5281039cccef5b01d36d3b005ed19958 /meta/recipes-graphics/xorg-lib
parentc77ca9ee901468c93570b5264b226f7d17a41c16 (diff)
downloadopenembedded-core-06d27cf0fbcc4004e6f456880eca49893c9290bf.tar.gz
openembedded-core-06d27cf0fbcc4004e6f456880eca49893c9290bf.tar.bz2
openembedded-core-06d27cf0fbcc4004e6f456880eca49893c9290bf.zip
xorg: remove XF86 BigFont extension
This has been disabled by default upstream since 2007, nothing uses it. 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')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 97bd1c20fa..71e74f77dc 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 = "r9"
+INC_PR = "r10"
PROVIDES = "virtual/libx11"
@@ -22,14 +22,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto"
DEPENDS += "xproto-native"
-EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/"
+EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont"
EXTRA_OEMAKE += 'CWARNFLAGS=""'
-# Let people with incredibly archaic requirements enable Xcms and BigFont, but
-# disable them by default.
+# Let people with incredibly archaic requirements enable Xcms, but disable it by
+# default.
PACKAGECONFIG ??= ""
PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
-PACKAGECONFIG[bigfont] = "--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfontproto"
# src/util/makekeys needs to be compiled natively, so tell it what compiler to
# use.