summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-11-12 15:03:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-12 22:32:08 +0000
commit7e1e3066e37a458b21294e1f5cfc3ed96efd5c7c (patch)
tree5b4d2e1de37fdc633e99e9e9765b14f09e9b9f20 /meta
parentfe16cbc6ed42c8764ac25417b72668d55f573e86 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/glut.patch46
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb10
2 files changed, 52 insertions, 4 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 @@
1Correctly implement with AC_WITH(glut) so that --without-glut works.
2
3Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57013]
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6Index: 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"
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb b/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
index 1d16bfc392..0511734a4a 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
@@ -11,13 +11,15 @@ LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=9142
11 11
12DEPENDS = "virtual/libx11 virtual/libgl glew" 12DEPENDS = "virtual/libx11 virtual/libgl glew"
13 13
14PR = "r3" 14PR = "r4"
15 15
16SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \ 16SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \
17 file://dso_linking_change_build_fix.patch \ 17 file://dso_linking_change_build_fix.patch \
18 file://gles2-info.patch" 18 file://gles2-info.patch \
19 file://glut.patch"
20SRC_URI[md5sum] = "320c2a4b6edc6faba35d9cb1e2a30bf4"
21SRC_URI[sha256sum] = "4bc7f2b20d17e3eebfec288f2367a435cd2db71fc5ac9ece2c14827e290d77d1"
19 22
20inherit autotools pkgconfig 23inherit autotools pkgconfig
21 24
22SRC_URI[md5sum] = "320c2a4b6edc6faba35d9cb1e2a30bf4" 25EXTRA_OECONF = "--without-glut"
23SRC_URI[sha256sum] = "4bc7f2b20d17e3eebfec288f2367a435cd2db71fc5ac9ece2c14827e290d77d1"