From patchwork Thu Nov 18 14:04:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 464 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 E49F827BBE3; Thu, 18 Nov 2021 14:05:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A290C27BBE1 for ; Thu, 18 Nov 2021 14:05:22 +0000 (GMT) Received: from localhost ([::1]:54400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mni2T-00051U-QC for patchwork@mira.cbaines.net; Thu, 18 Nov 2021 09:05:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mni2A-0004cX-Ac for guix-patches@gnu.org; Thu, 18 Nov 2021 09:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mni2A-0007lA-1W for guix-patches@gnu.org; Thu, 18 Nov 2021 09:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mni29-0006tl-M6 for guix-patches@gnu.org; Thu, 18 Nov 2021 09:05:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51947] [PATCH core-updates-frozen 0/2] Fix xf86-video-mach64 and xf86-video-nouveau builds. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Nov 2021 14:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51947 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51947@debbugs.gnu.org Cc: Josselin Poiret X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163724425626398 (code B ref -1); Thu, 18 Nov 2021 14:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Nov 2021 14:04:16 +0000 Received: from localhost ([127.0.0.1]:35231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mni1Q-0006ri-3J for submit@debbugs.gnu.org; Thu, 18 Nov 2021 09:04:16 -0500 Received: from lists.gnu.org ([209.51.188.17]:54756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mni1O-0006rZ-Ql for submit@debbugs.gnu.org; Thu, 18 Nov 2021 09:04:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mni1O-00044h-HR for guix-patches@gnu.org; Thu, 18 Nov 2021 09:04:14 -0500 Received: from jpoiret.xyz ([206.189.101.64]:46126) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mni1M-0007bg-4z for guix-patches@gnu.org; Thu, 18 Nov 2021 09:04:13 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 3263C184BF8; Thu, 18 Nov 2021 14:04:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1637244250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=usEUO6X8uoUvfk1LmGPUONBwwsACX+W1i9pEM847z/k=; b=MU48QwF9seFwT0aaJ9aJq3nr1+xDD99JSdBSJFR7TXZ8wOc1N0lmQxdre4CerqrrqOzzAK CTQIkHs9MwjCJ2XthNVtk6PxQMSTB7+ISSVh731BPogXaAodZ1whQ1Xi0HKmuOjcYn+1me rDgX6fhN3rP3p1r7DbrtKgQPVPTZzsyLf/uq7pMDJeoSdhX/JCt61bMOW4eEButaXke6ka iimbghHWoSrPsblkJAZLjtz7xIQ3e1OdzKePKEeGjn8wOnJB/WZviyEjVuybA4QOGLAmln BxHeHq4G29/gBW3WZlIfXgfUvHBk/3RcbA3QZEr2YW9Fa62TVsmkHrHzlbv7MA== Date: Thu, 18 Nov 2021 14:04:01 +0000 Message-Id: <20211118140401.6593-1-dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: ++++ Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.001, FROM_SUSPICIOUS_NTLD_FP=1.997, PDS_OTHER_BAD_TLD=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches Hello everyone, This patchset fixes compilation for both xf86-video drivers that wouldn't build with xorg-server 21.1 because some variables were renamed. The first is home-made while the second is an upstream patch that hasn't found its way to a release yet. They both successfully build on my machine, although I can't test either of them. Given the nature of the changes, this shouldn't be too much of an issue. Happy sprinting, Josselin Josselin Poiret (2): gnu: xf86-video-mach64: Patch to build with xorg-server 21.1. gnu: xf86-video-nouveau: Use upstream patch for xorg-server 21.1. .../xf86-video-mach64-bool-to-boolean.patch | 79 +++++++++++++++++++ .../xf86-video-nouveau-fixup-ABI.patch | 64 +++++++++++++++ gnu/packages/xorg.scm | 6 +- 3 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch create mode 100644 gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch