[meta-fsl-arm][PATCH 1/4] xf86-video-imxfb-vivante: Depend on virtual/xserver

[meta-fsl-arm][PATCH 1/4] xf86-video-imxfb-vivante: Depend on virtual/xserver

[Andrei Gherzan]

This driver needs dri.h header provided by xserver. Without this header
compilation fails with:
fatal error: dri.h: No such file

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../xf86-video-imxfb-vivante_12.09.01.bb           |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb
index e35080f..7d3113a 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb
@@ -3,9 +3,9 @@
 
 require recipes-graphics/xorg-driver/xorg-driver-video.inc
 
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
-DEPENDS += "virtual/libx11 virtual/libgal-x11 gpu-viv-bin-mx6q"
+DEPENDS += "virtual/xserver virtual/libx11 virtual/libgal-x11 gpu-viv-bin-mx6q"
 
 LIC_FILES_CHKSUM = "file://src/vivante_fbdev/vivante.h;endline=19;md5=93a322f91ec495569dcbcfbb2a95454a"
 
-- 
1.7.9.5

[meta-fsl-arm][PATCH 2/4] xserver-xorg: Add bbappend to include dri and exclude glx for imx6

[Andrei Gherzan]

* Split glx PACKAGECONFIG flag in glx and dri. The one from oe-core includes
configs for dri and glx in the same PACKAGECONFIG[glx].
* There is no libgl in imx6 graphic libraries so don't compile xserver with glx.
* xserver driver for imx6 needs dri.h so compile xserver with dri for these
machines

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../xorg-xserver/xserver-xorg_1.13.1.bbappend      |   15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend

diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
new file mode 100644
index 0000000..c8b4a44
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
@@ -0,0 +1,15 @@
+PRINC := "${@int(PRINC) + 1}"
+
+# There are no libgl binaries for imx6 - don't compile with glx
+PACKAGECONFIG_imx6qsabrelite := "${@oe_filter_out('glx', '${PACKAGECONFIG}', d)}"
+PACKAGECONFIG_imx6qsabreauto := "${@oe_filter_out('glx', '${PACKAGECONFIG}', d)}"
+# dri is needed for xf86-video-imxfb-vivante - xserver driver
+PACKAGECONFIG_append_imx6qsabrelite = " dri"
+PACKAGECONFIG_append_imx6qsabreauto = " dri"
+
+PACKAGECONFIG[dri] = "--enable-dri, \
+                      --disable-dri, \
+                      xf86driproto dri2proto"
+PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,\
+                      --disable-glx,\
+                      virtual/libgl"
-- 
1.7.9.5

[meta-fsl-arm][PATCH 3/4] glproto: Don't install glxtokens.h for imx6qsabrelite

[Andrei Gherzan]

Avoid in this way duplicate file warnings in sysroot.
This header is provided by freescale.

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../xorg-proto/glproto_1.4.16.bbappend             |    6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 recipes-graphics/xorg-proto/glproto_1.4.16.bbappend

diff --git a/recipes-graphics/xorg-proto/glproto_1.4.16.bbappend b/recipes-graphics/xorg-proto/glproto_1.4.16.bbappend
new file mode 100644
index 0000000..cc677c8
--- /dev/null
+++ b/recipes-graphics/xorg-proto/glproto_1.4.16.bbappend
@@ -0,0 +1,6 @@
+PRINC := "${@int(PRINC) + 1}"
+
+do_install_append_imx6qsabrelite() {
+    # This is a header provided by fsl so don't use this header
+    rm -rf ${D}${includedir}/GL/glxtokens.h
+}
-- 
1.7.9.5

[meta-fsl-arm][PATCH 4/4] gpu-viv-bin-mx6q: Add dri.pc

[Andrei Gherzan]

This is need when compiling packages like xserver-xorg with dri support.

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc          |   13 ++++++++++---
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc       |   11 +++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc

diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
index 1f63a0b..ed69e88 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -7,11 +7,14 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=092bc28e13d678ceaebe1a40559275fb"
 PROVIDES += "virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 libvivante-dri-mx6"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 inherit fsl-eula-unpack
 
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+SRC_URI = " \
+    ${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
+    file://dri.pc \
+    "
 
 PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
 	libegl-fb-mx6 libegl-fb-mx6-dev libegl-fb-mx6-dbg \
@@ -62,6 +65,10 @@ do_install () {
 
     find ${D}${libdir} -type f -exec chmod 644 {} \;
     find ${D}${includedir} -type f -exec chmod 644 {} \;
+
+    # Install dri.pc
+    install -d ${D}${libdir}/pkgconfig
+    cp -ax ${WORKDIR}/dri.pc ${D}${libdir}/pkgconfig
 }
 
 S = "${WORKDIR}/${PN}-${PV}"
@@ -140,7 +147,7 @@ FILES_libvivante-x11-mx6-dev = "${libdir}/libVIVANTE-x11${SOLIBSDEV}"
 FILES_libvivante-x11-mx6-dbg = "${libdir}/.debug/libVIVANTE-x11${SOLIBS}"
 
 FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri${SOLIBS}"
-FILES_libvivante-dri-mx6-dev = ""
+FILES_libvivante-dri-mx6-dev = "${libdir}/pkgconfig"
 FILES_libvivante-dri-mx6-dbg = "${libdir}/dri/.debug/vivante_dri${SOLIBS}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc
new file mode 100644
index 0000000..537c533
--- /dev/null
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+dridriverdir=${libdir}/dri
+
+Name: dri
+Description: Vivante Direct Rendering Infrastructure
+Version: 8.0.0
+Requires.private: libdrm >= 2.4.24
+Cflags: -I${includedir}
-- 
1.7.9.5

