Mesa has re-arranged their FTP server, so update the SRC_URI to reflect the new
paths.
(From OE-Core rev: ee613f4130076ef981aa2d0cac839699e92efbcb)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Mesa needs wayland-scanner, which is provided by wayland-native.
(From OE-Core rev: 51269bdf974361a1d39d999ac2a363bbaec3baf8)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With the autodebug package generation logic, specifically setting FILES_${PN}-dbg
isn't needed in most cases, we can remove them.
(From OE-Core rev: 3ab59d49dd7c18e194b58d1248b4b87709b5a738)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This makes e.g. core-image-weston actually work out-of-the-box
on hardware that uses megadriver drivers.
(From OE-Core rev: 12c3f7b5501c0035f72c115fa2eac7aaad927057)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Where Signed-off-by statements have been added they were sourced from the
original commit where the author claims creation.
(From OE-Core rev: 3e6f57059d1a5343fe1432fba408ee3f33b4c2f7)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When building mesa without X11 enabled, and disabling dri package config,
the enforced "--enable-gbm" fails building mesa, because this feature
requires "--enable-dri", too - which has been disabled by package config.
Consequently, when gbm requires dri, --disable-dri causes in --disable-gbm,
which makes explicit --disable-gbm in case of --disable-dri redundant.
(From OE-Core rev: fee4a22c6919814bd541ab2cca9489e5ce3596b4)
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* The packages that depends on gtk+3 require any of distro features
from ${GTK3DISTROFEATURES}
* The packages that depends on virtual/egl, virtual/libgl ... require
distro feature 'opengl'
(From OE-Core rev: 3edf08b38b0af93cef0933b061349264dc86d54c)
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch fixes a deadlock that occurs between the main
thread and rendering threads of the sharedtex_mt demo.
(From OE-Core rev: f3566af923a9559fa77c1fb0cd22557afb724835)
Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The 'vg' support should depends on virtual/libopenvg. There is no
provider for libvg in OE-Core so this option seems untested being safe
to change.
(From OE-Core rev: 1bb1e73200003703545ac7ec77b6b4c3b28e4fae)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Removed openvg references in PACKAGECONFIG, FILES and PACKAGES since OpenVG
support was removed in mesa 10.6
* Tested with X11 :
* xf86-video-freedreno on IFC6410 and DragonBoard 410c
* softpipe on DragonBoard 410c
* using meta-qualcomm BSP
(From OE-Core rev: 8c7803683bee780f0bc8913cc32653ff173329b7)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Set glu_enabled when pkg-config detects GLU. This is needed so
that HAVE_GLU is properly set to enable the GLU based demos.
(From OE-Core rev: 72192d55cc6b213b6304dc805566c60a78d96b02)
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* 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>
ncurses have already provided clear,so rename it to clear.mesa-demos.
[ RB - check that clear exists before moving ]
(From OE-Core rev: a9c174fd4bfabbae00d947738b06e72d7809eab3)
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes warnings such as:
WARNING: mesa: invalid PACKAGECONFIG: r600
when building with the r600 configuration.
(From OE-Core rev: 430dd1437a4196c11973cf9ef0d2dad1f2063a7f)
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Among other things fixes a bug that prevents Weston from starting
on i965.
(From OE-Core rev: 943f6fdd0bc20060b5e120ad22f80cb8534153fd)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It requires libGL.so which is provided by mesa when x11 in
DISTRO_FEATURES.
(From OE-Core rev: 89ad0fb281d71404b311e2fefb3cfc6c6cad0ac0)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixed when no x11 in DISTRO_FEATURES:
checking for GL/glu.h... no
configure: error: GLU not found
The GL/glu.h is provided by libglu, and libglu requires libGL.so which
is provided by mesa, but mesa doesn't build out libGL.so without x11 in
DISTRO_FEATURES, so only enable glu when x11 in DISTRO_FEATURES.
(From OE-Core rev: 3905be16940ea642244935517f121a84e28aac0f)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Remove patches that are no longer needed
* git build depends on python module mako. Inherit pythonnative
for this
* source directory changed: default S is now correct in mesa recipe,
but still needs to be set in mesa-gl
(From OE-Core rev: b3035cac6f505fda2bea31da63ab381b104cfd2e)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* default value of PACKAGECONFIG is set from DISTRO_FEATURES,
but in the end we should respect what user sets in PACKAGECONFIG
(From OE-Core rev: 684eaa7f87d321c7965d1393cc5da2190c4acac5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
backport needed patches
add a patch to use _NP macros only on glibc
based linux and not on all linux
Change-Id: Ib43bec9d222856f8e7acb9f0143b406517f049c8
(From OE-Core rev: 7dcd8f532fef71e711bf11a00f0e246a36b6138a)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This forces it to be built first since many of the demos
require it. Resolves build failures such as the following
when certain demos are enabled (notably when PACKAGECONFIG
contains glut):
make[2]: *** No rule to make target `../util/libutil.la', needed by `copypix'. Stop.
(From OE-Core rev: 9e4b25893cc8e15e390b8f25545416ef431f0b88)
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without these changes mesa_git.bb can't be enabled as the
PREFERRED_VERSION due to build breakage.
(From OE-Core rev: 04f48ad3fab4e21a23c46b90f6a62269a1cf1ee7)
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The current substitution to package names is not correct, its original
purpose is: replace "mesa-" with "mesa-dri-", in which process the
"mesa" package is left out, this leads mesa package to announce to
conflict with itself, and therefore cause build failures when multilib
mesa are being added to rootfs.
Changing the replacement pattern to without a '-' suffix will fix it.
(From OE-Core rev: f02e0ae803b7a37b410c8487916331cdcae98cf3)
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
libdricore was removed and replaced with a megadriver with hardlinks from the
old driver names.
Add PACKAGECONFIG for DRI3 but disable by default as there are currently
regressions compared to DRI2.
License is unchanged.
(From OE-Core rev: 36c6909d4410e5ecb44800aafadd8593978e1b24)
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
glapi/gen needs the libxml2 Python module, but this isn't listed as a build
dependency.
(From OE-Core rev: 12414a65bfa9222be0fe0ab7ced2a02e1e5ed2ed)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use the "--with-system-data-files" when configuring mesa-demos
so that the data files in /usr/share/mesa-demos/ will be properly
located at run time.
Copy some additional data files into the target filesystem.
(From OE-Core rev: d602264267f49bf72704b6c5ab1247b4027313bb)
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use STAGING_EXECPREFIXDIR to specify the location of glut
header files and libs rather than STAGING_LIBDIR.
Also revert the previous unneeded change to glut.patch.
(From OE-Core rev: f38c1846184722180d9091a7a5c1e6e20eed7f2c)
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Also remove unused filespath addition.
(From OE-Core rev: de37e4d7f995a0032d016c621c35ef1f79daa8ae)
Signed-off-by: Petter Mabäcker <petter@technux.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* License is still MIT
* removed patches were already merged or
another solution was backported.
(From OE-Core rev: 263e654e5d28fa7f6b0c8cc23f57a31448e88a40)
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
libudev is asked by enable-gbm, not enable_dri, and enable-gbm always is yes;
We can find the dependency from configure.ac codes:
if test "x$enable_gbm" = xyes; then
SRC_DIRS="$SRC_DIRS gbm"
PKG_CHECK_MODULES([LIBUDEV], [libudev], [],
AC_MSG_ERROR([gbm needs udev]))
if test "x$enable_dri" = xyes; then
GBM_BACKEND_DIRS="$GBM_BACKEND_DIRS dri"
if test "x$enable_shared_glapi" = xno; then
AC_MSG_ERROR([gbm_dri requires --enable-shared-glapi])
fi
fi
fi
(From OE-Core rev: 981f7e5b088ecd813e43291d72f8995f17dbea8e)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- This solves a conflict between mesa-gl and a custom library,
both providing a libgles2 package, although being disabled
in mesa-gl.
(From OE-Core rev: c9148c89532f0989771e4846259f1f10a924bc68)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Saul Wold <sgw@linux.intel.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>
