| Submitter | Martin Jansa |
|---|---|
| Date | Nov. 11, 2011, 4:28 p.m. |
| Message ID | <ada5f3bb531072e713e2017989c3f8df3a55c075.1321028799.git.Martin.Jansa@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/14829/ |
| State | Accepted |
| Commit | 1b0811e1547c7b7e81372248e233867a7df2e2e4 |
| Headers | show |
Comments
On 11/11/2011 08:28 AM, Martin Jansa wrote: > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com> > --- > meta/recipes-graphics/mesa/mesa-common.inc | 13 +++++++++++-- > 1 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc > index 06ebb75..b8f2289 100644 > --- a/meta/recipes-graphics/mesa/mesa-common.inc > +++ b/meta/recipes-graphics/mesa/mesa-common.inc > @@ -38,7 +38,16 @@ EXTRA_OECONF = "--enable-glu \ > # Multiple virtual/gl providers being built breaks staging > EXCLUDE_FROM_WORLD = "1" > > -PACKAGES =+ "libglu libglu-dev" > - > +PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev" > +FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so" > +FILES_libgl = "${libdir}/libGL.so.*" > FILES_libglu = "${libdir}/libGLU.so.*" > +FILES_libosmesa = "${libdir}/libOSMesa.so.*" > + > +FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL" > +FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL" > FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h" > +FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" > + > +FILES_${PN}-dbg += "${libdir}/dri/.debug/*" > +FILES_libegl-dbg += "${libdir}/egl/.debug/*" Martin, One of the mesa changes seems to have caused a problem building the sdk images: | error: Failed dependencies: | mesa-dri = 2:7.11-r12.0 is needed by mesa-dri-dev-7.11-r12.0.x86_64 Sau!
Patch
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc index 06ebb75..b8f2289 100644 --- a/meta/recipes-graphics/mesa/mesa-common.inc +++ b/meta/recipes-graphics/mesa/mesa-common.inc @@ -38,7 +38,16 @@ EXTRA_OECONF = "--enable-glu \ # Multiple virtual/gl providers being built breaks staging EXCLUDE_FROM_WORLD = "1" -PACKAGES =+ "libglu libglu-dev" - +PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev" +FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so" +FILES_libgl = "${libdir}/libGL.so.*" FILES_libglu = "${libdir}/libGLU.so.*" +FILES_libosmesa = "${libdir}/libOSMesa.so.*" + +FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL" +FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL" FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h" +FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" + +FILES_${PN}-dbg += "${libdir}/dri/.debug/*" +FILES_libegl-dbg += "${libdir}/egl/.debug/*"
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/recipes-graphics/mesa/mesa-common.inc | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-)