mirror of
https://git.yoctoproject.org/poky
synced 2026-02-10 10:43:02 +01:00
8bffb5a88b
* 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:
31aa85787a
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.
(From OE-Core rev: 9c746017af381884cc20c7cd563fc429c2c66112)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
23 lines
707 B
BlitzBasic
23 lines
707 B
BlitzBasic
require ${BPN}.inc
|
|
|
|
DEFAULT_PREFERENCE = "-1"
|
|
|
|
SRCREV = "ea0d1f575c214c09ba3df12644a960e86e031766"
|
|
PV = "10.5.4+git${SRCPV}"
|
|
|
|
SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.5"
|
|
|
|
S = "${WORKDIR}/git"
|
|
|
|
DEPENDS += "python-mako-native"
|
|
|
|
inherit pythonnative
|
|
|
|
#because we cannot rely on the fact that all apps will use pkgconfig,
|
|
#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
|
|
do_install_append() {
|
|
if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
|
|
sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
|
|
fi
|
|
}
|