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>
Add some data files that are present in the git repository:
http://cgit.freedesktop.org/mesa/demos/tree/?id=mesa-demos-8.1.0
but not in the release tarball
ftp://ftp.freedesktop.org/pub/mesa/demos/8.1.0/mesa-demos-8.1.0.tar.bz2
(From OE-Core rev: 347b25be7136ec639926ed7b8cfa6da55f00f17c)
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 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>
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>
Ming Liu
Valentin Popa
Ross Burton
Drew Moseley
Petter Mabäcker
Otavio Salvador
Robert Yang
Chong Lu
Roy Li
Andreas Oberritter
Jonathan Liu
Jackie Huang
Martin Jansa
Saul Wold