From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: References: <1489053954-17566-1-git-send-email-niebelm@tqsc.de> <1489053954-17566-3-git-send-email-niebelm@tqsc.de> From: Marc Kleine-Budde Message-ID: <6dd15fcd-76c9-f7d5-6ba2-85c0e994d9cc@pengutronix.de> Date: Thu, 9 Mar 2017 11:39:52 +0100 MIME-Version: 1.0 In-Reply-To: <1489053954-17566-3-git-send-email-niebelm@tqsc.de> Subject: Re: [ptxdist] [PATCH 2/5] mesalib: version bump 13.0.2 -> 17.0.1 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: multipart/mixed; boundary="===============2045659726==" Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: m.olbrich@pengutronix.de, Markus Niebel This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============2045659726== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="wGO0SGQSJEQFXbnxbiJ6HKa3CMKaILLI5" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --wGO0SGQSJEQFXbnxbiJ6HKa3CMKaILLI5 Content-Type: multipart/mixed; boundary="PXkh5Eu8eQIIiBbqtPGWPc8GF7HL2t2po"; protected-headers="v1" From: Marc Kleine-Budde To: ptxdist@pengutronix.de Cc: m.olbrich@pengutronix.de, Markus Niebel Message-ID: <6dd15fcd-76c9-f7d5-6ba2-85c0e994d9cc@pengutronix.de> Subject: Re: [ptxdist] [PATCH 2/5] mesalib: version bump 13.0.2 -> 17.0.1 References: <1489053954-17566-1-git-send-email-niebelm@tqsc.de> <1489053954-17566-3-git-send-email-niebelm@tqsc.de> In-Reply-To: <1489053954-17566-3-git-send-email-niebelm@tqsc.de> --PXkh5Eu8eQIIiBbqtPGWPc8GF7HL2t2po Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 03/09/2017 11:05 AM, Markus Niebel wrote: > From: Markus Niebel >=20 > - add support for etnaviv > - update config opts > - add fallback download URL (newest mesalib seems to live there) >=20 > Signed-off-by: Markus Niebel > --- > 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(-) >=20 > 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 :=3D \ > --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 :=3D \ > --disable-llvm-shared-libs \ > --disable-gallium-llvm \ > --disable-libglvnd \ > - --with-sha1=3D \ > --with-gallium-drivers=3D \ > --with-dri-drivers=3D \ > --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 > +=3D=3D=3D=3D=3D=3D=3D > + select HOST_SYSTEM_PYTHON_MAKO > +>>>>>>> 27c7b2f... mesalib: version bump 13.0.2 -> 17.0 This looks like some merge conflics left over. Marc --=20 Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | --PXkh5Eu8eQIIiBbqtPGWPc8GF7HL2t2po-- --wGO0SGQSJEQFXbnxbiJ6HKa3CMKaILLI5 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEE4bay/IylYqM/npjQHv7KIOw4HPYFAljBMPgACgkQHv7KIOw4 HPaVRgf8DEX+Dh9qGLpbvDETHiL/7+KDuC1KTIa3GAFt2T8tyTPB1oR2WXvUzgtY 71UhzKBlJJ4eIMsijWgMc24uF9iqPH5HFRRiaQtLKXSK1swKsgwSzHsbT2PJ2XAy hDR6XcA7cUDgQdTdX4RqohBpQ3OpNz+rb/gX5c9XnPPOGVtaaYv7vU3ObVIBZsdk gAzRI0a/Z3oulmsqkF+/X1xqGtmRe9SsANmAlObb1GZglf+X3SCyQ8d6cZwW84xm KAlneyqJSwgv/wfHEhPKElB0Zl7ukhUfg+Cu976bav6xHYUquQm8gShWMNd/btln P1Nz07LnTSXp0xLndAygRVGsl8cpQQ== =tjr0 -----END PGP SIGNATURE----- --wGO0SGQSJEQFXbnxbiJ6HKa3CMKaILLI5-- --===============2045659726== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KcHR4ZGlzdCBt YWlsaW5nIGxpc3QKcHR4ZGlzdEBwZW5ndXRyb25peC5kZQ== --===============2045659726==--