Commit Graph

207 Commits

Author SHA1 Message Date
Khem Raj d4040da8bc mesa: Fix build when cross compiling with clang
(From OE-Core rev: 69e9b190ff0e8b963bbaea8365917218cf3c2558)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-08-04 15:22:21 +01:00
Jussi Kukkonen d18a28c09a mesa: Upgrade 11.2.2 -> 12.0.1
Massive mesa upgrade (OpenGL 4.3, GLVND support, vulkan driver
for intel etc), although many new things are disabled by default.

License file change does not change the actual licenses.

piglit results (with piglit update on ML) on an old NUC with Intel
HD5000 for reference:
       pass:   33972
       fail:     306
      crash:       2
       skip:   30857
       warn:       7
      total:   65144

(From OE-Core rev: 6da724dc9cb72e77aa8b1613c3ad71fefc81903f)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-20 10:28:52 +01:00
Jussi Kukkonen 00191b802d mesa-demos: Require X11 distro feature
Mesa-demos theoretically does not require X11 (apart from xdemos/)
but reality is that every other binary requires glut. So:
 * 'non-glut' part of mesa-demos requires X11
 * current freeglut recipe also depends on X11

There is apparently wayland support in freeglut now: This recipe
should be modified when meta-oe freeglut recipe has that feature.

The change became necessary now because mesa no longer mistakenly
installs GL files when X11 is disabled (and mesa-demos configure
currently requires GL).

(From OE-Core rev: d02a3a745fbb7b534f22de861e7a43e7dacc7970)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-20 10:28:52 +01:00
Jussi Kukkonen b5fe46044e mesa-demos: Upgrade 8.2.0 -> 8.3.0
Drop patches included in upstream and the EGL_MESA_screen_surface
extension fixes as the relevant code was removed.

Rebase other patches.

(From OE-Core rev: 747762233ee21eaaf480f19b85cd1d6543c7ca51)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-05-25 07:50:17 +01:00
Herve Jourdain 599933cfe1 mesa: fix mesa_populate_packages() when dri is disabled
When compiling mesa, if dri is disabled in PACKAGECONFIG, or if the list of DRI
drivers is empty, it will cause populate_package to fail, because it can't find
- rightfully - the directory for the DRI drivers.  This patch checks that the
directory indeed exists before trying to get a list of the files in it

[ use oe.path.join instead of + - RB ]

(From OE-Core rev: 7e96806d1282865761fcc047abcb72970279d82d)

Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-05-20 10:20:55 +01:00
Awais Belal 982b63129e mesa-demos: provide option for disabling GLX demos
There are platforms that default to EGL only configurations
in which case the GLX applications are not required
at all. Allow the user to control generation of these
demos as needed through a configure switch.

(From OE-Core rev: 226492af41234dec47066d576d0de78fd09a4ca8)

Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-05-20 10:20:54 +01:00
Tom Hochstein 3da513ba73 mesa-demos: OpenVG demos with single frame need eglSwapBuffer
sp and text demos rendering single frame. to display the
single frame rendered needed a eglSwapBuffer to diplay to window.
Hence added eglutPostRedisplay to display the frame.

(From OE-Core rev: 894885ab5de473abf860b8444e591fa2ec804a14)

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-05-17 14:43:29 +01:00
Jussi Kukkonen c2ceef3973 mesa: Upgrade 11.1.1 -> 11.2.2
(From OE-Core rev: 112483b52151f0194f247f51d2397f4a1e1a94b7)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-05-13 13:41:26 +01:00
Ross Burton 2329274164 mesa: add PACKAGECONFIG for gbm
gbm is an optional library and some environments (for example, mesa-gl where
there are separate drivers that provide libgbm) may not want to build it.

(From OE-Core rev: bb5265a31587e4a4d4df4d42f343054d6c224e24)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-05-06 10:31:16 +01:00
Awais Belal b851cb0a2e mesa-demos: remove demos using obsolete screen surface
The mesa surface EGL_MESA_screen_surface was obsoleted
and then dropped from mesa some time ago. Drop demos
depending on this.

(From OE-Core rev: 061c53c86e483c65f5cd350d6587dbae53c4ee75)

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>
2016-05-06 10:31:15 +01:00
Ross Burton 692f9d416e mesa-gl: add missing MESA_CRYPTO to PACKAGECONFIG
Otherwise the build can fail or there is a floating dependency on whatever SSL
library Mesa can find.

