Commit Graph

106 Commits

Author SHA1 Message Date
Alexandru DAMIAN 1e3372bdd1 mesa-dri: enable the wayland-egl platform
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>
2013-01-18 13:28:04 +00:00
Ross Burton 909b3bee33 mesa: bump to 9.0.1
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>
2013-01-10 23:43:16 +00:00
Ross Burton 02cb80816e mesa: remove dependency on mesa-dri in mesa-dri-dev
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>
2012-12-17 17:24:55 +00:00
Ross Burton 14f4cfcc34 mesa-dri-git: remove patch that doesn't apply to 9.x
(From OE-Core rev: 7d7f199806bee016553d1046a53bd55ab3a9e609)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-14 08:53:41 +00:00
Ross Burton 70593a1327 mesa: package osmesa.pc
(From OE-Core rev: 3281e272dd6687575d1d1ccc7f6d0ae844369dd6)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-13 15:18:47 +00:00
Ross Burton 66d92cb3ee mesa-dri: upgrade -git version to current master
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>
2012-12-11 15:54:38 +00:00
Ross Burton a63dc47e56 mesa: upgrade to 8.0.5
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>
2012-12-11 15:54:38 +00:00
Ross Burton cf94122286 mesa: common packaging cleanup
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>
2012-12-11 15:54:38 +00:00
Ross Burton 6208572a7c mesa-dri: add correct RPROVIDES for the -dev packages
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>
2012-11-21 09:10:02 +00:00
Ross Burton d9fe5c5dc0 mesa: default to enabling EGL and GLES
Even on systems where Mesa has no hardware support, building the software
renderers is useful for build testing and limited functionality.

(From OE-Core rev: e79987bc4bac1d739f92790f8e9840cd02f073d3)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-20 15:31:54 +00:00
Ross Burton 7e0efe18e5 mesa: add -mesa suffix to GL packages, RPROVIDE their generic names
When Debian-renaming, all packages that provide GL libraries get renamed to the
same name, and it's entirley possible for a feed to have multiple GL libraries
in.  This obviously creates conflicts.

Resolve this for Mesa by forcing the package names to be of the form libgl-mesa,
and RPROVIDE libgl.

(From OE-Core rev: 64c77bf395310e55b4d8e0ec754fa19e9034ab35)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-20 15:31:54 +00:00
Ross Burton 7e1e3066e3 mesa-demos: fix --with-glut check
The GLUT check was automatic and couldn't be disabled, so mesa-demos would gain
a GLUT dependency if it was present when built.

So, fix configure.ac so that --without-glut works as expected.

(From OE-Core rev: fa7fb44d1ca2b8a57509806bde19672c68ef157d)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-12 22:32:08 +00:00
Ross Burton 1815a99f9f mesa: remove python2 detection hack
Our python-native is 2.7.3 which ships python2, and we've been patching it in to
earlier versions since September 2011.

(From OE-Core rev: 1961ea1493caf5fe2959db2a11831a4a5a17eaeb)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-12 13:36:39 +00:00
Daniel Stone 662a445b30 mesa: Build separate GLU library
Mesa has removed GLU from the core tree upstream, so remove it from the
Mesa build and add the separate tarball as a new recipe.

