summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDrew Moseley <drew_moseley@mentor.com>2014-05-12 16:10:46 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-13 19:32:06 +0100
commitc989c6f3c227cc2062a7f76f93b1d0ce5bb7ff78 (patch)
tree2d25e831534853ef4f3427b22d8e11f54cf28790 /meta
parent098372ad4b19313e557e25aef56a9e3461bab4b0 (diff)
downloadpoky-c989c6f3c227cc2062a7f76f93b1d0ce5bb7ff78.tar.gz
mesa-demos: Specify the lib dir properly.
Use STAGING_EXECPREFIXDIR to specify the location of glut header files and libs rather than STAGING_LIBDIR. Also revert the previous unneeded change to glut.patch. (From OE-Core rev: f38c1846184722180d9091a7a5c1e6e20eed7f2c) Signed-off-by: Drew Moseley <drew_moseley@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 2ca5a938ac..84b6d4f7f3 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
27- [glutInit], 27- [glutInit],
28- [], 28- [],
29- [glut_enabled=no]) 29- [glut_enabled=no])
30+ GLUT_LIBS="-L$withval -lglut"], 30+ GLUT_LIBS="-L$withval/lib -lglut"],
31+ [GLUT_CFLAGS="" 31+ [GLUT_CFLAGS=""
32+ GLUT_LIBS="-lglut"] 32+ GLUT_LIBS="-lglut"]
33+ ) 33+ )
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 211df3b249..7cda19eb6f 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"
33PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl" 33PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl"
34PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1" 34PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1"
35PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" 35PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
36PACKAGECONFIG[glut] = "--with-glut=${STAGING_LIBDIR},--without-glut," 36PACKAGECONFIG[glut] = "--with-glut=${STAGING_EXECPREFIXDIR},--without-glut,"
37PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa," 37PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa,"
38PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg" 38PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg"
39PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland" 39PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland"