From patchwork Fri Jan 25 22:32:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/2] xserver-xorg: Split 'glx' and 'dri' PACKAGECONFIG options Date: Fri, 25 Jan 2013 22:32:22 -0000 From: Otavio Salvador X-Patchwork-Id: 43443 Message-Id: <1359153142-13425-3-git-send-email-otavio@ossystems.com.br> To: openembedded-core@lists.openembedded.org Cc: Otavio Salvador Some SoC need 'dri' support even when not building glx; this patch splits it in two PACKAGECONFIG options ('glx' and 'dri') but does not change the default (both enabled). Signed-off-by: Otavio Salvador --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 5d5443c..0e3d180 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 = "r8" +INC_PR = "r9" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" @@ -122,11 +122,14 @@ EXTRA_OECONF += "--with-fop=no \ ac_cv_file__usr_share_sgml_X11_defs_ent=no \ " -PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}" +PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx dri', '', d)}" PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" -PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\ - --disable-dri --disable-dri2 --disable-glx,\ - xf86driproto dri2proto mesa-dri" +PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,\ + --disable-glx,\ + virtual/libgl" +PACKAGECONFIG[dri] = "--enable-dri --enable-dri2,\ + --disable-dri --disable-dri2,\ + virtual/dri xf86driproto dri2proto" do_install_append () { # Its assumed base-files creates this for us