From 359a3317684cdd61b35bf569b0b65148e89abe12 Mon Sep 17 00:00:00 2001 From: Drew Moseley Date: Thu, 8 May 2014 16:17:41 -0400 Subject: mesa-demos: Specify the lib dir to locate glut libraries (From OE-Core rev: 55ecbebdf13ef46f0fb4d87ef11651fe692be33d) Signed-off-by: Drew Moseley Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- 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 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 4bb92f4b05..70ade94eec 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" -- cgit 1.2.3-korg