<div dir="ltr"><div>Sure, I'll submit two new patches in a minute.<br><br></div>//Tobias<br></div><div class="gmail_extra"><br><div class="gmail_quote">On 30 July 2015 at 09:15, Joshua Lock <span dir="ltr"><<a href="mailto:joshua.lock@collabora.co.uk" target="_blank">joshua.lock@collabora.co.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Mon, 2015-07-27 at 11:00 -0700, Tobias Olausson wrote:<br>
> On 27 July 2015 at 08:25, Martin Jansa <<a href="mailto:martin.jansa@gmail.com">martin.jansa@gmail.com</a>><br>
> wrote:<br>
> > On Tue, Jul 21, 2015 at 10:46:11AM -0700, Tobias Olausson wrote:<br>
> > > In 10.4 versions of mesa, the check for MESA_EGL_NO_X11_HEADERS<br>
> > uses an #ifdef,<br>
> > > not an #if define().<br>
> ><br>
> > So this commit which was recently backported to fido branch should<br>
> > be<br>
> > reverted:<br>
> Well, reverting the already backported patch would break my patch. I<br>
> don't mind resubmitting a new patch, but the one I originally<br>
> submitted builds on top of the backported one, so the backported one<br>
> would be neutralized.<br>
<br>
</span>Ideally you'd submit a series of patches with 1) a patch to revert the<br>
already backported patch below and 2) a patch to backport the change<br>
from 9c746017af381884cc20c7cd563fc429c2c66112.<br>
<br>
That would give us nice clean git history (making future patch<br>
backporting easier) and mean next to no work for me.<br>
<br>
Does that seem reasonable?<br>
<br>
Regards,<br>
<br>
Joshua<br>
<div class="HOEnZb"><div class="h5"><br>
> ><br>
> > commit 12e467f436fbc22f274558c753f0ac9756ce1071<br>
> > Author: Robert Yang <<a href="mailto:liezhi.yang@windriver.com">liezhi.yang@windriver.com</a>><br>
> > AuthorDate: Wed May 6 00:08:35 2015 -0700<br>
> > Commit: Richard Purdie <<a href="mailto:richard.purdie@linuxfoundation.org">richard.purdie@linuxfoundation.org</a>><br>
> > CommitDate: Sun Jun 28 09:41:54 2015 +0100<br>
> ><br>
> > mesa: fix do_install_append<br>
> ><br>
> > "ifdef MESA_EGL_NO_X11_HEADERS" -> "if<br>
> > defined(MESA_EGL_NO_X11_HEADERS)"<br>
> ><br>
> > (From OE-Core master rev:<br>
> > 3a464d67b60f70b865f7db768e7edc53e40ff450)<br>
> ><br>
> > Signed-off-by: Robert Yang <<a href="mailto:liezhi.yang@windriver.com">liezhi.yang@windriver.com</a>><br>
> > Signed-off-by: Richard Purdie <<br>
> > <a href="mailto:richard.purdie@linuxfoundation.org">richard.purdie@linuxfoundation.org</a>><br>
> > Signed-off-by: Joshua Lock <<a href="mailto:joshua.lock@collabora.co.uk">joshua.lock@collabora.co.uk</a>><br>
> ><br>
> > with proper commit message (preferably separately from<br>
> > 9c746017af381884cc20c7cd563fc429c2c66112 backport), otherwise I<br>
> > like<br>
> > what this patch is doing.<br>
> ><br>
> > Thanks<br>
> ><br>
> > ><br>
> > > Also, this backports commit<br>
> > 9c746017af381884cc20c7cd563fc429c2c66112<br>
> > > to fido from master.<br>
> > ><br>
> > > Signed-off-by: Tobias Olausson <<a href="mailto:tobias.olausson@pelagicore.com">tobias.olausson@pelagicore.com</a>><br>
> > > ---<br>
> > > meta/recipes-graphics/mesa/<a href="http://mesa_10.4.4.bb" rel="noreferrer" target="_blank">mesa_10.4.4.bb</a> | 2 +-<br>
> > > meta/recipes-graphics/mesa/<a href="http://mesa_git.bb" rel="noreferrer" target="_blank">mesa_git.bb</a> | 2 +-<br>
> > > 2 files changed, 2 insertions(+), 2 deletions(-)<br>
> > ><br>
> > > diff --git a/meta/recipes-graphics/mesa/<a href="http://mesa_10.4.4.bb" rel="noreferrer" target="_blank">mesa_10.4.4.bb</a><br>
> > b/meta/recipes-graphics/mesa/<a href="http://mesa_10.4.4.bb" rel="noreferrer" target="_blank">mesa_10.4.4.bb</a><br>
> > > index 90cccbe..a5f510d 100644<br>
> > > --- a/meta/recipes-graphics/mesa/<a href="http://mesa_10.4.4.bb" rel="noreferrer" target="_blank">mesa_10.4.4.bb</a><br>
> > > +++ b/meta/recipes-graphics/mesa/<a href="http://mesa_10.4.4.bb" rel="noreferrer" target="_blank">mesa_10.4.4.bb</a><br>
> > > @@ -11,6 +11,6 @@ S = "${WORKDIR}/Mesa-${PV}"<br>
> > > #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER<br>
> > > do_install_append() {<br>
> > > if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true',<br>
> > 'false', d)}; then<br>
> > > - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if<br>
> > ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/'<br>
> > ${D}${includedir}/EGL/eglplatform.h<br>
> > > + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if<br>
> > defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECO<br>
> > NFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h<br>
> > > fi<br>
> > > }<br>
> > > diff --git a/meta/recipes-graphics/mesa/<a href="http://mesa_git.bb" rel="noreferrer" target="_blank">mesa_git.bb</a><br>
> > b/meta/recipes-graphics/mesa/<a href="http://mesa_git.bb" rel="noreferrer" target="_blank">mesa_git.bb</a><br>
> > > index 1598019..269ae1e 100644<br>
> > > --- a/meta/recipes-graphics/mesa/<a href="http://mesa_git.bb" rel="noreferrer" target="_blank">mesa_git.bb</a><br>
> > > +++ b/meta/recipes-graphics/mesa/<a href="http://mesa_git.bb" rel="noreferrer" target="_blank">mesa_git.bb</a><br>
> > > @@ -13,6 +13,6 @@ S = "${WORKDIR}/git"<br>
> > > #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER<br>
> > > do_install_append() {<br>
> > > if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true',<br>
> > 'false', d)}; then<br>
> > > - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)/#if<br>
> > ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/'<br>
> > ${D}${includedir}/EGL/eglplatform.h<br>
> > > + sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if<br>
> > defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECO<br>
> > NFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h<br>
> > > fi<br>
> > > }<br>
> > > --<br>
> > > 2.1.4<br>
> > ><br>
> > > --<br>
> > > _______________________________________________<br>
> > > Openembedded-core mailing list<br>
> > > <a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
> > > <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
> ><br>
> > --<br>
> > Martin 'JaMa' Jansa jabber: <a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a><br>
> ><br>
><br>
><br>
> --<br>
> _______________________________________________<br>
> Openembedded-core mailing list<br>
> <a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div dir="ltr"><div>Tobias Olausson<br></div><div>M.Sc</div><div>Software Engineer</div><div><div><br></div><div>PELAGICORE | Experience Change</div><div>Ekelundsgatan 4, 6tr, SE-411 18 Gothenburg, Sweden<br></div><div>Mobile: +46(0)735-873444<br>E-Mail: <a href="mailto:tobias.olausson@pelagicore.com" target="_blank">tobias.olausson@pelagicore.com</a> <br></div></div><div>IRC: wto @ FreeNode</div></div></div></div></div></div>
</div>