public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: Otavio Salvador <otavio@ossystems.com.br>
To: openembedded-core@lists.openembedded.org
Cc: Otavio Salvador <otavio@ossystems.com.br>
Subject: [PATCH 2/2] xserver-xorg: Split 'glx' and 'dri' PACKAGECONFIG options
Date: Fri, 25 Jan 2013 20:32:22 -0200	[thread overview]
Message-ID: <1359153142-13425-3-git-send-email-otavio@ossystems.com.br> (raw)
In-Reply-To: <1359153142-13425-1-git-send-email-otavio@ossystems.com.br>

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 <otavio@ossystems.com.br>
---
 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
-- 
1.8.1




  parent reply	other threads:[~2013-01-25 22:43 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-25 22:32 [PATCH 0/2] Improve DRI handling support flexibility Otavio Salvador
2013-01-25 22:32 ` [PATCH 1/2] mesa: Add virtual/dri provides Otavio Salvador
2013-01-28 16:08   ` Burton, Ross
2013-01-25 22:32 ` Otavio Salvador [this message]
2013-01-25 23:07 ` [PATCH 0/2] Improve DRI handling support flexibility Richard Purdie
2013-01-26 15:16   ` Otavio Salvador

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1359153142-13425-3-git-send-email-otavio@ossystems.com.br \
    --to=otavio@ossystems.com.br \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox