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>
This commit is contained in:
parent
fe16cbc6ed
commit
7e1e3066e3
|
@ -0,0 +1,46 @@
|
|||
Correctly implement with AC_WITH(glut) so that --without-glut works.
|
||||
|
||||
Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57013]
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
Index: mesa-demos-8.0.1/configure.ac
|
||||
===================================================================
|
||||
--- mesa-demos-8.0.1.orig/configure.ac 2010-07-13 19:52:41.000000000 +0100
|
||||
+++ mesa-demos-8.0.1/configure.ac 2012-11-12 12:49:54.940054571 +0000
|
||||
@@ -65,21 +65,25 @@
|
||||
DEMO_LIBS="$DEMO_LIBS $GL_LIBS"
|
||||
|
||||
dnl Check for GLUT
|
||||
-GLUT_CFLAGS=""
|
||||
-GLUT_LIBS=-lglut
|
||||
-glut_enabled=yes
|
||||
+glut_enabled=no
|
||||
AC_ARG_WITH([glut],
|
||||
[AS_HELP_STRING([--with-glut=DIR],
|
||||
[glut install directory])],
|
||||
[GLUT_CFLAGS="-I$withval/include"
|
||||
- GLUT_LIBS="-L$withval/lib -lglut"])
|
||||
-AC_CHECK_HEADER([GL/glut.h],
|
||||
- [],
|
||||
- [glut_enabled=no])
|
||||
-AC_CHECK_LIB([glut],
|
||||
- [glutInit],
|
||||
- [],
|
||||
- [glut_enabled=no])
|
||||
+ GLUT_LIBS="-L$withval/lib -lglut"],
|
||||
+ [GLUT_CFLAGS=""
|
||||
+ GLUT_LIBS="-lglut"]
|
||||
+ )
|
||||
+AS_IF([test "x$with_glut" != xno],
|
||||
+ [AC_CHECK_HEADER([GL/glut.h],
|
||||
+ [],
|
||||
+ [glut_enabled=no])
|
||||
+ AC_CHECK_LIB([glut],
|
||||
+ [glutInit],
|
||||
+ [],
|
||||
+ [glut_enabled=no])
|
||||
+ glut_enabled=yes
|
||||
+])
|
||||
|
||||
GLEW_CFLAGS=""
|
||||
GLEW_LIBS="-lGLEW"
|
|
@ -11,13 +11,15 @@ LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=9142
|
|||
|
||||
DEPENDS = "virtual/libx11 virtual/libgl glew"
|
||||
|
||||
PR = "r3"
|
||||
PR = "r4"
|
||||
|
||||
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \
|
||||
file://dso_linking_change_build_fix.patch \
|
||||
file://gles2-info.patch"
|
||||
file://gles2-info.patch \
|
||||
file://glut.patch"
|
||||
SRC_URI[md5sum] = "320c2a4b6edc6faba35d9cb1e2a30bf4"
|
||||
SRC_URI[sha256sum] = "4bc7f2b20d17e3eebfec288f2367a435cd2db71fc5ac9ece2c14827e290d77d1"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
SRC_URI[md5sum] = "320c2a4b6edc6faba35d9cb1e2a30bf4"
|
||||
SRC_URI[sha256sum] = "4bc7f2b20d17e3eebfec288f2367a435cd2db71fc5ac9ece2c14827e290d77d1"
|
||||
EXTRA_OECONF = "--without-glut"
|
||||
|
|
Loading…
Reference in New Issue