]> code.ossystems Code Review - openembedded-core.git/commit
mesa: respect MESA_EGL_NO_X11_HEADERS even with x11 in PACKAGECONFIG
authorMartin Jansa <martin.jansa@gmail.com>
Thu, 30 Jul 2015 20:50:03 +0000 (13:50 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 9 Aug 2015 23:37:11 +0000 (16:37 -0700)
commite5bf7aeac6f6855040e462d0b7cea8c4ea64805a
treee5d8d7e3bd5ff7d3e7a773a27c28f8f001a70df7
parent3eaaa488c811b6a8f7b855f9f2a666d106dbe433
mesa: respect MESA_EGL_NO_X11_HEADERS even with x11 in PACKAGECONFIG

* commit a5ebdb6ad8e4f94ac819275d55575230e057e4ae
  Author: Valentin Popa <valentin.popa@intel.com>
  Date:   Tue Feb 18 13:32:16 2014 +0200
  Subject: mesa: upgrade to 9.2.5

  introduced this do_install_append, but doesn't explain why it doesn't
  respect MESA_EGL_NO_X11_HEADERS flag anymore.

  Not respecting MESA_EGL_NO_X11_HEADERS breaks any build which is using
  qtdeclarative+egl in distribution which has x11 in mesa PACKAGECONFIG
  (e.g. my bitbake world builds).

  The problem is that qtdeclarative is using "None" symbol in
  QSGTexture::Filtering enum, it's possible to rename it in qtdeclarative,
  but it's quite invasive and changes qtdeclarative public APIs, see:
  https://github.com/webOS-ports/meta-webos-ports/commit/31aa85787a7513e279165a25f6f06ea72c576314
  so it was rejected by upstream and I don't want to maintain it in
  meta-qt5 - changing public API in OE build is even worse than if upstream
  does it.

* This change returns MESA_EGL_NO_X11_HEADERS flag so it's relatively
  easy to resolve this conflict in such setups by preventing Xlib.h
  inclusion.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Tobias Olausson <tobias.olausson@pelagicore.com>
meta/recipes-graphics/mesa/mesa_10.4.4.bb
meta/recipes-graphics/mesa/mesa_git.bb