(From OE-Core rev: 8ce5d90044bd371d132312e85197ee262855ad29)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-05-06 10:31:14 +01:00
Khem Raj 3354878d32 mesa: Fix build on musl
It assumes __GLIBC__ where it could actually check for linux
and include non-glibc C library implementations like musl which
provide __BYTE_ORDER macros as well when computing system endianness

(From OE-Core rev: b759afa08e339126c4e8b7e2aa87ed0c9f4b5d0d)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-28 11:33:06 +00:00
Andreas Müller 951ce184eb mesa: add missing space to RRECOMMENDS append
Fixes errors as:

| Missing or unbuildable dependency chain was: ['mesa-megadrivermesa-megadriver']

(From OE-Core rev: 25ca768112f37a7fd8648f0d983e856294863460)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-26 17:16:14 +00:00
Nicolas Dechesne 34798fa0c5 mesa: upgrade 10.6.3 -> 11.1.1
* update SRC_URI and checksum.
* add PACKAGECONFIG to offer choice of crypto implementation (for sha1 functions)
* use libcrypto by default. In upstream commit a24bdce4, support for
  SHA-1 was copied from xserver repo, so let's use the same default for
  --with-sha1 option that we use in xserver recipe in OE core.

(From OE-Core rev: 897e464cf316e668717c1aed146d0a9adb183986)

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-11 12:27:47 +00:00
Ross Burton 2458f4138e mesa: update SRC_URI
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>
2016-01-24 09:40:21 +00:00
Ross Burton b963efbc9c mesa: add missing wayland-native build dependency
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>
2016-01-22 17:20:50 +00:00
Richard Purdie e0890b662e meta: Drop now pointless manual -dbg packaging
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>
2015-12-16 11:56:30 +00:00
Jussi Kukkonen 872e153410 mesa: Make gl libraries RRECOMMEND mesa-megadriver
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>
2015-12-01 21:32:08 +00:00
Ross Burton 4b38be689f meta: add some missing Upstream-Status tags to patches
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>
2015-11-25 07:50:32 +00:00
Jens Rehsack cf972f9abf gbm: Fix "configure: error: gbm requires --enable-dri"
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>
2015-11-16 11:39:32 +00:00
Wenzong Fan d3da00648c recipes: add distro_features_check for some packages
* 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>
2015-11-16 11:39:27 +00:00
Awais Belal 64b5e3e0a2 mesa-demos: fix deadlock in sharedtex_mt
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>
2015-10-27 07:24:27 +00:00
Otavio Salvador 627d183a89 mesa-demos: Fix dependency for 'vg' support
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>
2015-08-11 09:28:48 -07:00
Nicolas Dechesne 34b59db3e6 mesa: upgrade 10.5.8 -> 10.6.3
* 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>
2015-08-10 12:40:30 -07:00
Drew Moseley 50b5186331 mesa-demos: Fix building demos which require GLU.
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>
2015-07-23 08:48:40 +01:00
Martin Jansa 8bffb5a88b 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:
  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>
2015-07-16 15:09:19 +01:00
Li xin 8a0cb22f85 mesa-demos: rename clear
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>
2015-07-08 00:01:22 +01:00
Drew Moseley fa0845f2ad mesa: Add blank r600 PACKAGECONFIG
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>
2015-07-02 23:08:40 +01:00
Jussi Kukkonen c11d4c9482 mesa: Upgrade 10.5.6 -> 10.5.8
(From OE-Core rev: 8c61da2223a113381d57688e540fab2287244cca)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-06-27 22:42:54 +01:00
Jussi Kukkonen 597335308f mesa: Upgrade 10.5.4 -> 10.5.6
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>
2015-05-30 22:26:13 +01:00
Robert Yang 45c008b3cb libglu: add x11 to REQUIRED_DISTRO_FEATURES
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>
2015-05-14 11:43:57 +01:00
Robert Yang 5f21aa0776 mesa-demos: only enable glu when x11 in DISTRO_FEATURES
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>
2015-05-14 11:43:57 +01:00
Robert Yang d5f7e09a89 mesa: fix do_install_append
"ifdef MESA_EGL_NO_X11_HEADERS" -> "if defined(MESA_EGL_NO_X11_HEADERS)"

