diff options
| author | Drew Moseley <drew_moseley@mentor.com> | 2015-07-21 08:19:08 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-23 08:48:40 +0100 |
| commit | 50b51863317da8396c4a7751a5ae68db6e1497ea (patch) | |
| tree | a7901a501cff20f5e2d5f9ea986ad64a082d9797 /meta/recipes-graphics/mesa/mesa-demos | |
| parent | 3b7961f995b286732fd2a2aaf3b921c6291dd5ae (diff) | |
| download | poky-50b51863317da8396c4a7751a5ae68db6e1497ea.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa-demos')
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch index 4b07193a7f..6b58c2b776 100644 --- a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch +++ b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch | |||
| @@ -66,7 +66,7 @@ index 9445424..bc4c8d1 100644 | |||
| 66 | -DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" | 66 | -DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" |
| 67 | -DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" | 67 | -DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" |
| 68 | +if test "x$enable_glu" = xyes; then | 68 | +if test "x$enable_glu" = xyes; then |
| 69 | + PKG_CHECK_MODULES(GLU, [glu], [], | 69 | + PKG_CHECK_MODULES(GLU, [glu], [glu_enabled=yes], |
| 70 | + [AC_CHECK_HEADER([GL/glu.h], | 70 | + [AC_CHECK_HEADER([GL/glu.h], |
| 71 | + [], | 71 | + [], |
| 72 | + AC_MSG_ERROR([GLU not found])) | 72 | + AC_MSG_ERROR([GLU not found])) |