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.nie...@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.nie...@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
