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

login
register
mail settings
Submitter Drew Moseley
Date May 12, 2014, 4:34 p.m.
Message ID <1399912450-27861-1-git-send-email-drew@moseleynet.net>
Download mbox | patch
Permalink /patch/72001/
State New
Headers show

Comments

Drew Moseley - May 12, 2014, 4:34 p.m.
From: Drew Moseley <drew_moseley@mentor.com>

Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
---
 meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Drew Moseley - May 12, 2014, 4:53 p.m.
On May 12, 2014, at 12:34 PM, Drew Moseley <drew@moseleynet.net> wrote:
> From: Drew Moseley <drew_moseley@mentor.com>
> 
> Signed-off-by: Drew Moseley <drew_moseley@mentor.com>

Not sure why "git send-email" dropped the V2 that I thought I put into the 
subject but for clarity this patch completely replaces my earlier one.

The modification of glut.patch is no longer needed.

Drew
Saul Wold - May 12, 2014, 6:19 p.m.
On 05/12/2014 09:34 AM, Drew Moseley wrote:
> From: Drew Moseley <drew_moseley@mentor.com>
>
> Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
> ---
>   meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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..7cda19e 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_EXECPREFIXDIR},--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"
>

Seems the first version was merged already, so we could revert it or if 
you want to rebase this change against master, which would remove the 
configure patch and update the PACKAGECONFIG as above.

Thanks
	Sau!

Patch

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..7cda19e 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_EXECPREFIXDIR},--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"