From 71ba8234195299155e8405d4588f9dee98bb0b1b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 11 Sep 2012 20:17:52 +0100 Subject: libx11-diet: you can't disable XCB anymore, so don't try (From OE-Core rev: 315d187fcf1e6ff430b5c2986aa307e182ae09cb) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb | 8 ++++---- 1 file 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 @@ require libx11.inc -DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \ +DESCRIPTION += " Support for UDC, XCMS and XLOCALE is disabled in \ this version." LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI += "file://x11_disable_makekeys.patch \ file://X18NCMSstubs.diff \ @@ -20,11 +20,11 @@ RPROVIDES_${PN}-locale = "libx11-locale" SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" -DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ +DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto xproto-native" FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11" -EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" +EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" CFLAGS += "-D_GNU_SOURCE" -- cgit v1.2.3-54-g00ecf