From 73d02f6b121c8b0ed2d42de0bfd6c227fd4de41f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 7 Sep 2012 11:49:25 +0100 Subject: xserver-xorg: make DRI/GLX options respect opengl distro feature If the distro doesn't have the opengl feature there's no point building the DRI or GLX support, making the mesa-dri build dependency optional. Signed-off-by: Ross Burton Signed-off-by: Saul Wold --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg.inc') diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index a0309aa7bb..210abadff1 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -123,21 +123,13 @@ EXTRA_OECONF += "--with-fop=no \ ac_cv_file__usr_share_sgml_X11_defs_ent=no \ " -PACKAGECONFIG ??= "udev" +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,\ + xf86driproto dri2proto mesa-dri" do_install_append () { # Its assumed base-files creates this for us rmdir ${D}${localstatedir}/log/ } - - -# Mesa/GLX/DRI -PROTO_DEPS += "xf86driproto dri2proto" -LIB_DEPS += "mesa-dri" - -EXTRA_OECONF += "\ - --enable-dri \ - --enable-dri2 \ - --enable-glx-tls \ -" -- cgit 1.2.3-korg