summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-11 20:17:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 15:13:46 +0100
commit71ba8234195299155e8405d4588f9dee98bb0b1b (patch)
tree1feae1bd1e85b63b7a3c0c8569dc7fc2ff347fc3 /meta
parentaa1744d63b4e92d2dd044df4b23a8cab90281d65 (diff)
downloadpoky-71ba8234195299155e8405d4588f9dee98bb0b1b.tar.gz
libx11-diet: you can't disable XCB anymore, so don't try
(From OE-Core rev: 315d187fcf1e6ff430b5c2986aa307e182ae09cb) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index ed5a8906ed..d821744436 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -1,11 +1,11 @@
1require libx11.inc 1require libx11.inc
2 2
3DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \ 3DESCRIPTION += " Support for UDC, XCMS and XLOCALE is disabled in \
4this version." 4this version."
5 5
6LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" 6LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
7 7
8PR = "${INC_PR}.0" 8PR = "${INC_PR}.1"
9 9
10SRC_URI += "file://x11_disable_makekeys.patch \ 10SRC_URI += "file://x11_disable_makekeys.patch \
11 file://X18NCMSstubs.diff \ 11 file://X18NCMSstubs.diff \
@@ -20,11 +20,11 @@ RPROVIDES_${PN}-locale = "libx11-locale"
20SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" 20SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
21SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" 21SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
22 22
23DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ 23DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
24 libxdmcp xf86bigfontproto kbproto inputproto xproto-native" 24 libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
25 25
26FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11" 26FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11"
27 27
28EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" 28EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
29CFLAGS += "-D_GNU_SOURCE" 29CFLAGS += "-D_GNU_SOURCE"
30 30