Commit Graph

19 Commits

Author SHA1 Message Date
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
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
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 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
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
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
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
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
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
Drew Moseley c989c6f3c2 mesa-demos: Specify the lib dir properly.
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>
2014-05-13 19:32:06 +01:00
Drew Moseley 76fd64f2e5 mesa-demos: Specify the lib dir to locate glut libraries
(From OE-Core rev: 55ecbebdf13ef46f0fb4d87ef11651fe692be33d)

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-05-11 12:27:23 +01:00
Saul Wold f1771b5bfa mesa-demos: Update to 8.1.0
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>
2013-04-29 14:45:09 +01:00
Ross Burton f5c9b4813c mesa-demos: fix build with non-Mesa GL stacks
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>
2013-04-12 17:00:45 +01: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 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
Yu Ke 2ce14da681 Upstream-Status update for several recipes
- modutils
 - module-init-tools
 - libacpi
 - keymaps
 - initscripts
 - console-tools
 - mesa-demos
 - xserver-xf86-lite

(From OE-Core rev: 46ea0444276c67b1489004e959bcf34970cd6c60)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-17 15:14:43 +01:00
Nitin A Kamble 4816a02db4 mesa-demos: fix build issue with gcc dso linking change
All the libraries needs to be specified explicitely with the new gcc dso
linking change patch. This was causing build errors for this
recipe. Specifying the libpthread library explicitely for linking to work
without errors.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
2011-02-07 16:52:41 +00:00