Re: [meta-fsl-arm][PATCH 1/4] xf86-video-imxfb-vivante: Depend on virtual/xserver

[Eric Bénard]

Hi Andrei,

Le Sun, 13 Jan 2013 18:28:39 +0200,
Andrei Gherzan <andrei.gherzan@windriver.com> a écrit :

> This driver needs dri.h header provided by xserver. Without this header
> compilation fails with:
> fatal error: dri.h: No such file
> 
no that's not the real solution and this depends is already here
because :
xf86-video-imxfb-vivante_12.09.01.bb require xorg-driver-video.inc
which includes xorg-driver-common.inc which set
DEPENDS = "virtual/xserver xproto randrproto util-macros"

As I already said before dri is enabled _only_ if DISTRO_FEATURES
contains opengl :
xserver-xorg.inc has
PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl',
'glx', '', d)}" PACKAGECONFIG[udev] =
"--enable-config-udev,--disable-config-udev,udev" PACKAGECONFIG[glx] =
"--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\
--disable-dri --disable-glx,\ xf86driproto dri2proto mesa-dri"

So this patch is useless.

Eric

Re: [meta-fsl-arm][PATCH 2/4] xserver-xorg: Add bbappend to include dri and exclude glx for imx6

[Eric Bénard]

Hi Andrei,

Le Sun, 13 Jan 2013 18:28:40 +0200,
Andrei Gherzan <andrei.gherzan@windriver.com> a écrit :

> * Split glx PACKAGECONFIG flag in glx and dri. The one from oe-core includes
> configs for dri and glx in the same PACKAGECONFIG[glx].
> * There is no libgl in imx6 graphic libraries so don't compile xserver with glx.
> * xserver driver for imx6 needs dri.h so compile xserver with dri for these
> machines
> 
> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> ---
>  .../xorg-xserver/xserver-xorg_1.13.1.bbappend      |   15 +++++++++++++++
>  1 file changed, 15 insertions(+)
>  create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> 
> diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> new file mode 100644
> index 0000000..c8b4a44
> --- /dev/null
> +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> @@ -0,0 +1,15 @@
> +PRINC := "${@int(PRINC) + 1}"
> +
> +# There are no libgl binaries for imx6 - don't compile with glx
> +PACKAGECONFIG_imx6qsabrelite := "${@oe_filter_out('glx', '${PACKAGECONFIG}', d)}"
> +PACKAGECONFIG_imx6qsabreauto := "${@oe_filter_out('glx', '${PACKAGECONFIG}', d)}"
> +# dri is needed for xf86-video-imxfb-vivante - xserver driver
> +PACKAGECONFIG_append_imx6qsabrelite = " dri"
> +PACKAGECONFIG_append_imx6qsabreauto = " dri"
> +
> +PACKAGECONFIG[dri] = "--enable-dri, \
> +                      --disable-dri, \
> +                      xf86driproto dri2proto"
> +PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,\
> +                      --disable-glx,\
> +                      virtual/libgl"

in openembedded-core, dri (and glx) are enabled only if opengl is a
DISTRO_FEATURE so the choice to enable these feature is done at distro
level and not at machine level.
So to be consistent with that, you could split dri/glx but I think
dri should be enabled only when the distro has enabled opengl.

Note that we have the same problem in the qt4 recipes : in oe-core,
opengl is enabled ony if DISTRO_FEATURE has opengl, in meta-fsl-arm
opengl (and openvg) are enabled by default. I'm not sure a BSP should
force these settings if the distro doesn't want them.

Eric

Re: [meta-fsl-arm][PATCH 2/4] xserver-xorg: Add bbappend to include dri and exclude glx for imx6

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 2897 bytes --]

On Sun, Jan 13, 2013 at 7:41 PM, Eric Bénard <eric@eukrea.com> wrote:

> Hi Andrei,
>
> Le Sun, 13 Jan 2013 18:28:40 +0200,
> Andrei Gherzan <andrei.gherzan@windriver.com> a écrit :
>
> > * Split glx PACKAGECONFIG flag in glx and dri. The one from oe-core
> includes
> > configs for dri and glx in the same PACKAGECONFIG[glx].
> > * There is no libgl in imx6 graphic libraries so don't compile xserver
> with glx.
> > * xserver driver for imx6 needs dri.h so compile xserver with dri for
> these
> > machines
> >
> > Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> > ---
> >  .../xorg-xserver/xserver-xorg_1.13.1.bbappend      |   15
> +++++++++++++++
> >  1 file changed, 15 insertions(+)
> >  create mode 100644
> recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> >
> > diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> > new file mode 100644
> > index 0000000..c8b4a44
> > --- /dev/null
> > +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> > @@ -0,0 +1,15 @@
> > +PRINC := "${@int(PRINC) + 1}"
> > +
> > +# There are no libgl binaries for imx6 - don't compile with glx
> > +PACKAGECONFIG_imx6qsabrelite := "${@oe_filter_out('glx',
> '${PACKAGECONFIG}', d)}"
> > +PACKAGECONFIG_imx6qsabreauto := "${@oe_filter_out('glx',
> '${PACKAGECONFIG}', d)}"
> > +# dri is needed for xf86-video-imxfb-vivante - xserver driver
> > +PACKAGECONFIG_append_imx6qsabrelite = " dri"
> > +PACKAGECONFIG_append_imx6qsabreauto = " dri"
> > +
> > +PACKAGECONFIG[dri] = "--enable-dri, \
> > +                      --disable-dri, \
> > +                      xf86driproto dri2proto"
> > +PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,\
> > +                      --disable-glx,\
> > +                      virtual/libgl"
>
> in openembedded-core, dri (and glx) are enabled only if opengl is a
> DISTRO_FEATURE so the choice to enable these feature is done at distro
> level and not at machine level.
> So to be consistent with that, you could split dri/glx but I think
> dri should be enabled only when the distro has enabled opengl.
>
> Note that we have the same problem in the qt4 recipes : in oe-core,
> opengl is enabled ony if DISTRO_FEATURE has opengl, in meta-fsl-arm
> opengl (and openvg) are enabled by default. I'm not sure a BSP should
> force these settings if the distro doesn't want them.
>