(From OE-Core rev: 4395691a44b198ba0b9a969cbade669e8de07a4f)

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-02 16:18:25 +00:00
Richard Purdie fa471acc00 qemugl: Remove since support for it was removed from qemu
(From OE-Core rev: 0195a08f77fe0e01b2d7548ccffeaf89d2d780e1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-24 12:50:44 +01:00
Martin Jansa fadb407901 PACKAGES_DYNAMIC: use += instead of = in most cases
* to keep ${PN}-locale from
  bitbake.conf:PACKAGES_DYNAMIC = "^${PN}-locale-.*"

(From OE-Core rev: 73252b16b501c0986b0ca0895e4534895a9ba3db)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-19 18:02:26 +01:00
Martin Jansa 33b31640bf PACKAGES_DYNAMIC: use regexp not glob
* bitbake uses PACKAGES_DYNAMIC as regexp
  ^ could make matching faster (and it will be more clear that we're expecting regexp not glob)
  * made all those last '-' optional, use .* (or nothing)

(From OE-Core rev: 2f3ebdfa5f42dae51063b043cc4b0fbe20b40064)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-19 18:02:26 +01:00
Ross Burton e7ee5be072 mesa: remove libegl-dbg, put all debugging into mesa-dri-dbg
(From OE-Core rev: c914495e1431ad56fcd81460fa4f675be3b4be3b)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:35 +01:00
Ross Burton 9cc8a94fcc mesa: remove mesa-dri dependency in mesa-dri-dev
mesa-dri is empty, so instead of allowing an empty package, remove the default
dependency on mesa-dri and let the system not generate mesa-dri.

(From OE-Core rev: 5d6596321a996278ffbaa111247367ec9e50d721)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-18 12:13:35 +01:00
Ross Burton 680ffe36f0 mesa-dri: remove DEFAULT_PREFERENCE, this is the preferred now
(From OE-Core rev: 438852881a9450b2686e3f61d4efe260fa4b2c94)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:51 +01:00
Ross Burton a6a18d4458 mesa-xlib: remove, it serves no useful purpose
(From OE-Core rev: 7a815ca21f57feb4706a7bb0656cbabd74bc873f)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:50 +01:00
Richard Purdie ad23395cd1 nativesdk: Switch to using nativesdk as a prefix, not a suffix
As discussed on the mailing lists, using a suffix to package names is
hard and has lead to many recipes having to do PKGSUFFIX games. Its
looking extremely hard to scale nativesdk much further without hacking
many recipes.

By comparison, using a prefix like multilib does works much better and
doesn't involve "hacking" as many recipes. This change converts nativesdk
to use a prefix using the existing multilib infrastructure.

(From OE-Core rev: 81813c0e322dc04ce4b069117188d8a54dfddb8c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-02 05:52:06 -07:00
Ross Burton 3b05a9beff mesa: clean up PACKAGECONFIG
Use machine overrides instead of machine features.

(From OE-Core rev: 821a38d71d7e15f5871f44a3ee08268d05ef610e)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-23 11:04:41 +01:00
Ross Burton 05b343ee4b mesa: enable EGL, with DRM and X11 platforms
Patch originally by Damien Lespiau <damien.lespiau@intel.com>.

(From OE-Core rev: 03136ebc529dbc82f2db14055e124114da7e84b3)

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>
2012-08-19 10:45:57 +01:00
Ross Burton 7477153dd8 mesa: respect x11 DISTRO_FEATURE
Patch originally by Damien Lespiau <damien.lespiau@intel.com>.

(From OE-Core rev: d3e60b835c5abcf2345e761027aa520409c19efc)

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>
2012-08-19 10:45:57 +01:00
Ross Burton 25db6dd7fc mesa-demos: fix GLES2 build
(From OE-Core rev: 58047dcf547b582211f84c6f24c21cc1aa895f1e)

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>
2012-08-19 10:45:57 +01:00
Ross Burton aef0371eba mesa: enable GLES v1 and v2
Patch originally by Damien Lespiau <damien.lespiau@intel.com>.

(From OE-Core rev: d755fff9c9939cebab9c488c7b14de0a57235d3c)

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>
2012-08-19 10:45:56 +01:00
Damien Lespiau eb768ce0b9 mesa: Add a mesa-dri-glsl-native_git recipe
If you have both a fixed version of mesa and a git version of mesa, you
also need the mesa-dri-glsl-native recipe for each versions. The code
generation that happens natively has to be done with the tool extracted
from the version you are compiling.

(From OE-Core rev: 63667a138616c551cedbd10d4ed87172fcf9dfff)

Signed-off-by: Damien Lespiau <damien.lespiau@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>
2012-08-19 10:45:56 +01:00
Damien Lespiau 2a88d4df8e mesa: Use 'require' instead of 'include'
These include files are really required, not optional.

(From OE-Core rev: 1aa6c4a083e406de0119f92e9654068d6cc2e4de)

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:52 +01:00
Damien Lespiau c5084487eb mesa: Update to 8.0.4 (latest stable version)
- The license file has changed, but the project still has the same
  license
- Patches have been rebased on top of the 8.0 branch. crossfix.patch
  and crossfix-mklib.patch have been merged as they address the same
  problem

(From OE-Core rev: e4039eb74b20e96d4b8837cd58cf2d13d091e1ad)

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:52 +01:00
Ross Burton abfa907b4c mesa: enable the Graphic Buffer Manager library
(From OE-Core rev: be882417cf432fe79a843cea4439503f286206cf)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:52 +01:00
Ross Burton 8b4015a52b mesa: add --enable-shared-glapi, and package it in libglapi
(From OE-Core rev: d856f4c18425b9e3e5a0898d7f29cffc1998ca12)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:52 +01:00
Ross Burton cf247a4075 mesa: move glu.pc to libglu-dev
(From OE-Core rev: 98975edaff2cc4cc417dee2c7c530e602ff2e4cc)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:51 +01:00
Ross Burton e35d9ff065 mesa: format the packages list nicely
(From OE-Core rev: ca9c3f57c72f443b9efe5f0bd5cb9a7bb169ed30)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:51 +01:00
Ross Burton efbf461c90 mesa: no need to depend on python-native, the class does that
(From OE-Core rev: dd2a11fa262ced8e9f06413e69bbe1cb1b3e538b)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-06 15:18:51 +01:00
Morgan Little 9e8129ee44 mesa-common: Update for python-native changes
Add pythonnative to the inherits list

(From OE-Core rev: 003dad555c7c3df61000bf7f712abb4050f3b4e5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-22 11:42:21 +01:00
Richard Purdie 73cf0335c4 Remove a number of unneeded import os/bb calls
The bb and os modules are always imported so having these extra import calls
are a waste of space/execution time. They also set a bad example for people
copy and pasting code so clean them up.

(From OE-Core rev: 7d674820958be3a7051ea619effe1a6061d9cbe2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 12:24:50 +01:00
Richard Purdie bfd279de32 Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 10:24:50 +01:00
Christopher Larson 67228abee6 mesa: add missing flex-native/bison-native deps
A quick glance at configure.ac shows that both are required to build mesa, but
we were relying on their being built implicitly via other recipes in the
dependency chain. Make it explicit.

(From OE-Core rev: 4fb71999fad9e844850831caf2431ee8731787db)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-03 15:48:00 +01:00
Richard Purdie c1c9144f67 mesa: Fix mklibs patch to simply remove troublesome uname usage
Without this we started seeing the -mx32 flag being passed to the compiler
for things like arm builds which makes no sense.

(From OE-Core rev: 288b7a9d0e6093f85e4a1d3e34d4332b9c43b47b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-30 11:37:28 +01:00
Scott Garman abddce33ac qemugl: make postinst run at first boot
The previous postinst script was not working for images which use
RPM because do_rootfs could allow qemugl to be installed after
libgl1, and the postinst needs to run after libgl1 is installed.

Hence, it's being changed to run at first boot instead of during
do_rootfs.

(From OE-Core rev: dc0fe3fbf9ca862c1d0d90468e6da326f58e3b41)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-18 00:22:56 +01:00
Joshua Lock 73e3fd88b4 mesa-common: package gl.pc in libgl-dev
gl.pc should be packaged in libgl-dev not the mesa-dev package

Fixes [YOCTO #2059]

(From OE-Core rev: d9d4fe9885e398df2062b3f2aed3fc274c656736)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-10 13:31:58 +01:00
Zhai Edwin 7161e47fd1 qemugl: Hide some GLX extensions by default
Exporting these extensions make guest call some missing GLX API then crash.
It's hacky to implement these APIs, so hide these extensions as fix.

[YOCTO #1927] got fixed

(From OE-Core rev: a9e4b94f799e41a2b06f833a8b411ebee3939430)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-19 14:37:38 +00:00
Richard Purdie 48633e5dd5 mesa-dri-glsl-native: Avoid error when running configure a second time
This avoids the error:

ln: creating symbolic link `/media/data1/build1/poky/build/tmp/work/x86_64-linux/mesa-dri-glsl-native-7.11-r0/Mesa-7.11/src/glsl//../../configs/current': File exists

(From OE-Core rev: 7871772c74e65ef472c5bf3776e4b3b30308bd5d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-12 17:45:41 +00:00
Richard Purdie 06f2f8ce0a meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)
Using "1" with getVar is bad coding style and "True" is preferred.
This patch is a sed over the meta directory of the form:

sed \
 -e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \
 -e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \
 -i `grep -ril getVar *`

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05 10:22:56 -08:00
Zhai Edwin 93d157b724 qemugl: Fix gl apps failure on qemu-x86-64
Extend commit 028968 to qemu x86-64, where stack disorder happen due to
register handling via push/pop.

[YOCTO #1927] fixed

(From OE-Core rev: 70c224d80c2330cbb0fa8213b0c0d5a1c87459f6)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-28 12:27:53 +00:00
Nitin A Kamble 8939bdd1e4 misc patches: fix patch headers
These patches were marked by "UpstreamStatus:" line, fix it to use
"Upstream-Status:" instead.

(From OE-Core rev: b33b373c9a33fe0ff51104c96d1e5b105efc63ed)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-03 12:14:33 +00:00
H.J. Lu 3424702c09 mesa: Properly create share library for x32
Also pass -mx32 parameter to gcc to create create share library
for x32.

Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-Off-By: H.J. Lu <hjl.tools@gmail.com>

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-12 21:50:18 +00:00
Nitin A Kamble a41df69a11 mesa-dri, mesa-xlib: fix compilation with x32 toolchain
Add support for building with x32 toolchain.

Simplified the use of SRC_URI & S vars across multiple files.

(From OE-Core rev: 145de26a7415357a08bcdbc0307b5a60e2ad1420)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-05 22:47:07 +00:00
Richard Purdie e5b9ac3b71 mesa-xlib: Bump PR to resolve various package upgarde conflicts
(From OE-Core rev: b0cf83def3c621221a225787759ff8ca5a501a29)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-05 16:46:18 +00:00