[PATCH v2 0/3] Improve DRI handling support flexibility

[PATCH v2 0/3] Improve DRI handling support flexibility

[Otavio Salvador]

There're some processors which provide binary blobs for DRI and GPU
support which need to be build in BSP; to avoid some dirt and ugly
hacks in BSP we ought to be flexible.

We splitted the glx and dri PACKAGECONFIG options and added a
virtual/dri provider so BSP can override it, if need.

Otavio Salvador (3):
  mesa: Add virtual/dri provides
  xserver-xorg: Split 'glx' and 'dri' PACKAGECONFIG options
  default-providers.inc: Set 'virtual/dri' as default for 'mesa-dri'

 meta/conf/distro/include/default-providers.inc      |  1 +
 meta/recipes-graphics/mesa/mesa-common.inc          |  4 ++--
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 13 ++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

-- 
1.8.1

[PATCH v2 1/3] mesa: Add virtual/dri provides

[Otavio Salvador]

This allow for use DRI alternative implementations as done in some ARM
SoCs.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-graphics/mesa/mesa-common.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 1ff08fb..d93835c 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -11,12 +11,12 @@ BUGTRACKER = "https://bugs.freedesktop.org"
 SECTION = "x11"
 LICENSE = "MIT"
 
-INC_PR = "r9"
+INC_PR = "r10"
 PE = "2"
 
 DEPENDS = "expat makedepend-native flex-native bison-native"
 
-PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
+PROVIDES = "virtual/dri virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
 
 # for mesa-dri and mesa-xlib
 FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
-- 
1.8.1

[PATCH v2 2/3] xserver-xorg: Split 'glx' and 'dri' PACKAGECONFIG options

[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 <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

[PATCH v2 3/3] default-providers.inc: Set 'virtual/dri' as default for 'mesa-dri'

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/conf/distro/include/default-providers.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 444176c..d0b84bd 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -5,6 +5,7 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
 PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/dri ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
-- 
1.8.1

Re: [PATCH v2 0/3] Improve DRI handling support flexibility

[Burton, Ross]

On 29 January 2013 11:57, Otavio Salvador <otavio@ossystems.com.br> wrote:
> There're some processors which provide binary blobs for DRI and GPU
> support which need to be build in BSP; to avoid some dirt and ugly
> hacks in BSP we ought to be flexible.
>
> We splitted the glx and dri PACKAGECONFIG options and added a
> virtual/dri provider so BSP can override it, if need.

Acked-by: Ross Burton <ross.burton@intel.com>

Ross

Re: [PATCH v2 0/3] Improve DRI handling support flexibility

[Otavio Salvador]

On Wed, Jan 30, 2013 at 2:13 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 29 January 2013 11:57, Otavio Salvador <otavio@ossystems.com.br> wrote:
>> There're some processors which provide binary blobs for DRI and GPU
>> support which need to be build in BSP; to avoid some dirt and ugly
>> hacks in BSP we ought to be flexible.
>>
>> We splitted the glx and dri PACKAGECONFIG options and added a
>> virtual/dri provider so BSP can override it, if need.
>
> Acked-by: Ross Burton <ross.burton@intel.com>

Please hold this patchset. I am checking if it will really attend our need.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br