summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11.inc
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 15:13:48 +0100
commit5842947c3dc932b4234680a07a473be4b56abcb9 (patch)
tree902a7e26a994f3efdfe1254c9f480a21a351f248 /meta/recipes-graphics/xorg-lib/libx11.inc
parent84279136fe4c268bd8ea2ff76c1e501f8b9e3976 (diff)
downloadpoky-5842947c3dc932b4234680a07a473be4b56abcb9.tar.gz
libx11: make bigfont an optional (disabled by default) packageconfig option
(From OE-Core rev: eb4e584de23ebaf2d8f54404dcf12a5aed1a37a1) 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/libx11.inc')
-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
11FILESPATH = "${FILE_DIRNAME}/libx11" 11FILESPATH = "${FILE_DIRNAME}/libx11"
12 12
13PE = "1" 13PE = "1"
14INC_PR = "r6" 14INC_PR = "r7"
15 15
16PROVIDES = "virtual/libx11" 16PROVIDES = "virtual/libx11"
17 17
@@ -20,7 +20,7 @@ LICENSE = "MIT & MIT-style & BSD"
20LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" 20LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
21 21
22DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" 22DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto"
23DEPENDS += "xf86bigfontproto xproto-native" 23DEPENDS += "xproto-native"
24 24
25PACKAGES =+ "${PN}-xcb" 25PACKAGES =+ "${PN}-xcb"
26 26
@@ -30,9 +30,11 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
30 30
31EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/" 31EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/"
32 32
33# Almost nothing uses XCMS 33# Let people with incredibly archaic requirements enable Xcms and BigFont, but
34# disable them by default.
34PACKAGECONFIG ??= "" 35PACKAGECONFIG ??= ""
35PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" 36PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
37PACKAGECONFIG[bigfont] = "--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfontproto"
36 38
37do_compile_prepend() { 39do_compile_prepend() {
38 cd ${S}/src/util 40 cd ${S}/src/util