So. I know the way oe-core chooses to use opengl and it's right. As long as
gl is provided as a distro / mesa-dri provider. But after all libgl / egl
and so on can be hardware dependent binaries. And this is why i want to
treat them like that. I would consider this a workaround until things will
be completed in oe-core. But right now this, in my opinion, the only good
way to fix an issue like this.

ag

[-- Attachment #2: Type: text/html, Size: 3684 bytes --]

Re: [meta-fsl-arm][PATCH 2/4] xserver-xorg: Add bbappend to include dri and exclude glx for imx6

[Eric Bénard]

Le Sun, 13 Jan 2013 21:23:18 +0200,
Andrei Gherzan <andrei@gherzan.ro> a écrit :
> On Sun, Jan 13, 2013 at 7:41 PM, Eric Bénard <eric@eukrea.com> wrote:
> > in openembedded-core, dri (and glx) are enabled only if opengl is a
> > DISTRO_FEATURE so the choice to enable these feature is done at distro
> > level and not at machine level.
> > So to be consistent with that, you could split dri/glx but I think
> > dri should be enabled only when the distro has enabled opengl.
> >
> > Note that we have the same problem in the qt4 recipes : in oe-core,
> > opengl is enabled ony if DISTRO_FEATURE has opengl, in meta-fsl-arm
> > opengl (and openvg) are enabled by default. I'm not sure a BSP should
> > force these settings if the distro doesn't want them.
> >
> 
> So. I know the way oe-core chooses to use opengl and it's right. As long as
> gl is provided as a distro / mesa-dri provider. But after all libgl / egl
> and so on can be hardware dependent binaries. And this is why i want to
> treat them like that. I would consider this a workaround until things will
> be completed in oe-core. But right now this, in my opinion, the only good
> way to fix an issue like this.
> 
I agree with you that this could be hardware dependent and not distro
dependent. So if I understand well you plan to migrate that in
oe-core from DISTRO_FEATURES to MACHINE_FEATURES ?

Eric

Re: [meta-fsl-arm][PATCH 2/4] xserver-xorg: Add bbappend to include dri and exclude glx for imx6

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 1671 bytes --]

On Sun, Jan 13, 2013 at 9:48 PM, Eric Bénard <eric@eukrea.com> wrote:

> Le Sun, 13 Jan 2013 21:23:18 +0200,
> Andrei Gherzan <andrei@gherzan.ro> a écrit :
> > On Sun, Jan 13, 2013 at 7:41 PM, Eric Bénard <eric@eukrea.com> wrote:
> > > in openembedded-core, dri (and glx) are enabled only if opengl is a
> > > DISTRO_FEATURE so the choice to enable these feature is done at distro
> > > level and not at machine level.
> > > So to be consistent with that, you could split dri/glx but I think
> > > dri should be enabled only when the distro has enabled opengl.
> > >
> > > Note that we have the same problem in the qt4 recipes : in oe-core,
> > > opengl is enabled ony if DISTRO_FEATURE has opengl, in meta-fsl-arm
> > > opengl (and openvg) are enabled by default. I'm not sure a BSP should
> > > force these settings if the distro doesn't want them.
> > >
> >
> > So. I know the way oe-core chooses to use opengl and it's right. As long
> as
> > gl is provided as a distro / mesa-dri provider. But after all libgl / egl
> > and so on can be hardware dependent binaries. And this is why i want to
> > treat them like that. I would consider this a workaround until things
> will
> > be completed in oe-core. But right now this, in my opinion, the only good
> > way to fix an issue like this.
> >
> I agree with you that this could be hardware dependent and not distro
> dependent. So if I understand well you plan to migrate that in
> oe-core from DISTRO_FEATURES to MACHINE_FEATURES ?
>

Yes. This is want. But things will be tricky. Need to think how to do it.
We had a talk in oe-core ago. Things didn't come to a conclusion yet.

ag

[-- Attachment #2: Type: text/html, Size: 2300 bytes --]

Re: [meta-fsl-arm][PATCH 1/4] xf86-video-imxfb-vivante: Depend on virtual/xserver

[Otavio Salvador]

On Sun, Jan 13, 2013 at 3:04 PM, Eric Bénard <eric@eukrea.com> wrote:
...
> As I already said before dri is enabled _only_ if DISTRO_FEATURES
> contains opengl :
> xserver-xorg.inc has
> PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl',
> 'glx', '', d)}" PACKAGECONFIG[udev] =
> "--enable-config-udev,--disable-config-udev,udev" PACKAGECONFIG[glx] =
> "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\
> --disable-dri --disable-glx,\ xf86driproto dri2proto mesa-dri"
>
> So this patch is useless.

We need to split glx and dri in PACKAGECONFIG to handle it. In
meanwhile we can use 'udev' only and add dri depends and configuration
options.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-fsl-arm][PATCH 2/4] xserver-xorg: Add bbappend to include dri and exclude glx for imx6

