From 9c89aa1fd9b3ec09e52c464ad85d4b58d8bad417 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 23 Nov 2012 01:47:16 +0100 Subject: xserver-xorg: disable dri2 too when building without glx PACKAGECONFIG * it was enabled when dri2proto was built before xserver-xorg (From OE-Core rev: 6014223d1527a6fd870b68cbefb9194a079a5d2c) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index bea0252259..1372667108 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -126,7 +126,7 @@ EXTRA_OECONF += "--with-fop=no \ PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}" PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\ - --disable-dri --disable-glx,\ + --disable-dri --disable-dri2 --disable-glx,\ xf86driproto dri2proto mesa-dri" do_install_append () { diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb index a219f814ac..cf74559376 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb @@ -10,4 +10,4 @@ SRC_URI += "file://crosscompile.patch \ SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" -PR = "r10" +PR = "r11" -- cgit v1.2.3-54-g00ecf