From patchwork Wed Dec 12 10:31:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutger Helling X-Patchwork-Id: 459 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DC2C816929; Wed, 12 Dec 2018 10:33:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTP id 69AD716927 for ; Wed, 12 Dec 2018 10:33:16 +0000 (GMT) Received: from localhost ([::1]:43755 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX1pM-0005HE-0i for patchwork@mira.cbaines.net; Wed, 12 Dec 2018 05:33:16 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#33716] [PATCH staging] gnu: mesa: Update to 18.3.1. Resent-From: Rutger Helling Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Dec 2018 10:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33716 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33716@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15446107295003 (code B ref -1); Wed, 12 Dec 2018 10:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Dec 2018 10:32:09 +0000 Received: from localhost ([127.0.0.1]:44539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gX1oH-0001Ic-9x for submit@debbugs.gnu.org; Wed, 12 Dec 2018 05:32:09 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44073) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gX1oF-0001IN-TN for submit@debbugs.gnu.org; Wed, 12 Dec 2018 05:32:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX1o9-0004mv-HW for submit@debbugs.gnu.org; Wed, 12 Dec 2018 05:32:02 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:60759) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gX1o9-0004mp-Aj for submit@debbugs.gnu.org; Wed, 12 Dec 2018 05:32:01 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:message-id:subject :subject:from:from:date:date:received:received:received; s= dkim20160331; t=1544610712; x=1546425113; bh=4Eq7raRxxcpWHlTPGrG xgsxxrFd3xl1xPHBsNib2DWU=; b=gil/yqOALhFljx0KMR/IZtoW43p59THz9HT p/MPSq445FoGQ3A80CKsg+frgeWGeRcVsAKf4s+ZpE3B4LE4d+HOVzSGRFZ3VC+m JcI+uhSXAwJQ9IlkItrCw5HF9crPlJhZb2VIECO4G79O+LK12UVYxhMTsuPEYLjq JuTVldjG47HaafBz9QO5oGZ63F66rHCu2zYNboiZKN6GWoodY6wvCHZlkb8piWfH VYjRwtH8keyj3RB4jdfUeMeF8WUz/Ti5gyK6tiEMYRq1OU2pgA9iBRfxVfmOXeCy T8aALoIonlJFrjSNHqbMkMJVkCOX8Xk8MXlwy7aNpyJfmhAiX0kc9w2Rjb2bVrMJ aCTmixHXBRYE6RnHvgR1m9ALWDFpT6VZbBLLWDOLvpB7VObI1yTDE7jQJjGs7JS0 mMqyjKNy8D+lAQ52jWkswPNuTA2nffIDgPBr2SaEM4DC8kuXA8rT88xRd4zaJe27 UyRDQyQDMIW2RageVjto2wFZOWPwN4hqKPa7haV0i7hqiBAXKZiqF/n6KOiquCNK g/SACqlFzSkL5eICo48y/4BXQCrC1HJumYv+67mCCN1nBKsPu/BHrwgTX2NPnvoj 7srbIecxgv9ldkdF6uOIpLV2NxiGyGZgtoqU4Pi6aspKnBPRu+zcQt5THJqORt7s HUlSyBHI= X-Virus-Scanned: amavisd-new at mykolab.com 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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. From 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 -- 2.20.0