[Otavio Salvador]

On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
<andrei.gherzan@windriver.com> wrote:
> * Split glx PACKAGECONFIG flag in glx and dri. The one from oe-core includes
> configs for dri and glx in the same PACKAGECONFIG[glx].
> * There is no libgl in imx6 graphic libraries so don't compile xserver with glx.
> * xserver driver for imx6 needs dri.h so compile xserver with dri for these
> machines
>
> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> ---
>  .../xorg-xserver/xserver-xorg_1.13.1.bbappend      |   15 +++++++++++++++
>  1 file changed, 15 insertions(+)
>  create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
>
> diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> new file mode 100644
> index 0000000..c8b4a44
> --- /dev/null
> +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> @@ -0,0 +1,15 @@
> +PRINC := "${@int(PRINC) + 1}"
> +
> +# There are no libgl binaries for imx6 - don't compile with glx
> +PACKAGECONFIG_imx6qsabrelite := "${@oe_filter_out('glx', '${PACKAGECONFIG}', d)}"
> +PACKAGECONFIG_imx6qsabreauto := "${@oe_filter_out('glx', '${PACKAGECONFIG}', d)}"
> +# dri is needed for xf86-video-imxfb-vivante - xserver driver
> +PACKAGECONFIG_append_imx6qsabrelite = " dri"
> +PACKAGECONFIG_append_imx6qsabreauto = " dri"

Use PACKAGECONFIG_mx6 so all mx6 boards handle it same way by default.

> +PACKAGECONFIG[dri] = "--enable-dri, \
> +                      --disable-dri, \
> +                      xf86driproto dri2proto"
> +PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,\
> +                      --disable-glx,\
> +                      virtual/libgl"

This part of patch can be included here as an interin solution but it
should be send to oe-core.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-fsl-arm][PATCH 3/4] glproto: Don't install glxtokens.h for imx6qsabrelite

[Otavio Salvador]

On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
<andrei.gherzan@windriver.com> wrote:
> Avoid in this way duplicate file warnings in sysroot.
> This header is provided by freescale.
>
> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>

Wouldn't be better to use the one provided by Xorg and drop the one in
the GPU package?

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-fsl-arm][PATCH 4/4] gpu-viv-bin-mx6q: Add dri.pc

[Otavio Salvador]

On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
<andrei.gherzan@windriver.com> wrote:
> This is need when compiling packages like xserver-xorg with dri support.
>
> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> ---
>  .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc          |   13 ++++++++++---
>  .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc       |   11 +++++++++++
>  2 files changed, 21 insertions(+), 3 deletions(-)
>  create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc
>
> diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
> index 1f63a0b..ed69e88 100644
> --- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
> +++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
> @@ -7,11 +7,14 @@ LICENSE = "Proprietary"
>  LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=092bc28e13d678ceaebe1a40559275fb"
>  PROVIDES += "virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 libvivante-dri-mx6"
>
> -INC_PR = "r1"
> +INC_PR = "r2"
>
>  inherit fsl-eula-unpack
>
> -SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
> +SRC_URI = " \
> +    ${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
> +    file://dri.pc \
> +    "

Please don't change the format in same patch. Besides I see no reason
to break the first line... do you?

>  PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
>         libegl-fb-mx6 libegl-fb-mx6-dev libegl-fb-mx6-dbg \
> @@ -62,6 +65,10 @@ do_install () {
>
>      find ${D}${libdir} -type f -exec chmod 644 {} \;
>      find ${D}${includedir} -type f -exec chmod 644 {} \;
> +
> +    # Install dri.pc
> +    install -d ${D}${libdir}/pkgconfig
> +    cp -ax ${WORKDIR}/dri.pc ${D}${libdir}/pkgconfig
>  }
>
>  S = "${WORKDIR}/${PN}-${PV}"
> @@ -140,7 +147,7 @@ FILES_libvivante-x11-mx6-dev = "${libdir}/libVIVANTE-x11${SOLIBSDEV}"
>  FILES_libvivante-x11-mx6-dbg = "${libdir}/.debug/libVIVANTE-x11${SOLIBS}"
>
>  FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri${SOLIBS}"
> -FILES_libvivante-dri-mx6-dev = ""
> +FILES_libvivante-dri-mx6-dev = "${libdir}/pkgconfig"
>  FILES_libvivante-dri-mx6-dbg = "${libdir}/dri/.debug/vivante_dri${SOLIBS}"
>
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
> diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc
> new file mode 100644
> index 0000000..537c533
> --- /dev/null
> +++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc
> @@ -0,0 +1,11 @@
> +prefix=/usr
> +exec_prefix=${prefix}
> +libdir=/usr/lib
> +includedir=/usr/include
> +dridriverdir=${libdir}/dri
> +
> +Name: dri
> +Description: Vivante Direct Rendering Infrastructure
> +Version: 8.0.0
> +Requires.private: libdrm >= 2.4.24
> +Cflags: -I${includedir}

The patch looks fine; I will await for the v2 of the patchset.

Regards,

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-fsl-arm][PATCH 3/4] glproto: Don't install glxtokens.h for imx6qsabrelite

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 498 bytes --]

On Mon, Jan 14, 2013 at 1:55 PM, Otavio Salvador <otavio@ossystems.com.br>wrote:

> On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
> <andrei.gherzan@windriver.com> wrote:
> > Avoid in this way duplicate file warnings in sysroot.
> > This header is provided by freescale.
> >
> > Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
>
> Wouldn't be better to use the one provided by Xorg and drop the one in
> the GPU package?
>

