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"

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"
33	PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl"	33	PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl"
34	PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1"	34	PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1"
35	PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"	35	PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
36	PACKAGECONFIG[glut] = "--with-glut,--without-glut,"	36	PACKAGECONFIG[glut] = "--with-glut=${STAGING_LIBDIR},--without-glut,"
37	PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa,"	37	PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa,"
38	PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg"	38	PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg"
39	PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland"	39	PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland"