* [PATCH] mesa: fix sed for MESA_EGL_NO_X11_HEADERS in fido
@ 2015-07-21 17:46 Tobias Olausson
2015-07-27 15:25 ` Martin Jansa
0 siblings, 1 reply; 5+ messages in thread
From: Tobias Olausson @ 2015-07-21 17:46 UTC (permalink / raw)
To: openembedded-core
In 10.4 versions of mesa, the check for MESA_EGL_NO_X11_HEADERS uses an #ifdef,
not an #if define().
Also, this backports commit 9c746017af381884cc20c7cd563fc429c2c66112
to fido from master.
Signed-off-by: Tobias Olausson <tobias.olausson@pelagicore.com>
---
meta/recipes-graphics/mesa/mesa_10.4.4.bb | 2 +-
meta/recipes-graphics/mesa/mesa_git.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa_10.4.4.bb b/meta/recipes-graphics/mesa/mesa_10.4.4.bb
index 90cccbe..a5f510d 100644
--- a/meta/recipes-graphics/mesa/mesa_10.4.4.bb
+++ b/meta/recipes-graphics/mesa/mesa_10.4.4.bb
@@ -11,6 +11,6 @@ S = "${WORKDIR}/Mesa-${PV}"
#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
do_install_append() {
if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
- sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
+ sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
fi
}
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 1598019..269ae1e 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -13,6 +13,6 @@ S = "${WORKDIR}/git"
#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
do_install_append() {
if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
- sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
+ sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
fi
}
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] mesa: fix sed for MESA_EGL_NO_X11_HEADERS in fido
2015-07-21 17:46 [PATCH] mesa: fix sed for MESA_EGL_NO_X11_HEADERS in fido Tobias Olausson
@ 2015-07-27 15:25 ` Martin Jansa
2015-07-27 18:00 ` Tobias Olausson
0 siblings, 1 reply; 5+ messages in thread
From: Martin Jansa @ 2015-07-27 15:25 UTC (permalink / raw)
To: Tobias Olausson; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3351 bytes --]
On Tue, Jul 21, 2015 at 10:46:11AM -0700, Tobias Olausson wrote:
> In 10.4 versions of mesa, the check for MESA_EGL_NO_X11_HEADERS uses an #ifdef,
> not an #if define().
So this commit which was recently backported to fido branch should be
reverted:
commit 12e467f436fbc22f274558c753f0ac9756ce1071
Author: Robert Yang <liezhi.yang@windriver.com>
AuthorDate: Wed May 6 00:08:35 2015 -0700
Commit: Richard Purdie <richard.purdie@linuxfoundation.org>
CommitDate: Sun Jun 28 09:41:54 2015 +0100
mesa: fix do_install_append
"ifdef MESA_EGL_NO_X11_HEADERS" -> "if defined(MESA_EGL_NO_X11_HEADERS)"
(From OE-Core master rev: 3a464d67b60f70b865f7db768e7edc53e40ff450)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
with proper commit message (preferably separately from
9c746017af381884cc20c7cd563fc429c2c66112 backport), otherwise I like
what this patch is doing.
Thanks
>
> Also, this backports commit 9c746017af381884cc20c7cd563fc429c2c66112
> to fido from master.
>
> Signed-off-by: Tobias Olausson <tobias.olausson@pelagicore.com>
> ---
> meta/recipes-graphics/mesa/mesa_10.4.4.bb | 2 +-
> meta/recipes-graphics/mesa/mesa_git.bb | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-graphics/mesa/mesa_10.4.4.bb b/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> index 90cccbe..a5f510d 100644
> --- a/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> +++ b/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> @@ -11,6 +11,6 @@ S = "${WORKDIR}/Mesa-${PV}"
> #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> do_install_append() {
> if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
> - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> fi
> }
> diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
> index 1598019..269ae1e 100644
> --- a/meta/recipes-graphics/mesa/mesa_git.bb
> +++ b/meta/recipes-graphics/mesa/mesa_git.bb
> @@ -13,6 +13,6 @@ S = "${WORKDIR}/git"
> #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> do_install_append() {
> if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
> - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> fi
> }
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mesa: fix sed for MESA_EGL_NO_X11_HEADERS in fido
2015-07-27 15:25 ` Martin Jansa
@ 2015-07-27 18:00 ` Tobias Olausson
2015-07-30 16:15 ` Joshua Lock
0 siblings, 1 reply; 5+ messages in thread
From: Tobias Olausson @ 2015-07-27 18:00 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 4049 bytes --]
On 27 July 2015 at 08:25, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Tue, Jul 21, 2015 at 10:46:11AM -0700, Tobias Olausson wrote:
> > In 10.4 versions of mesa, the check for MESA_EGL_NO_X11_HEADERS uses an
> #ifdef,
> > not an #if define().
>
> So this commit which was recently backported to fido branch should be
> reverted:
>
Well, reverting the already backported patch would break my patch. I don't
mind resubmitting a new patch, but the one I originally submitted builds on
top of the backported one, so the backported one would be neutralized.
>
> commit 12e467f436fbc22f274558c753f0ac9756ce1071
> Author: Robert Yang <liezhi.yang@windriver.com>
> AuthorDate: Wed May 6 00:08:35 2015 -0700
> Commit: Richard Purdie <richard.purdie@linuxfoundation.org>
> CommitDate: Sun Jun 28 09:41:54 2015 +0100
>
> mesa: fix do_install_append
>
> "ifdef MESA_EGL_NO_X11_HEADERS" -> "if
> defined(MESA_EGL_NO_X11_HEADERS)"
>
> (From OE-Core master rev: 3a464d67b60f70b865f7db768e7edc53e40ff450)
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
>
> with proper commit message (preferably separately from
> 9c746017af381884cc20c7cd563fc429c2c66112 backport), otherwise I like
> what this patch is doing.
>
> Thanks
>
> >
> > Also, this backports commit 9c746017af381884cc20c7cd563fc429c2c66112
> > to fido from master.
> >
> > Signed-off-by: Tobias Olausson <tobias.olausson@pelagicore.com>
> > ---
> > meta/recipes-graphics/mesa/mesa_10.4.4.bb | 2 +-
> > meta/recipes-graphics/mesa/mesa_git.bb | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> b/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> > index 90cccbe..a5f510d 100644
> > --- a/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> > +++ b/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> > @@ -11,6 +11,6 @@ S = "${WORKDIR}/Mesa-${PV}"
> > #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> > do_install_append() {
> > if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false',
> d)}; then
> > - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if
> ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/'
> ${D}${includedir}/EGL/eglplatform.h
> > + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if
> defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG',
> 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> > fi
> > }
> > diff --git a/meta/recipes-graphics/mesa/mesa_git.bb
> b/meta/recipes-graphics/mesa/mesa_git.bb
> > index 1598019..269ae1e 100644
> > --- a/meta/recipes-graphics/mesa/mesa_git.bb
> > +++ b/meta/recipes-graphics/mesa/mesa_git.bb
> > @@ -13,6 +13,6 @@ S = "${WORKDIR}/git"
> > #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> > do_install_append() {
> > if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false',
> d)}; then
> > - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if
> ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/'
> ${D}${includedir}/EGL/eglplatform.h
> > + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if
> defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG',
> 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> > fi
> > }
> > --
> > 2.1.4
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
--
Tobias Olausson
M.Sc
Software Engineer
PELAGICORE | Experience Change
Ekelundsgatan 4, 6tr, SE-411 18 Gothenburg, Sweden
Mobile: +46(0)735-873444
E-Mail: tobias.olausson@pelagicore.com
IRC: wto @ FreeNode
[-- Attachment #2: Type: text/html, Size: 6731 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mesa: fix sed for MESA_EGL_NO_X11_HEADERS in fido
2015-07-27 18:00 ` Tobias Olausson
@ 2015-07-30 16:15 ` Joshua Lock
2015-07-30 18:14 ` Tobias Olausson
0 siblings, 1 reply; 5+ messages in thread
From: Joshua Lock @ 2015-07-30 16:15 UTC (permalink / raw)
To: openembedded-core
On Mon, 2015-07-27 at 11:00 -0700, Tobias Olausson wrote:
> On 27 July 2015 at 08:25, Martin Jansa <martin.jansa@gmail.com>
> wrote:
> > On Tue, Jul 21, 2015 at 10:46:11AM -0700, Tobias Olausson wrote:
> > > In 10.4 versions of mesa, the check for MESA_EGL_NO_X11_HEADERS
> > uses an #ifdef,
> > > not an #if define().
> >
> > So this commit which was recently backported to fido branch should
> > be
> > reverted:
> Well, reverting the already backported patch would break my patch. I
> don't mind resubmitting a new patch, but the one I originally
> submitted builds on top of the backported one, so the backported one
> would be neutralized.
Ideally you'd submit a series of patches with 1) a patch to revert the
already backported patch below and 2) a patch to backport the change
from 9c746017af381884cc20c7cd563fc429c2c66112.
That would give us nice clean git history (making future patch
backporting easier) and mean next to no work for me.
Does that seem reasonable?
Regards,
Joshua
> >
> > commit 12e467f436fbc22f274558c753f0ac9756ce1071
> > Author: Robert Yang <liezhi.yang@windriver.com>
> > AuthorDate: Wed May 6 00:08:35 2015 -0700
> > Commit: Richard Purdie <richard.purdie@linuxfoundation.org>
> > CommitDate: Sun Jun 28 09:41:54 2015 +0100
> >
> > mesa: fix do_install_append
> >
> > "ifdef MESA_EGL_NO_X11_HEADERS" -> "if
> > defined(MESA_EGL_NO_X11_HEADERS)"
> >
> > (From OE-Core master rev:
> > 3a464d67b60f70b865f7db768e7edc53e40ff450)
> >
> > Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> > Signed-off-by: Richard Purdie <
> > richard.purdie@linuxfoundation.org>
> > Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
> >
> > with proper commit message (preferably separately from
> > 9c746017af381884cc20c7cd563fc429c2c66112 backport), otherwise I
> > like
> > what this patch is doing.
> >
> > Thanks
> >
> > >
> > > Also, this backports commit
> > 9c746017af381884cc20c7cd563fc429c2c66112
> > > to fido from master.
> > >
> > > Signed-off-by: Tobias Olausson <tobias.olausson@pelagicore.com>
> > > ---
> > > meta/recipes-graphics/mesa/mesa_10.4.4.bb | 2 +-
> > > meta/recipes-graphics/mesa/mesa_git.bb | 2 +-
> > > 2 files changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> > b/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> > > index 90cccbe..a5f510d 100644
> > > --- a/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> > > +++ b/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> > > @@ -11,6 +11,6 @@ S = "${WORKDIR}/Mesa-${PV}"
> > > #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> > > do_install_append() {
> > > if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true',
> > 'false', d)}; then
> > > - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if
> > ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/'
> > ${D}${includedir}/EGL/eglplatform.h
> > > + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if
> > defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECO
> > NFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> > > fi
> > > }
> > > diff --git a/meta/recipes-graphics/mesa/mesa_git.bb
> > b/meta/recipes-graphics/mesa/mesa_git.bb
> > > index 1598019..269ae1e 100644
> > > --- a/meta/recipes-graphics/mesa/mesa_git.bb
> > > +++ b/meta/recipes-graphics/mesa/mesa_git.bb
> > > @@ -13,6 +13,6 @@ S = "${WORKDIR}/git"
> > > #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> > > do_install_append() {
> > > if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true',
> > 'false', d)}; then
> > > - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if
> > ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/'
> > ${D}${includedir}/EGL/eglplatform.h
> > > + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if
> > defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECO
> > NFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> > > fi
> > > }
> > > --
> > > 2.1.4
> > >
> > > --
> > > _______________________________________________
> > > Openembedded-core mailing list
> > > Openembedded-core@lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> >
> > --
> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> >
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] mesa: fix sed for MESA_EGL_NO_X11_HEADERS in fido
2015-07-30 16:15 ` Joshua Lock
@ 2015-07-30 18:14 ` Tobias Olausson
0 siblings, 0 replies; 5+ messages in thread
From: Tobias Olausson @ 2015-07-30 18:14 UTC (permalink / raw)
To: Joshua Lock; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 5476 bytes --]
Sure, I'll submit two new patches in a minute.
//Tobias
On 30 July 2015 at 09:15, Joshua Lock <joshua.lock@collabora.co.uk> wrote:
> On Mon, 2015-07-27 at 11:00 -0700, Tobias Olausson wrote:
> > On 27 July 2015 at 08:25, Martin Jansa <martin.jansa@gmail.com>
> > wrote:
> > > On Tue, Jul 21, 2015 at 10:46:11AM -0700, Tobias Olausson wrote:
> > > > In 10.4 versions of mesa, the check for MESA_EGL_NO_X11_HEADERS
> > > uses an #ifdef,
> > > > not an #if define().
> > >
> > > So this commit which was recently backported to fido branch should
> > > be
> > > reverted:
> > Well, reverting the already backported patch would break my patch. I
> > don't mind resubmitting a new patch, but the one I originally
> > submitted builds on top of the backported one, so the backported one
> > would be neutralized.
>
> Ideally you'd submit a series of patches with 1) a patch to revert the
> already backported patch below and 2) a patch to backport the change
> from 9c746017af381884cc20c7cd563fc429c2c66112.
>
> That would give us nice clean git history (making future patch
> backporting easier) and mean next to no work for me.
>
> Does that seem reasonable?
>
> Regards,
>
> Joshua
>
> > >
> > > commit 12e467f436fbc22f274558c753f0ac9756ce1071
> > > Author: Robert Yang <liezhi.yang@windriver.com>
> > > AuthorDate: Wed May 6 00:08:35 2015 -0700
> > > Commit: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > CommitDate: Sun Jun 28 09:41:54 2015 +0100
> > >
> > > mesa: fix do_install_append
> > >
> > > "ifdef MESA_EGL_NO_X11_HEADERS" -> "if
> > > defined(MESA_EGL_NO_X11_HEADERS)"
> > >
> > > (From OE-Core master rev:
> > > 3a464d67b60f70b865f7db768e7edc53e40ff450)
> > >
> > > Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> > > Signed-off-by: Richard Purdie <
> > > richard.purdie@linuxfoundation.org>
> > > Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
> > >
> > > with proper commit message (preferably separately from
> > > 9c746017af381884cc20c7cd563fc429c2c66112 backport), otherwise I
> > > like
> > > what this patch is doing.
> > >
> > > Thanks
> > >
> > > >
> > > > Also, this backports commit
> > > 9c746017af381884cc20c7cd563fc429c2c66112
> > > > to fido from master.
> > > >
> > > > Signed-off-by: Tobias Olausson <tobias.olausson@pelagicore.com>
> > > > ---
> > > > meta/recipes-graphics/mesa/mesa_10.4.4.bb | 2 +-
> > > > meta/recipes-graphics/mesa/mesa_git.bb | 2 +-
> > > > 2 files changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> > > b/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> > > > index 90cccbe..a5f510d 100644
> > > > --- a/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> > > > +++ b/meta/recipes-graphics/mesa/mesa_10.4.4.bb
> > > > @@ -11,6 +11,6 @@ S = "${WORKDIR}/Mesa-${PV}"
> > > > #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> > > > do_install_append() {
> > > > if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true',
> > > 'false', d)}; then
> > > > - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if
> > > ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/'
> > > ${D}${includedir}/EGL/eglplatform.h
> > > > + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if
> > > defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECO
> > > NFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> > > > fi
> > > > }
> > > > diff --git a/meta/recipes-graphics/mesa/mesa_git.bb
> > > b/meta/recipes-graphics/mesa/mesa_git.bb
> > > > index 1598019..269ae1e 100644
> > > > --- a/meta/recipes-graphics/mesa/mesa_git.bb
> > > > +++ b/meta/recipes-graphics/mesa/mesa_git.bb
> > > > @@ -13,6 +13,6 @@ S = "${WORKDIR}/git"
> > > > #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> > > > do_install_append() {
> > > > if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true',
> > > 'false', d)}; then
> > > > - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if
> > > ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/'
> > > ${D}${includedir}/EGL/eglplatform.h
> > > > + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if
> > > defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECO
> > > NFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
> > > > fi
> > > > }
> > > > --
> > > > 2.1.4
> > > >
> > > > --
> > > > _______________________________________________
> > > > Openembedded-core mailing list
> > > > Openembedded-core@lists.openembedded.org
> > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> > >
> > > --
> > > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> > >
> >
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
--
Tobias Olausson
M.Sc
Software Engineer
PELAGICORE | Experience Change
Ekelundsgatan 4, 6tr, SE-411 18 Gothenburg, Sweden
Mobile: +46(0)735-873444
E-Mail: tobias.olausson@pelagicore.com
IRC: wto @ FreeNode
[-- Attachment #2: Type: text/html, Size: 9139 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-07-30 18:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-21 17:46 [PATCH] mesa: fix sed for MESA_EGL_NO_X11_HEADERS in fido Tobias Olausson
2015-07-27 15:25 ` Martin Jansa
2015-07-27 18:00 ` Tobias Olausson
2015-07-30 16:15 ` Joshua Lock
2015-07-30 18:14 ` Tobias Olausson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox