From 957b835f2a159aa293a77a4c947242b8bf89f8aa 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: 1668b4d4f373292ea4d611712ef56148ededfce5) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 4135a8b4cf..d410707363 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -13,7 +13,7 @@ PROVIDES = "virtual/xserver-xf86" PROVIDES += "virtual/xserver" PE = "2" -INC_PR = "r5" +INC_PR = "r6" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" @@ -133,7 +133,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 () { -- cgit v1.2.3-54-g00ecf