Re: [OE-core] [PATCH] mesa: fix sed for MESA_EGL_NO_X11_HEADERS in fido
Sure, I'll submit two new patches in a minute. //Tobias On 30 July 2015 at 09:15, Joshua Lock wrote: > On Mon, 2015-07-27 at 11:00 -0700, Tobias Olausson wrote: > > On 27 July 2015 at 08:25, Martin Jansa > > 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 > > > AuthorDate: Wed May 6 00:08:35 2015 -0700 > > > Commit: Richard Purdie > > > 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 > > > Signed-off-by: Richard Purdie < > > > richard.pur...@linuxfoundation.org> > > > Signed-off-by: Joshua Lock > > > > > > 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 > > > > --- > > > > 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.ja...@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 Ekelundsg
Re: [OE-core] [PATCH] mesa: fix sed for MESA_EGL_NO_X11_HEADERS in fido
On Mon, 2015-07-27 at 11:00 -0700, Tobias Olausson wrote: > On 27 July 2015 at 08:25, Martin Jansa > 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 > > AuthorDate: Wed May 6 00:08:35 2015 -0700 > > Commit: Richard Purdie > > 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 > > Signed-off-by: Richard Purdie < > > richard.pur...@linuxfoundation.org> > > Signed-off-by: Joshua Lock > > > > 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 > > > --- > > > 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.ja...@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
Re: [OE-core] [PATCH] mesa: fix sed for MESA_EGL_NO_X11_HEADERS in fido
On 27 July 2015 at 08:25, Martin Jansa 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 > AuthorDate: Wed May 6 00:08:35 2015 -0700 > Commit: Richard Purdie > 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 > Signed-off-by: Richard Purdie > Signed-off-by: Joshua Lock > > 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 > > --- > > 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.ja...@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.olaus...@pelagicore.com IRC: wto @ FreeNode -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mesa: fix sed for MESA_EGL_NO_X11_HEADERS in fido
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 AuthorDate: Wed May 6 00:08:35 2015 -0700 Commit: Richard Purdie 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 Signed-off-by: Richard Purdie Signed-off-by: Joshua Lock 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 > --- > 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.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mesa: fix sed for MESA_EGL_NO_X11_HEADERS in fido
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 --- 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