[PATCH 1/2] mesa: package gl/egl/osmesa to separate packages

[PATCH 1/2] mesa: package gl/egl/osmesa to separate packages

[Martin Jansa]

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/*"
-- 
1.7.7

[PATCH 2/2] mesa-common: install internal GL headers to libgl-dev

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/mesa/mesa-common.inc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index b8f2289..ca2d931 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -51,3 +51,8 @@ FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
 
 FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_libegl-dbg += "${libdir}/egl/.debug/*"
+
+do_install_append () {
+    install -d ${D}/${includedir}/GL
+    cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
+}
-- 
1.7.7

Re: [PATCH 2/2] mesa-common: install internal GL headers to libgl-dev

[Koen Kooi]

Op 15 okt. 2011, om 11:54 heeft Martin Jansa het volgende geschreven:

> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

Acked-by: Koen Kooi <k-kooi@ti.com>

> ---
> meta/recipes-graphics/mesa/mesa-common.inc |    5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
> index b8f2289..ca2d931 100644
> --- a/meta/recipes-graphics/mesa/mesa-common.inc
> +++ b/meta/recipes-graphics/mesa/mesa-common.inc
> @@ -51,3 +51,8 @@ FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
> 
> FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
> FILES_libegl-dbg += "${libdir}/egl/.debug/*"
> +
> +do_install_append () {
> +    install -d ${D}/${includedir}/GL
> +    cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
> +}
> -- 
> 1.7.7
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 2/2] mesa-common: install internal GL headers to libgl-dev

[Phil Blundell]

On Sat, 2011-10-15 at 11:54 +0200, Martin Jansa wrote:
>  FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
>  FILES_libegl-dbg += "${libdir}/egl/.debug/*"
> +
> +do_install_append () {
> +    install -d ${D}/${includedir}/GL
> +    cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
> +}

Why is this needed?  If the internal headers are meant to be installed,
why doesn't "make install" do that?  Or, conversely, if they aren't
intended to be installed, why do we want them there?

Please add some commentary to the checkin message explaining the
rationale for the patch.

p.

Re: [PATCH 2/2] mesa-common: install internal GL headers to libgl-dev

[Richard Purdie]

On Sat, 2011-10-15 at 15:27 +0100, Phil Blundell wrote:
> On Sat, 2011-10-15 at 11:54 +0200, Martin Jansa wrote:
> >  FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
> >  FILES_libegl-dbg += "${libdir}/egl/.debug/*"
> > +
> > +do_install_append () {
> > +    install -d ${D}/${includedir}/GL
> > +    cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
> > +}
> 
> Why is this needed?  If the internal headers are meant to be installed,
> why doesn't "make install" do that?  Or, conversely, if they aren't
> intended to be installed, why do we want them there?
> 
> Please add some commentary to the checkin message explaining the
> rationale for the patch.

Ideally we should write a patch fixing the Makefile so dri-swrast
installs the pieces the xserver needs to build. Does it need both
sarea.h and dri_interface.h or just the latter?

FWIW the dri-i9* drivers install the dri header but not sarea.h.

Cheers,

Richard