diff options
author | Ross Burton <ross.burton@intel.com> | 2012-10-22 09:31:43 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-22 14:59:30 +0100 |
commit | 8ce23f569584f195391bc5c68a780e1bf54e4360 (patch) | |
tree | cf5b57438f823fe51935782e9b1122ad20562b00 /meta/recipes-graphics/xorg-lib | |
parent | b5591d0b49202894a0e864759b20410450714914 (diff) | |
download | poky-8ce23f569584f195391bc5c68a780e1bf54e4360.tar.gz |
xorg: remove XF86 BigFont extension
This has been disabled by default upstream since 2007, nothing uses it.
(From OE-Core rev: 06d27cf0fbcc4004e6f456880eca49893c9290bf)
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.inc | 9 |
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 | |||
11 | FILESPATH = "${FILE_DIRNAME}/libx11" | 11 | FILESPATH = "${FILE_DIRNAME}/libx11" |
12 | 12 | ||
13 | PE = "1" | 13 | PE = "1" |
14 | INC_PR = "r9" | 14 | INC_PR = "r10" |
15 | 15 | ||
16 | PROVIDES = "virtual/libx11" | 16 | PROVIDES = "virtual/libx11" |
17 | 17 | ||
@@ -22,14 +22,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" | |||
22 | DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" | 22 | DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" |
23 | DEPENDS += "xproto-native" | 23 | DEPENDS += "xproto-native" |
24 | 24 | ||
25 | EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/" | 25 | EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont" |
26 | EXTRA_OEMAKE += 'CWARNFLAGS=""' | 26 | EXTRA_OEMAKE += 'CWARNFLAGS=""' |
27 | 27 | ||
28 | # Let people with incredibly archaic requirements enable Xcms and BigFont, but | 28 | # Let people with incredibly archaic requirements enable Xcms, but disable it by |
29 | # disable them by default. | 29 | # default. |
30 | PACKAGECONFIG ??= "" | 30 | PACKAGECONFIG ??= "" |
31 | PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" | 31 | PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" |
32 | PACKAGECONFIG[bigfont] = "--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfontproto" | ||
33 | 32 | ||
34 | # src/util/makekeys needs to be compiled natively, so tell it what compiler to | 33 | # src/util/makekeys needs to be compiled natively, so tell it what compiler to |
35 | # use. | 34 | # use. |