Xorg? Is Xorg bringing that header too?

ag

[-- Attachment #2: Type: text/html, Size: 1017 bytes --]

Re: [meta-fsl-arm][PATCH 2/4] xserver-xorg: Add bbappend to include dri and exclude glx for imx6

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 2059 bytes --]

On Mon, Jan 14, 2013 at 1:53 PM, Otavio Salvador <otavio@ossystems.com.br>wrote:

> On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
> <andrei.gherzan@windriver.com> wrote:
> > * Split glx PACKAGECONFIG flag in glx and dri. The one from oe-core
> includes
> > configs for dri and glx in the same PACKAGECONFIG[glx].
> > * There is no libgl in imx6 graphic libraries so don't compile xserver
> with glx.
> > * xserver driver for imx6 needs dri.h so compile xserver with dri for
> these
> > machines
> >
> > Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> > ---
> >  .../xorg-xserver/xserver-xorg_1.13.1.bbappend      |   15
> +++++++++++++++
> >  1 file changed, 15 insertions(+)
> >  create mode 100644
> recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> >
> > diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> > new file mode 100644
> > index 0000000..c8b4a44
> > --- /dev/null
> > +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
> > @@ -0,0 +1,15 @@
> > +PRINC := "${@int(PRINC) + 1}"
> > +
> > +# There are no libgl binaries for imx6 - don't compile with glx
> > +PACKAGECONFIG_imx6qsabrelite := "${@oe_filter_out('glx',
> '${PACKAGECONFIG}', d)}"
> > +PACKAGECONFIG_imx6qsabreauto := "${@oe_filter_out('glx',
> '${PACKAGECONFIG}', d)}"
> > +# dri is needed for xf86-video-imxfb-vivante - xserver driver
> > +PACKAGECONFIG_append_imx6qsabrelite = " dri"
> > +PACKAGECONFIG_append_imx6qsabreauto = " dri"
>
> Use PACKAGECONFIG_mx6 so all mx6 boards handle it same way by default.
>
> > +PACKAGECONFIG[dri] = "--enable-dri, \
> > +                      --disable-dri, \
> > +                      xf86driproto dri2proto"
> > +PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,\
> > +                      --disable-glx,\
> > +                      virtual/libgl"
>
> This part of patch can be included here as an interin solution but it
> should be send to oe-core.
>

Yes.

[-- Attachment #2: Type: text/html, Size: 2825 bytes --]

Re: [meta-fsl-arm][PATCH 3/4] glproto: Don't install glxtokens.h for imx6qsabrelite

[Otavio Salvador]

On Mon, Jan 14, 2013 at 10:22 AM, Andrei Gherzan <andrei@gherzan.ro> wrote:
> On Mon, Jan 14, 2013 at 1:55 PM, Otavio Salvador <otavio@ossystems.com.br>
> wrote:
>>
>> On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
>> <andrei.gherzan@windriver.com> wrote:
>> > Avoid in this way duplicate file warnings in sysroot.
>> > This header is provided by freescale.
>> >
>> > Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
>>
>> Wouldn't be better to use the one provided by Xorg and drop the one in
>> the GPU package?
>
>
> Xorg? Is Xorg bringing that header too?

glproto comes from Xorg project ;-)

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-fsl-arm][PATCH 3/4] glproto: Don't install glxtokens.h for imx6qsabrelite

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 876 bytes --]

On Mon, Jan 14, 2013 at 2:25 PM, Otavio Salvador <otavio@ossystems.com.br>wrote:

> On Mon, Jan 14, 2013 at 10:22 AM, Andrei Gherzan <andrei@gherzan.ro>
> wrote:
> > On Mon, Jan 14, 2013 at 1:55 PM, Otavio Salvador <
> otavio@ossystems.com.br>
> > wrote:
> >>
> >> On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
> >> <andrei.gherzan@windriver.com> wrote:
> >> > Avoid in this way duplicate file warnings in sysroot.
> >> > This header is provided by freescale.
> >> >
> >> > Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> >>
> >> Wouldn't be better to use the one provided by Xorg and drop the one in
> >> the GPU package?
> >
> >
> > Xorg? Is Xorg bringing that header too?
>

I know and I understand now. Well... don't know what to say. My opinion
would be to use the ones from GPU. After all those are HW dependent isn't
it?

ag

[-- Attachment #2: Type: text/html, Size: 1646 bytes --]

Re: [meta-fsl-arm][PATCH 1/4] xf86-video-imxfb-vivante: Depend on virtual/xserver

[Eric Bénard]

Hi Otavio,

Le Mon, 14 Jan 2013 09:49:16 -0200,
Otavio Salvador <otavio@ossystems.com.br> a écrit :

> On Sun, Jan 13, 2013 at 3:04 PM, Eric Bénard <eric@eukrea.com> wrote:
> ...
> > As I already said before dri is enabled _only_ if DISTRO_FEATURES
> > contains opengl :
> > xserver-xorg.inc has
> > PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl',
> > 'glx', '', d)}" PACKAGECONFIG[udev] =
> > "--enable-config-udev,--disable-config-udev,udev" PACKAGECONFIG[glx] =
> > "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\
> > --disable-dri --disable-glx,\ xf86driproto dri2proto mesa-dri"
> >
> > So this patch is useless.
> 
> We need to split glx and dri in PACKAGECONFIG to handle it. In
> meanwhile we can use 'udev' only and add dri depends and configuration
> options.
> 
you're not answering to the comments on the right patch ;-)

Eric

Re: [meta-fsl-arm][PATCH 3/4] glproto: Don't install glxtokens.h for imx6qsabrelite

