From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX1pC-0005H6-Qr for guix-patches@gnu.org; Wed, 12 Dec 2018 05:33:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX1p8-0005FQ-Ic for guix-patches@gnu.org; Wed, 12 Dec 2018 05:33:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:40281) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gX1p8-0005FI-C3 for guix-patches@gnu.org; Wed, 12 Dec 2018 05:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gX1p8-0001K1-8u for guix-patches@gnu.org; Wed, 12 Dec 2018 05:33:02 -0500 Subject: [bug#33716] [PATCH staging] gnu: mesa: Update to 18.3.1. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX1o8-00056F-2I for guix-patches@gnu.org; Wed, 12 Dec 2018 05:32:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX1o4-0004jK-2I for guix-patches@gnu.org; Wed, 12 Dec 2018 05:32:00 -0500 Received: from mx.kolabnow.com ([95.128.36.42]:29858) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX1o3-0004ie-IX for guix-patches@gnu.org; Wed, 12 Dec 2018 05:31:55 -0500 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTP id 8BDE940506 for ; Wed, 12 Dec 2018 11:31:53 +0100 (CET) Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9t7tq8cyQjZa for ; Wed, 12 Dec 2018 11:31:52 +0100 (CET) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by ext-mx-out003.mykolab.com (Postfix) with ESMTPS id 51A25404EF for ; Wed, 12 Dec 2018 11:31:52 +0100 (CET) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx003.mykolab.com (Postfix) with ESMTPS id 0C129A35 for ; Wed, 12 Dec 2018 11:31:51 +0100 (CET) Date: Wed, 12 Dec 2018 11:31:33 +0100 From: Rutger Helling Message-ID: <20181212113133.0250a68f@mykolab.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/+hV3dkIx08u+WFOqzp5ov.A"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33716@debbugs.gnu.org --Sig_/+hV3dkIx08u+WFOqzp5ov.A Content-Type: multipart/mixed; boundary="MP_/y+f0jUkMEiEGwlv8oRs34Nz" --MP_/y+f0jUkMEiEGwlv8oRs34Nz Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hey Guix, Here's a Mesa update for the just released 18.3.1 version. Not sure whether or not I'm too late for the staging branch. If I am this can wait until the next staging branch. Two things to note: * While Mesa 18.3.x still builds with LLVM 6 the upcoming 19.0.x series doesn't anymore. For that and performance reasons I decided to add a llvm@7.0.0 package for Mesa. I don't know enough about the LLVM stack to upgrade it entirely, so this is kind of a workaround. * Since Mesa 18.3 works with Python 3 I've replaced the Python 2 dependencies with Python 3 ones. --MP_/y+f0jUkMEiEGwlv8oRs34Nz Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-Add-llvm-7.0.0.patch =46rom a8877a810e1b957284893aefc1d298517a262504 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 12 Dec 2018 08:41:42 +0100 Subject: [PATCH 1/2] gnu: Add llvm@7.0.0. * gnu/packages/llvm.scm (llvm@7.0.0): New variable. --- gnu/packages/llvm.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 4be86f3d2..ed2ad6b1d 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -95,6 +95,19 @@ languages is in development. The compiler infrastructur= e includes mirror sets of programming tools as well as libraries with equivalent functionality.") (license license:ncsa))) =20 +(define-public llvm-7.0.0 + (package (inherit llvm) + (name "llvm") + (version "7.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "http://llvm.org/releases/" + version "/llvm-" version ".src.tar.xz")) + (sha256 + (base32 + "08p27wv1pr9ql2zc3f3qkkymci46q7myvh8r5ijippnbwr2gihcb")))))) + (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) (package --=20 2.20.0 --MP_/y+f0jUkMEiEGwlv8oRs34Nz Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-gnu-mesa-Update-to-18.3.1.patch =46rom 05c7ad44062de775ec4b1443b809a417f9bd37a8 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 12 Dec 2018 08:42:55 +0100 Subject: [PATCH 2/2] gnu: mesa: Update to 18.3.1. * gnu/packages/gl.scm (mesa): Update to 18.3.1. [inputs]: Use llvm@7.0.0 instead of llvm. [native-inputs]: Use python instead of python-2. Use python-mako instead of python2-mako. --- gnu/packages/gl.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 1bf53bcbb..8d4f14fb4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -221,7 +221,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.2.6") + (version "18.3.1") (source (origin (method url-fetch) @@ -233,7 +233,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "04nwxykmc80gicmal0zkk8is34rmbqawmfckirqhrps9h97zmfly")) + "0qyw9dj2p9n91qzc4ylck2an7ibssjvzi2bjcpv2ajk851yq47sv")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) @@ -257,7 +257,7 @@ also known as DXTn or DXTC) for Mesa.") ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - `(("llvm" ,llvm))) + `(("llvm" ,llvm-7.0.0))) (_ `())) ("makedepend" ,makedepend) @@ -265,8 +265,8 @@ also known as DXTn or DXTC) for Mesa.") ("wayland-protocols" ,wayland-protocols))) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python-2) - ("python2-mako" ,python2-mako) + ("python" ,python) + ("python-mako" ,python-mako) ("which" ,(@ (gnu packages base) which)))) (arguments `(#:configure-flags --=20 2.20.0 --MP_/y+f0jUkMEiEGwlv8oRs34Nz-- --Sig_/+hV3dkIx08u+WFOqzp5ov.A Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlwQ44UACgkQ86cn20T8 yjbOHAf/amN/v0wuUQoJH2XnXgf3h7pXefof7+Y3pxD4araa16+hWA4/925DHVcz yp8/gXLiQWFP69AmOpnmF9mt1KjCbVXk2j8dP4ebjlEeKGc4YVtXIkQ2pej4k8tt b6nwfsPps/floHDpcUOnJryiMNd0R11KZ8IWWHAnWMio6/vHEGXK2btZ035CLmJK 9hBtisA7Hk95racE0EBzw3FAJBTgVzRXPm4OUTDAtoWFkmYtaonluAwTUsjA9unk SExNrskjG7xFfpHeyITV3fNXylneIJhD3vMzZEEFDdywXwfuNs/LHgw66n9R2uFb +Fp4jyLCCVcusnl/zg4HFoWY76r5KQ== =LL4c -----END PGP SIGNATURE----- --Sig_/+hV3dkIx08u+WFOqzp5ov.A--