[oe-commits] Martin Jansa : xserver-xorg: disable dri2 too when building without glx PACKAGECONFIG

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 1668b4d4f373292ea4d611712ef56148ededfce5
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1668b4d4f373292ea4d611712ef56148ededfce5

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Fri Nov 23 01:47:16 2012 +0100

xserver-xorg: disable dri2 too when building without glx PACKAGECONFIG

* it was enabled when dri2proto was built before xserver-xorg

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    4 ++--
 1 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 4135a8b..d410707 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 () {