(From OE-Core rev: 3a464d67b60f70b865f7db768e7edc53e40ff450)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-05-14 11:43:57 +01:00
Jussi Kukkonen f2db690d8d mesa: Upgrade 10.4.4 -> 10.5.4
* 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>
2015-04-30 23:04:12 +01:00
Martin Jansa e346628604 mesa: respect x11 in PACKAGECONFIG not DISTRO_FEATURES
* 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>
2015-04-28 07:56:55 +01:00
Khem Raj bcd9f0578f mesa: Fix building with musl
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>
2015-04-10 18:10:27 +01:00
Andre McCurdy 53f3f61a3c mesa: update 10.4.3 -> 10.4.4
(From OE-Core rev: 2665bedf3b38c6d03d991b91a7b150601572b594)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-02-14 08:40:58 +00:00
Andre McCurdy efd0e860a3 mesa: update --with-llvm-shared-libs configure option
As per the Mesa 10.2 release notes, "--with-llvm-shared-libs"
has been renamed to "--enable-llvm-shared-libs".

  http://www.mesa3d.org/relnotes/10.2.html

(From OE-Core rev: 34fe51e9b381e99d664a7e567a3267bcee991084)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-02-14 08:40:58 +00:00
Pengyu Ma 16a0178424 mesa: Upgrade to 10.4.3
flags for EGL and GBM Gallium had been removed in 10.4,
so remove these flags, files or packages.

(From OE-Core rev: ba079975fa984f53fde5b4e8131d0f3877323e6c)

Signed-off-by: Pengyu Ma <pengyu.ma@windriver.com>
Tested-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-02-08 08:00:26 +00:00
Nicolas Dechesne 94e14422f6 mesa: add PACKAGECONFIG support for gallium XA state tracker
(From OE-Core rev: d1cf188783ea5ae9013996a208f60960e3e7a6e7)

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-12-19 18:08:02 +00:00
Aníbal Limón 993989f033 mesa: Upgrade to 10.3.4.
Remove 0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA,
0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch and
0006-fix-out-of-tree-egl.patch are already in upstream.

(From OE-Core rev: 929dc6e581a94b45e6d41b8a596e76f4c2b078ee)

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-12-11 11:34:55 +00:00
Drew Moseley 0935937969 mesa-demos: Move util to the front of the SUBDIRS variable.
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>
2014-12-05 18:01:06 +00:00
Randy Witt 6bc86e0c57 mesa_git.bb: Fix fetch and license errors.
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>
2014-10-11 08:11:02 +01:00
Chong Lu a140514f97 mesa: fix Multilib QA Issue
This patch fixed warning:
WARNING: Multilib QA Issue: lib32-mesa package lib32-mesa-megadriver - suspicious values
'mesa-driver-swrast mesa-driver-nouveau-vieux mesa-driver-r200 mesa-driver-i915 mesa-driver-radeon mesa-driver-i965' in RPROVIDES
WARNING: Multilib QA Issue: lib32-mesa package lib32-mesa-megadriver - suspicious values
'mesa-driver-swrast mesa-driver-nouveau-vieux mesa-driver-r200 mesa-driver-i915 mesa-driver-radeon mesa-driver-i965' in RREPLACES
WARNING: Multilib QA Issue: lib32-mesa package lib32-mesa-megadriver - suspicious values
'mesa-driver-swrast mesa-driver-nouveau-vieux mesa-driver-r200 mesa-driver-i915 mesa-driver-radeon mesa-driver-i965' in RCONFLICTS

(From OE-Core rev: 95f16f4bba660f0a6108fbbc98ad9caf69e6036b)

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-23 09:26:13 +01:00
Martin Jansa 7ff489d32e mesa-demos: upgrade to 8.2.0 and allow building without GLEW/GLU
(From OE-Core rev: c58d3cb308e7e6fc3bad120019f257bf3834fa15)

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>
2014-08-02 09:26:17 +01:00
Ming Liu b2aa82c482 mesa.inc: remove '-' suffix in substitution of package names
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>
2014-06-24 19:54:11 +01:00
Valentin Popa 0db73b47ea mesa: upgrade to 10.1.3
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>
2014-06-10 17:11:56 +01:00
Ross Burton 0219124601 mesa: add build-dependency on libxml2-native
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>
2014-06-10 17:11:56 +01:00
Drew Moseley c0a910b1b9 mesa-demos: Use DEMOS_DATA_DIR.
Modify mesa demo apps to respect the DEMOS_DATA_DIR
configuration parameter for locating data files.

(From OE-Core rev: a6a6cd089352157d35a8730e37153ce9df62ec01)

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>
2014-06-06 09:26:03 +01:00
Drew Moseley 65a8c4bb7c mesa-demos: Add missing data files.
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>
2014-06-06 09:26:03 +01:00