[Eric Bénard]

Le Mon, 14 Jan 2013 15:01:21 +0200,
Andrei Gherzan <andrei@gherzan.ro> a écrit :

> On Mon, Jan 14, 2013 at 2:25 PM, Otavio Salvador <otavio@ossystems.com.br>wrote:
> 
> > On Mon, Jan 14, 2013 at 10:22 AM, Andrei Gherzan <andrei@gherzan.ro>
> > wrote:
> > > On Mon, Jan 14, 2013 at 1:55 PM, Otavio Salvador <
> > otavio@ossystems.com.br>
> > > wrote:
> > >>
> > >> On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
> > >> <andrei.gherzan@windriver.com> wrote:
> > >> > Avoid in this way duplicate file warnings in sysroot.
> > >> > This header is provided by freescale.
> > >> >
> > >> > Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> > >>
> > >> Wouldn't be better to use the one provided by Xorg and drop the one in
> > >> the GPU package?
> > >
> > >
> > > Xorg? Is Xorg bringing that header too?
> >
> 
> I know and I understand now. Well... don't know what to say. My opinion
> would be to use the ones from GPU. After all those are HW dependent isn't
> it?

what is the diff between both files ?

Eric

Re: [meta-fsl-arm][PATCH 3/4] glproto: Don't install glxtokens.h for imx6qsabrelite

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 1338 bytes --]

On Mon, Jan 14, 2013 at 3:22 PM, Eric Bénard <eric@eukrea.com> wrote:

> Le Mon, 14 Jan 2013 15:01:21 +0200,
> Andrei Gherzan <andrei@gherzan.ro> a écrit :
>
> > On Mon, Jan 14, 2013 at 2:25 PM, Otavio Salvador <
> otavio@ossystems.com.br>wrote:
> >
> > > On Mon, Jan 14, 2013 at 10:22 AM, Andrei Gherzan <andrei@gherzan.ro>
> > > wrote:
> > > > On Mon, Jan 14, 2013 at 1:55 PM, Otavio Salvador <
> > > otavio@ossystems.com.br>
> > > > wrote:
> > > >>
> > > >> On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
> > > >> <andrei.gherzan@windriver.com> wrote:
> > > >> > Avoid in this way duplicate file warnings in sysroot.
> > > >> > This header is provided by freescale.
> > > >> >
> > > >> > Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> > > >>
> > > >> Wouldn't be better to use the one provided by Xorg and drop the one
> in
> > > >> the GPU package?
> > > >
> > > >
> > > > Xorg? Is Xorg bringing that header too?
> > >
> >
> > I know and I understand now. Well... don't know what to say. My opinion
> > would be to use the ones from GPU. After all those are HW dependent isn't
> > it?
>
> what is the diff between both files ?
>

