Even if 'egl' is in PACKAGECONFIG, mesa egl support
can be disabled explicitly (changing configure flags
using a .bbappend, for example).
On dora, meta-fsl-arm is an example of this kind.
On master there are no known cases, and we should
encourge package configuration through PACKAGECONFIG.
This patch adds another check for the existence
of eglplatform.h before 'sed' can alter it.
(From OE-Core rev: 97bc1bce9a226cc02db8a5afc2c0d4f4f70034a6)
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(*) add MESA_EGL_NO_X11_HEADERS to defines
(*) avoid altering eglplatform.h from {top_srcdir}/include
using an alternative to
0003-EGL-Mutate-NativeDisplayType-depending-on-config
patch.
[YOCTO #5882]
(From OE-Core rev: 4c6340dba65185acef7301762270fa1dc7e0afda)
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As there are two alternative mesa recipes (mesa and mesa-gl), there needs to be
a virtual provider that recipes that explicitly need Mesa (such as xserver-xorg)
can depend on.
(From OE-Core rev: 4a407568472d3c87cd2ce11baf199568249640b6)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some machines have hardware-specific GL drivers that do EGL and GLES (many ARM
boards). Others have their own EGL/GLES drivers and provide a Mesa DRI driver
(EMGD). Previously adding Mesa, for software GL/GLX rendering in the first case
and hardware GLX in the second, involved bbappends and changing Mesa to be
machine-specific.
By adding a just-GL Mesa the machine definition can combine it with the hardware
drivers cleanly.
(From OE-Core rev: f5a3a4bc33109181c741a2e66c13d0b45566e8fa)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Stop mesa from building on distributions without the "opengl" DISTRO_FEATURE.
(From OE-Core rev: 05bacb69a3b0f3bbd9dd608855456c32b4007fde)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes the following configure error:
configure:23490: error: radeonsi and r600g require libelf when using LLVM
(From OE-Core rev: 43e7f168c84128b5d48bbfde9d6c07f2fb656b00)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It's not necessary to specify the protocol parameter when it's the
default protocol for the fetcher, e.g. the default protocol for
git fetcher it git, "protocol=git" isn't needed.
(From OE-Core rev: a2bab241c64428d5109c3c5ac5de4463fbad70c5)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The additional Gallium drivers are needed for open source ATI Radeon
and NVIDIA graphics drivers.
The radeonsi and r600 drivers require LLVM 3.3 built with r600
PACKAGECONFIG so they must be explicitly enabled by adding r600 to the
mesa PACKAGECONFIG.
(From OE-Core rev: 1d08cef09cc7cbf682e8b372987fe4456961272b)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
One patch (submitted upstream) for when Gallium is enabled, and another
(inappropriate for upstream) to fix out-of-tree builds with
0003-EGL-Mutate-NativeDisplayType-depending-on-config.
(From OE-Core rev: fbc7092f0ae07538d4363679b1597ba4e556d1a8)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* it's packaged in libdricore package and prevents upgrading it
when debian.bbclass is enabled
* check_data_file_clashes: Package libdricore9.1.3-1 wants to install file /etc/drirc
But that file is already provided by package * libdricore9.0.2-1
* we can move it to separate packages, but it isn't very useful now, there
aren't many gamers using mesa on embedded devices
(From OE-Core rev: d56e0c0e315acdb0ba5db7a539970d64678c1f7a)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* 0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
needs to be rebased so move old version for 9.1.3 to
mesa-9.1.3/ and update the version in mesa/
* add git headers
* 0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
is already applied in new SRCREV, move it to mesa-9.1.3/
* formal change in license.html with new SRCREV:
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
(From OE-Core rev: 7c60607c898f596731441425d75144be232d4c8e)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* this is needed to fix pipe_loader_sw build without libx11,
but building with HAVE_PIPE_LOADER_XLIB enabled still doesn't
work (nobody is using this and it was removed in newer SRCREV).
See https://bugs.freedesktop.org/show_bug.cgi?id=66357 for details.
(From OE-Core rev: 0cc7f4ebad7f4390ac340854b57111d5084bd956)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rename llvmpipe to llvm to match configure option
* add MESA_LLVM_RELEASE to allow switching to 3.3 easier
* --enable-gallium isn't recognized option, split it to 2 more
PACKAGECONFIGs for gbm and egl
(From OE-Core rev: 0b1e64a8d026a8021f4568758a637689e886037b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Mesa isn't incorrectly installing GLU headers anymore, so we don't need to
delete them.
(From OE-Core rev: 96b91dd669d2701fcb4c71fb482392029ce7cd7f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* we can also include .inc as first statement in recipe like most recipes
(From OE-Core rev: add5a0c17647a6b44461dd8181a412dac2ef263a)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* it makes it easier to change PACKAGECONFIG in .bbappend and get
consistent EGL_PLATFORMS
(From OE-Core rev: 50dcfeab2b18422f3ab067893a0b68b17706d6e2)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* move DEPENDS which were originally applied only for mesa-dri to
dri PACKAGECONFIG
(From OE-Core rev: f780ec28cbaade55361390a04ac70574bde426de)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
--disable-glut and --disable-glw are not recognized since Mesa 8.0.
--disable-glu is not recognized since Mesa 9.0.
(From OE-Core rev: dac1f95e03f897237e6551240c200370d5102807)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It's not bleeding edge but it's better than the previous pre-9.1 commit.
(From OE-Core rev: a8b8e21afce050b677e9168e08b3f318aee72e1f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Merge mesa-PV.bb and mesa-PV.inc as the is no point to the split now we're only
building one variant of Mesa.
Drop 0002-cross-compile.patch isn't needed as libtool is used instead of mklib.
However, as libtool is used instead of mklib add fix-glsl-cross.patch to work
around build failures caused by the cross libtool being used to build host
binaries.
Add EGL-Mutate-NativeDisplayType-depending-on-config.patch to build correctly in
a non-X11 environment.
Drop dont-fail-if-libX11-isnt-installed.patch and
fix-egl-compilation-without-x11-headers.patch as they were backports.
license.html had some formatting and typo fixes, update the checksum.
(From OE-Core rev: d7033f4441183e53bf7fc8aa2293a9ec156a28dd)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This allow selection of following features:
drm, egl, freetype2, gbm, gles1, gles2, glut, osmesa, vg, wayland, x11
The x11 features is enabled depending on distro features but the
wayland has not been enabled as it does not work with Wayland
1.0. Rest were enabled for a sane default.
(From OE-Core rev: dc2de313febfc817640e4e55c75d0cb21c70c0ba)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Removed patches that now appear in the upstream.
(From OE-Core rev: 2329297b12e2eade895fff8d3d98722a15e0b7ec)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Patches backported from mesa Git and from mesa-dev mailing list.
(From OE-Core rev: f704bb42062f2ac15edaad36497a8d2815b8b8b2)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These patches from upstream allow mesa-demos to build and run against a non-Mesa
GL stack. Thanks to Tom Zanussi for doing this work for EMGD in meta-intel, and
Otavio Salvador for confirming it also works for Freescale.
[ YOCTO #3469 ]
(From OE-Core rev: 60fabb6ea0474b19ad57873b402a608a92c5a5d4)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Rename mesa-dri recipes to just mesa. Also, replace all references to
mesa-dri in all recipes/configs.
The reason for this renaming (quote from bugzilla):
"mesa-dri is a artefact of mesa-xlib existing, which doesn't anymore.
mesa-dri should be renamed to mesa."
[YOCTO #3385]
(From OE-Core rev: c8bbb9983bcc7cfc5332e89c3e8148505b4ca83f)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Its clear this was meant to be a prepend. Also fix an out
of date comment.
(From OE-Core rev: 775692b36fe726479eafdbc9e3f2141acb171f8d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* By default enable only swrast. This needs to
be here or for some reason qemuarm tries to
detect the intel dri libraries and fails.
* For x86 and x86-64 explicitly set all of
the supported drm drivers.
builds properly with qemux86 qemuarm and qemux86-64
(From OE-Core rev: 3efcfa7e75dc0fe98b75ae1b7be8db5549182ff9)
Signed-off-by: Ian Reinhart Geiser <igeiser@devonit.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the "wayland" DISTRO_FEATURE is present, enable the Wayland EGL platform.
This is required by the reference Wayland compositor, Weston.
(From OE-Core rev: 0e56ecdd78212e7743e71c5d6a42ceb65c182786)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upgrade Mesa to 9.01, backporting a patch from master to build without needing
mesa-dri-glsl-native.
Several patches have been merged upstream, so drop them.
License checksums updated as the file was re-formated.
Drop mesa-dri-glsl-native as we don't need it anymore.
Tested with Piglit's "quick" test suite, pass rate remains constant compared to
8.0.5 at 87%.
(From OE-Core rev: f816697c1e76589de7853bd5573cf578e25c7ca7)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Move /etc/drirc to libdricommon so mesa-dri is empty, and remove the automatic
dependency on mesa-dri in mesa-dri-dev.
(From OE-Core rev: 882bf3bc5f038d5e072df1bf3ecddd66e025e673)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
license.html was reformated so the checksum changed.
The GLSL compiler can be built using CC_FOR_BUILD, so we don't need
mesa-dri-glsl-native.
Update common packaging to include libdricore and the skeleton libgles3, and
remove the driver .la files.
mesa-git/uclibc.patch isn't applied, remove.
x32 support is integrated into mklib, drop 0003-fix-for-x32.patch.
uclibc is checked for upstream, drop 0001-Compile-with-uclibc.patch.
(From OE-Core rev: 8060a24c679ba17aea48bdeb4b8cfd460885f65f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Licence checksum change, use an upstream source file instead of a generated
file: we were previously checksumming the Bison license.
(From OE-Core rev: b85388ad0b6c3e7176295949d88c504abf0ba5cc)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
mesa-dri ships the configuration file in mesa 9, so ship that and don't claim
it's empty. Clean up libegl and libgbm packaging.
(From OE-Core rev: 22549ed65f0e413d7f4375e5eba7c86302a46acd)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The -dev packages were RPROVIDEing the non-dev names, which is clearly wrong.
(From OE-Core rev: 8d224244a016adc889be132d9994d7c517f7eae3)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Valentin Popa
Ross Burton
Jonathan Liu
Jackie Huang
Martin Jansa
Otavio Salvador
Saul Wold
Andreas Oberritter
Laurentiu Palcu
Richard Purdie
Constantin Musca
Ian Reinhart Geiser
Alexandru DAMIAN