summaryrefslogtreecommitdiffstats
path: root/meta
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:27:23 +0100
commit76fd64f2e5755890fe442d023578e17355a52b20 (patch)
tree6dde4ae6f1bdb88da4150d35e52cdd0ab1b08d40 /meta
parentbc19e915fbbb932f7ad7bb8a0b7fb3227f94562f (diff)
downloadpoky-76fd64f2e5755890fe442d023578e17355a52b20.tar.gz
mesa-demos: Specify the lib dir to locate glut libraries
(From OE-Core rev: 55ecbebdf13ef46f0fb4d87ef11651fe692be33d) Signed-off-by: Drew Moseley <drew_moseley@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.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 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
27- [glutInit], 27- [glutInit],
28- [], 28- [],
29- [glut_enabled=no]) 29- [glut_enabled=no])
30+ GLUT_LIBS="-L$withval/lib -lglut"], 30+ GLUT_LIBS="-L$withval -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 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"
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,--without-glut," 36PACKAGECONFIG[glut] = "--with-glut=${STAGING_LIBDIR},--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"