[oe-commits] Drew Moseley : mesa-demos: Specify the lib dir to locate glut libraries

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 55ecbebdf13ef46f0fb4d87ef11651fe692be33d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=55ecbebdf13ef46f0fb4d87ef11651fe692be33d

Author: Drew Moseley <drew_moseley at mentor.com>
Date:   Thu May  8 16:17:41 2014 -0400

mesa-demos: Specify the lib dir to locate glut libraries

Signed-off-by: Drew Moseley <drew_moseley at mentor.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-graphics/mesa/mesa-demos/glut.patch | 2 +-
 meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb   | 2 +-
 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 84b6d4f..2ca5a93 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 d6e6fbc..211df3b 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"