summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Moseley <drew_moseley@mentor.com>2014-05-08 16:17:41 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-11 12:26:36 +0100
commit55ecbebdf13ef46f0fb4d87ef11651fe692be33d (patch)
tree6a632695354a38a4eb2af0ee07c709aa78d286fd
parent91edf4cac223298e50a4b8e59dd19f1b272e3418 (diff)
downloadopenembedded-core-55ecbebdf13ef46f0fb4d87ef11651fe692be33d.tar.gz
openembedded-core-55ecbebdf13ef46f0fb4d87ef11651fe692be33d.tar.bz2
openembedded-core-55ecbebdf13ef46f0fb4d87ef11651fe692be33d.zip
mesa-demos: Specify the lib dir to locate glut libraries
Signed-off-by: Drew Moseley <drew_moseley@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/glut.patch2
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos/glut.patch b/meta/recipes-graphics/mesa/mesa-demos/glut.patch
index 84b6d4f7f3..2ca5a938ac 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/glut.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/glut.patch
@@ -27,7 +27,7 @@ Index: mesa-demos-8.0.1/configure.ac
- [glutInit],
- [],
- [glut_enabled=no])
-+ GLUT_LIBS="-L$withval/lib -lglut"],
++ GLUT_LIBS="-L$withval -lglut"],
+ [GLUT_CFLAGS=""
+ GLUT_LIBS="-lglut"]
+ )
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
index d6e6fbceb1..211df3b249 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
@@ -33,7 +33,7 @@ PACKAGECONFIG[freetype2] = "--enable-freetype2,--disable-freetype2,freetype"
PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl"
PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1"
PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
-PACKAGECONFIG[glut] = "--with-glut,--without-glut,"
+PACKAGECONFIG[glut] = "--with-glut=${STAGING_LIBDIR},--without-glut,"
PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa,"
PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg"
PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland"