Patchwork [2/4] xserver-xorg: disable dri2 too when building without glx PACKAGECONFIG

login
register
mail settings
Submitter Martin Jansa
Date Nov. 23, 2012, 12:47 a.m.
Message ID <c72e7b4c61ac2a309ba3454feda1a579ce6bdbf8.1353631583.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/39523/
State Accepted
Commit 957b835f2a159aa293a77a4c947242b8bf89f8aa
Headers show

Comments

Martin Jansa - Nov. 23, 2012, 12:47 a.m.
* it was enabled when dri2proto was built before xserver-xorg

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

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 () {