> -----Ursprüngliche Nachricht----- > Von: Emil Velikov > Gesendet: Dienstag, 8. März 2016 18:52 > Betreff: Re: [Mesa-dev] [PATCH] scons: build osmesa swrast and gallium > > >> -----Ursprüngliche Nachricht----- > >> Von: Emil Velikov [mailto:emil.l.veli...@gmail.com] > >> Gesendet: Dienstag, 8. März 2016 12:33 > >> > >> On 8 March 2016 at 11:04, Andreas Fänger <a.faen...@e-sign.com> > wrote: > >> > This patch makes it possible to build classic osmesa/swrast on > >> > windows again. It was removed in commit > >> 69db422218b0264b5b8eef45bd003a2544e9cbd6. > >> > Although there is a gallium version of osmesa now, the swrast > >> > version still has more features lacking in llvmpipe, e.g. anisotropic > filtering. > >> > --- > >> > src/mesa/drivers/SConscript | 2 + > >> > src/mesa/drivers/osmesa/SConscript | 40 > >> ++++++++++++++++++++++++++++++++++++ > >> > src/mesa/drivers/osmesa/osmesa.def | 15 +++++++++++++ > >> > 3 files changed, 57 insertions(+), 0 deletions(-) create mode > >> > 100644 src/mesa/drivers/osmesa/SConscript > >> > create mode 100644 src/mesa/drivers/osmesa/osmesa.def > >> > > >> Please squash a revert of c07df0f2014636b601cdbaff63214296599b1ad5. > >> Otherwise the release tarball will be missing these files. > > > > Hi Emil, > > > > I don't have a lot of experience with git, so I'm not sure what I have > > to do. Does this mean without the proposed changes the patch will not be > part of the upcoming 11.2.0 release, but will be included in a later release? > > > Applying the suggestion has nothing to do with this ending up in > 11.2.0 release. For that one should add the following line (stable > tag) in the commit message: > > Cc: "11.2" <mesa-sta...@lists.freedesktop.org> > > On the topic of git... things are quite trivial actually. > > # start from mesa/master > $ git revert 69db422218b0264b5b8eef45bd003a2544e9cbd6 > # editor pops up and you fill in the justification/commit message $ git revert > c07df0f2014636b601cdbaff63214296599b1ad5 > # editor pops up. mention something like the thing I did - a few lines above. > $ git rebase -i HEAD~2 > # change the 'pick' in front of the second commit to "squash" > $ git commit --amend > # add the stable tag so that we pick the commit to the 11.2 branch. > > If you want to be extra nice, you can version the patch (git format- > patch/send-email -v2) thus one doesn't end up picking the old patch :-) > > Personally I would do the above (I am pedantic at times), although it'll be > up- > to Brian and others to decide. >
Ok, thanks. Did you see my other patch? Would that be ok or do I have to send in another one created with the commands you have described? Andreas _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
