diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-11-12 15:03:28 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-12 22:32:08 +0000 |
| commit | 7e1e3066e37a458b21294e1f5cfc3ed96efd5c7c (patch) | |
| tree | 5b4d2e1de37fdc633e99e9e9765b14f09e9b9f20 /meta/recipes-graphics/mesa/mesa-demos | |
| parent | fe16cbc6ed42c8764ac25417b72668d55f573e86 (diff) | |
| download | poky-7e1e3066e37a458b21294e1f5cfc3ed96efd5c7c.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa-demos')
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-demos/glut.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos/glut.patch b/meta/recipes-graphics/mesa/mesa-demos/glut.patch new file mode 100644 index 0000000000..84b6d4f7f3 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-demos/glut.patch | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | Correctly implement with AC_WITH(glut) so that --without-glut works. | ||
| 2 | |||
| 3 | Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57013] | ||
| 4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 5 | |||
| 6 | Index: mesa-demos-8.0.1/configure.ac | ||
| 7 | =================================================================== | ||
| 8 | --- mesa-demos-8.0.1.orig/configure.ac 2010-07-13 19:52:41.000000000 +0100 | ||
| 9 | +++ mesa-demos-8.0.1/configure.ac 2012-11-12 12:49:54.940054571 +0000 | ||
| 10 | @@ -65,21 +65,25 @@ | ||
| 11 | DEMO_LIBS="$DEMO_LIBS $GL_LIBS" | ||
| 12 | |||
| 13 | dnl Check for GLUT | ||
| 14 | -GLUT_CFLAGS="" | ||
| 15 | -GLUT_LIBS=-lglut | ||
| 16 | -glut_enabled=yes | ||
| 17 | +glut_enabled=no | ||
| 18 | AC_ARG_WITH([glut], | ||
| 19 | [AS_HELP_STRING([--with-glut=DIR], | ||
| 20 | [glut install directory])], | ||
| 21 | [GLUT_CFLAGS="-I$withval/include" | ||
| 22 | - GLUT_LIBS="-L$withval/lib -lglut"]) | ||
| 23 | -AC_CHECK_HEADER([GL/glut.h], | ||
| 24 | - [], | ||
| 25 | - [glut_enabled=no]) | ||
| 26 | -AC_CHECK_LIB([glut], | ||
| 27 | - [glutInit], | ||
| 28 | - [], | ||
| 29 | - [glut_enabled=no]) | ||
| 30 | + GLUT_LIBS="-L$withval/lib -lglut"], | ||
| 31 | + [GLUT_CFLAGS="" | ||
| 32 | + GLUT_LIBS="-lglut"] | ||
| 33 | + ) | ||
| 34 | +AS_IF([test "x$with_glut" != xno], | ||
| 35 | + [AC_CHECK_HEADER([GL/glut.h], | ||
| 36 | + [], | ||
| 37 | + [glut_enabled=no]) | ||
| 38 | + AC_CHECK_LIB([glut], | ||
| 39 | + [glutInit], | ||
| 40 | + [], | ||
| 41 | + [glut_enabled=no]) | ||
| 42 | + glut_enabled=yes | ||
| 43 | +]) | ||
| 44 | |||
| 45 | GLEW_CFLAGS="" | ||
| 46 | GLEW_LIBS="-lGLEW" | ||