Here (http://paste.ubuntu.com/1566706/) is the diff from proto version and
viv version. Seems like a lot of viv specific changes. Take a look.

ag

[-- Attachment #2: Type: text/html, Size: 2416 bytes --]

Re: [meta-fsl-arm][PATCH 3/4] glproto: Don't install glxtokens.h for imx6qsabrelite

[Eric Bénard]

Hi Andrai,

Le Thu, 24 Jan 2013 19:50:42 +0200,
Andrei Gherzan <andrei@gherzan.ro> a écrit :

> On Mon, Jan 14, 2013 at 3:22 PM, Eric Bénard <eric@eukrea.com> wrote:
> 
> > Le Mon, 14 Jan 2013 15:01:21 +0200,
> > Andrei Gherzan <andrei@gherzan.ro> a écrit :
> >
> > > On Mon, Jan 14, 2013 at 2:25 PM, Otavio Salvador <
> > otavio@ossystems.com.br>wrote:
> > >
> > > > On Mon, Jan 14, 2013 at 10:22 AM, Andrei Gherzan <andrei@gherzan.ro>
> > > > wrote:
> > > > > On Mon, Jan 14, 2013 at 1:55 PM, Otavio Salvador <
> > > > otavio@ossystems.com.br>
> > > > > wrote:
> > > > >>
> > > > >> On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
> > > > >> <andrei.gherzan@windriver.com> wrote:
> > > > >> > Avoid in this way duplicate file warnings in sysroot.
> > > > >> > This header is provided by freescale.
> > > > >> >
> > > > >> > Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> > > > >>
> > > > >> Wouldn't be better to use the one provided by Xorg and drop the one
> > in
> > > > >> the GPU package?
> > > > >
> > > > >
> > > > > Xorg? Is Xorg bringing that header too?
> > > >
> > >
> > > I know and I understand now. Well... don't know what to say. My opinion
> > > would be to use the ones from GPU. After all those are HW dependent isn't
> > > it?
> >
> > what is the diff between both files ?
> >
> 
> Here (http://paste.ubuntu.com/1566706/) is the diff from proto version and
> viv version. Seems like a lot of viv specific changes. Take a look.
> 
OK so it may be better to use the one of the GPU package and not the
one from Xorg.

Eric

Re: [meta-fsl-arm][PATCH 3/4] glproto: Don't install glxtokens.h for imx6qsabrelite

[Otavio Salvador]

On Thu, Jan 24, 2013 at 4:01 PM, Eric Bénard <eric@eukrea.com> wrote:
> Hi Andrai,
>
> Le Thu, 24 Jan 2013 19:50:42 +0200,
> Andrei Gherzan <andrei@gherzan.ro> a écrit :
>
>> On Mon, Jan 14, 2013 at 3:22 PM, Eric Bénard <eric@eukrea.com> wrote:
>>
>> > Le Mon, 14 Jan 2013 15:01:21 +0200,
>> > Andrei Gherzan <andrei@gherzan.ro> a écrit :
>> >
>> > > On Mon, Jan 14, 2013 at 2:25 PM, Otavio Salvador <
>> > otavio@ossystems.com.br>wrote:
>> > >
>> > > > On Mon, Jan 14, 2013 at 10:22 AM, Andrei Gherzan <andrei@gherzan.ro>
>> > > > wrote:
>> > > > > On Mon, Jan 14, 2013 at 1:55 PM, Otavio Salvador <
>> > > > otavio@ossystems.com.br>
>> > > > > wrote:
>> > > > >>
>> > > > >> On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
>> > > > >> <andrei.gherzan@windriver.com> wrote:
>> > > > >> > Avoid in this way duplicate file warnings in sysroot.
>> > > > >> > This header is provided by freescale.
>> > > > >> >
>> > > > >> > Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
>> > > > >>
>> > > > >> Wouldn't be better to use the one provided by Xorg and drop the one
>> > in
>> > > > >> the GPU package?
>> > > > >
>> > > > >
>> > > > > Xorg? Is Xorg bringing that header too?
>> > > >
>> > >
>> > > I know and I understand now. Well... don't know what to say. My opinion
>> > > would be to use the ones from GPU. After all those are HW dependent isn't
>> > > it?
>> >
>> > what is the diff between both files ?
>> >
>>
>> Here (http://paste.ubuntu.com/1566706/) is the diff from proto version and
>> viv version. Seems like a lot of viv specific changes. Take a look.
>>
> OK so it may be better to use the one of the GPU package and not the
> one from Xorg.

Right but then we need to change the header name and patch the code to
use it; so both won't conflict.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-fsl-arm][PATCH 3/4] glproto: Don't install glxtokens.h for imx6qsabrelite

[Eric Bénard]

Le Thu, 24 Jan 2013 16:05:46 -0200,
Otavio Salvador <otavio@ossystems.com.br> a écrit :

> On Thu, Jan 24, 2013 at 4:01 PM, Eric Bénard <eric@eukrea.com> wrote:
> > Hi Andrai,
> >
> > Le Thu, 24 Jan 2013 19:50:42 +0200,
> > Andrei Gherzan <andrei@gherzan.ro> a écrit :
> >
> >> On Mon, Jan 14, 2013 at 3:22 PM, Eric Bénard <eric@eukrea.com> wrote:
> >>
> >> > Le Mon, 14 Jan 2013 15:01:21 +0200,
> >> > Andrei Gherzan <andrei@gherzan.ro> a écrit :
> >> >
> >> > > On Mon, Jan 14, 2013 at 2:25 PM, Otavio Salvador <
> >> > otavio@ossystems.com.br>wrote:
> >> > >
> >> > > > On Mon, Jan 14, 2013 at 10:22 AM, Andrei Gherzan <andrei@gherzan.ro>
> >> > > > wrote:
> >> > > > > On Mon, Jan 14, 2013 at 1:55 PM, Otavio Salvador <
> >> > > > otavio@ossystems.com.br>
> >> > > > > wrote:
> >> > > > >>
> >> > > > >> On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
> >> > > > >> <andrei.gherzan@windriver.com> wrote:
> >> > > > >> > Avoid in this way duplicate file warnings in sysroot.
> >> > > > >> > This header is provided by freescale.
> >> > > > >> >
> >> > > > >> > Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> >> > > > >>
> >> > > > >> Wouldn't be better to use the one provided by Xorg and drop the one
> >> > in
> >> > > > >> the GPU package?
> >> > > > >
> >> > > > >
> >> > > > > Xorg? Is Xorg bringing that header too?
> >> > > >
> >> > >
> >> > > I know and I understand now. Well... don't know what to say. My opinion
> >> > > would be to use the ones from GPU. After all those are HW dependent isn't
> >> > > it?
> >> >
> >> > what is the diff between both files ?
> >> >
> >>
> >> Here (http://paste.ubuntu.com/1566706/) is the diff from proto version and
> >> viv version. Seems like a lot of viv specific changes. Take a look.
> >>
> > OK so it may be better to use the one of the GPU package and not the
> > one from Xorg.
> 
> Right but then we need to change the header name and patch the code to
> use it; so both won't conflict.
> 
or to exclude the header for the Xorg package and package this one
instead.

Eric

Re: [meta-fsl-arm][PATCH 3/4] glproto: Don't install glxtokens.h for imx6qsabrelite

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 2333 bytes --]

On Thu, Jan 24, 2013 at 8:23 PM, Eric Bénard <eric@eukrea.com> wrote:

> Le Thu, 24 Jan 2013 16:05:46 -0200,
> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>
> > On Thu, Jan 24, 2013 at 4:01 PM, Eric Bénard <eric@eukrea.com> wrote:
> > > Hi Andrai,
> > >
> > > Le Thu, 24 Jan 2013 19:50:42 +0200,
> > > Andrei Gherzan <andrei@gherzan.ro> a écrit :
> > >
> > >> On Mon, Jan 14, 2013 at 3:22 PM, Eric Bénard <eric@eukrea.com> wrote:
> > >>
> > >> > Le Mon, 14 Jan 2013 15:01:21 +0200,
> > >> > Andrei Gherzan <andrei@gherzan.ro> a écrit :
> > >> >
> > >> > > On Mon, Jan 14, 2013 at 2:25 PM, Otavio Salvador <
> > >> > otavio@ossystems.com.br>wrote:
> > >> > >
> > >> > > > On Mon, Jan 14, 2013 at 10:22 AM, Andrei Gherzan <
> andrei@gherzan.ro>
> > >> > > > wrote:
> > >> > > > > On Mon, Jan 14, 2013 at 1:55 PM, Otavio Salvador <
> > >> > > > otavio@ossystems.com.br>
> > >> > > > > wrote:
> > >> > > > >>
> > >> > > > >> On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
> > >> > > > >> <andrei.gherzan@windriver.com> wrote:
> > >> > > > >> > Avoid in this way duplicate file warnings in sysroot.
> > >> > > > >> > This header is provided by freescale.
> > >> > > > >> >
> > >> > > > >> > Signed-off-by: Andrei Gherzan <
> andrei.gherzan@windriver.com>
> > >> > > > >>
> > >> > > > >> Wouldn't be better to use the one provided by Xorg and drop
> the one
> > >> > in
> > >> > > > >> the GPU package?
> > >> > > > >
> > >> > > > >
> > >> > > > > Xorg? Is Xorg bringing that header too?
> > >> > > >
> > >> > >
> > >> > > I know and I understand now. Well... don't know what to say. My
> opinion
> > >> > > would be to use the ones from GPU. After all those are HW
> dependent isn't
> > >> > > it?
> > >> >
> > >> > what is the diff between both files ?
> > >> >
> > >>
> > >> Here (http://paste.ubuntu.com/1566706/) is the diff from proto
> version and
> > >> viv version. Seems like a lot of viv specific changes. Take a look.
> > >>
> > > OK so it may be better to use the one of the GPU package and not the
> > > one from Xorg.
> >
> > Right but then we need to change the header name and patch the code to
> > use it; so both won't conflict.
> >
> or to exclude the header for the Xorg package and package this one
> instead.
>

This patch does this.

ag

[-- Attachment #2: Type: text/html, Size: 4094 bytes --]

Re: [meta-fsl-arm][PATCH 3/4] glproto: Don't install glxtokens.h for imx6qsabrelite

[Eric Bénard]

Le Thu, 24 Jan 2013 20:26:31 +0200,
Andrei Gherzan <andrei@gherzan.ro> a écrit :

> On Thu, Jan 24, 2013 at 8:23 PM, Eric Bénard <eric@eukrea.com> wrote:
> 
> > Le Thu, 24 Jan 2013 16:05:46 -0200,
> > Otavio Salvador <otavio@ossystems.com.br> a écrit :
> >
> > > On Thu, Jan 24, 2013 at 4:01 PM, Eric Bénard <eric@eukrea.com> wrote:
> > > > Hi Andrai,
> > > >
> > > > Le Thu, 24 Jan 2013 19:50:42 +0200,
> > > > Andrei Gherzan <andrei@gherzan.ro> a écrit :
> > > >
> > > >> On Mon, Jan 14, 2013 at 3:22 PM, Eric Bénard <eric@eukrea.com> wrote:
> > > >>
> > > >> > Le Mon, 14 Jan 2013 15:01:21 +0200,
> > > >> > Andrei Gherzan <andrei@gherzan.ro> a écrit :
> > > >> >
> > > >> > > On Mon, Jan 14, 2013 at 2:25 PM, Otavio Salvador <
> > > >> > otavio@ossystems.com.br>wrote:
> > > >> > >
> > > >> > > > On Mon, Jan 14, 2013 at 10:22 AM, Andrei Gherzan <
> > andrei@gherzan.ro>
> > > >> > > > wrote:
> > > >> > > > > On Mon, Jan 14, 2013 at 1:55 PM, Otavio Salvador <
> > > >> > > > otavio@ossystems.com.br>
> > > >> > > > > wrote:
> > > >> > > > >>
> > > >> > > > >> On Sun, Jan 13, 2013 at 2:28 PM, Andrei Gherzan
> > > >> > > > >> <andrei.gherzan@windriver.com> wrote:
> > > >> > > > >> > Avoid in this way duplicate file warnings in sysroot.
> > > >> > > > >> > This header is provided by freescale.
> > > >> > > > >> >
> > > >> > > > >> > Signed-off-by: Andrei Gherzan <
> > andrei.gherzan@windriver.com>
> > > >> > > > >>
> > > >> > > > >> Wouldn't be better to use the one provided by Xorg and drop
> > the one
> > > >> > in
> > > >> > > > >> the GPU package?
> > > >> > > > >
> > > >> > > > >
> > > >> > > > > Xorg? Is Xorg bringing that header too?
> > > >> > > >
> > > >> > >
> > > >> > > I know and I understand now. Well... don't know what to say. My
> > opinion
> > > >> > > would be to use the ones from GPU. After all those are HW
> > dependent isn't
> > > >> > > it?
> > > >> >
> > > >> > what is the diff between both files ?
> > > >> >
> > > >>
> > > >> Here (http://paste.ubuntu.com/1566706/) is the diff from proto
> > version and
> > > >> viv version. Seems like a lot of viv specific changes. Take a look.
> > > >>
> > > > OK so it may be better to use the one of the GPU package and not the
> > > > one from Xorg.
> > >
> > > Right but then we need to change the header name and patch the code to
> > > use it; so both won't conflict.
> > >
> > or to exclude the header for the Xorg package and package this one
> > instead.
> >
> 
> This patch does this.
> 
I was just asking the diff to get an answer to Otavio's question
"Wouldn't be better to use the one provided by Xorg and drop the one in
the GPU package?"

So it seems your patch is the right thing to do and that was difficult
to give an opinion without seeing a diff.

Eric