mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Markus Niebel <niebelm@tqsc.de>
To: ptxdist@pengutronix.de
Cc: m.olbrich@pengutronix.de, Markus Niebel <Markus.Niebel@tq-group.com>
Subject: Re: [ptxdist] [PATCH 2/5] mesalib: version bump 13.0.2 -> 17.0.1
Date: Thu, 09 Mar 2017 12:27:17 +0100	[thread overview]
Message-ID: <1489058837.3690.2.camel@niebel-ws> (raw)
In-Reply-To: <6dd15fcd-76c9-f7d5-6ba2-85c0e994d9cc@pengutronix.de>

Am Donnerstag, den 09.03.2017, 11:39 +0100 schrieb Marc Kleine-Budde:
> * PGP Signed by an unknown key
> 
> On 03/09/2017 11:05 AM, Markus Niebel wrote:
> > From: Markus Niebel <Markus.Niebel@tq-group.com>
> > 
> > - add support for etnaviv
> > - update config opts
> > - add fallback download URL (newest mesalib seems to live there)
> > 
> > Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
> > ---
> >  rules/host-mesalib.in   |  1 +
> >  rules/host-mesalib.make |  2 --
> >  rules/mesalib.in        | 20 ++++++++++++++++++++
> >  rules/mesalib.make      | 25 ++++++++++++++++++-------
> >  4 files changed, 39 insertions(+), 9 deletions(-)
> > 
> > diff --git a/rules/host-mesalib.in b/rules/host-mesalib.in
> > index 1bf56ae..29a6a22 100644
> > --- a/rules/host-mesalib.in
> > +++ b/rules/host-mesalib.in
> > @@ -6,4 +6,5 @@ config HOST_MESALIB
> >  	select HOST_MAKEDEPEND
> >  	select HOST_SYSTEM_PYTHON
> >  	select HOST_SYSTEM_PYTHON_XML2
> > +	select HOST_SYSTEM_PYTHON_MAKO
> >  	select HOST_LIBPTHREAD_STUBS
> > diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
> > index 1619d20..48702ac 100644
> > --- a/rules/host-mesalib.make
> > +++ b/rules/host-mesalib.make
> > @@ -53,7 +53,6 @@ HOST_MESALIB_CONF_OPT	:= \
> >  	--disable-opencl \
> >  	--disable-opencl-icd \
> >  	--disable-gallium-tests \
> > -	--disable-shader-cache \
> >  	--enable-shared-glapi \
> >  	--disable-glx-read-only-text \
> >  	--disable-driglx-direct \
> > @@ -61,7 +60,6 @@ HOST_MESALIB_CONF_OPT	:= \
> >  	--disable-llvm-shared-libs \
> >  	--disable-gallium-llvm \
> >  	--disable-libglvnd \
> > -	--with-sha1= \
> >  	--with-gallium-drivers= \
> >  	--with-dri-drivers= \
> >  	--without-vulkan-drivers
> > diff --git a/rules/mesalib.in b/rules/mesalib.in
> > index 430c94e..a4daf2d 100644
> > --- a/rules/mesalib.in
> > +++ b/rules/mesalib.in
> > @@ -7,6 +7,10 @@ menuconfig MESALIB
> >  	select HOST_MAKEDEPEND
> >  	select HOST_SYSTEM_PYTHON
> >  	select HOST_SYSTEM_PYTHON_XML2
> > +<<<<<<< HEAD
> > +=======
> > +	select HOST_SYSTEM_PYTHON_MAKO
> > +>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0
> 
> This looks like some merge conflics left over.
> 

Indeed - I sorted out a bunch of patches. Sorry, will resend the
patches.

> Marc
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de



_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

  reply	other threads:[~2017-03-09 11:27 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-09 10:05 [ptxdist] [PATCH 0/5] update drm / mesa support and add testtools Markus Niebel
2017-03-09 10:05 ` [ptxdist] [PATCH 1/5] host-system-python: add check for mako Markus Niebel
2017-03-09 10:05 ` [ptxdist] [PATCH 2/5] mesalib: version bump 13.0.2 -> 17.0.1 Markus Niebel
2017-03-09 10:39   ` Marc Kleine-Budde
2017-03-09 11:27     ` Markus Niebel [this message]
2017-03-09 10:05 ` [ptxdist] [PATCH 3/5] libdrm: version bump 2.7.74 -> 2.7.75 Markus Niebel
2017-03-09 10:05 ` [ptxdist] [PATCH 4/5] kmscube: add new package Markus Niebel
2017-03-09 10:05 ` [ptxdist] [PATCH 5/5] glmark2: " Markus Niebel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1489058837.3690.2.camel@niebel-ws \
    --to=niebelm@tqsc.de \
    --cc=Markus.Niebel@tq-group.com \
    --cc=m.olbrich@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox