From unknown Tue Aug 19 21:02:52 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#51947 <51947@debbugs.gnu.org> To: bug#51947 <51947@debbugs.gnu.org> Subject: Status: [PATCH core-updates-frozen 0/2] Fix xf86-video-mach64 and xf86-video-nouveau builds. Reply-To: bug#51947 <51947@debbugs.gnu.org> Date: Wed, 20 Aug 2025 04:02:52 +0000 retitle 51947 [PATCH core-updates-frozen 0/2] Fix xf86-video-mach64 and xf8= 6-video-nouveau builds. reassign 51947 guix-patches submitter 51947 Josselin Poiret severity 51947 normal tag 51947 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 18 09:04:16 2021 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== From: Josselin Poiret To: guix-patches@gnu.org Subject: [PATCH core-updates-frozen 0/2] Fix xf86-video-mach64 and xf86-video-nouveau builds. Date: Thu, 18 Nov 2021 14:04:01 +0000 Message-Id: <20211118140401.6593-1-dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: ++++ Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Level: **** 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-Spam-Score: 1.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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 [...] Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom; id=dev%40jpoiret.xyz; ip=209.51.188.17; r=debbugs.gnu.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.51.188.17 listed in wl.mailspike.net] 0.5 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: submit Cc: Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) 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 -- 2.33.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 18 09:07:40 2021 Received: (at 51947) by debbugs.gnu.org; 18 Nov 2021 14:07:40 +0000 Received: from localhost ([127.0.0.1]:35247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mni4h-000700-TG for submit@debbugs.gnu.org; Thu, 18 Nov 2021 09:07:40 -0500 Received: from jpoiret.xyz ([206.189.101.64]:47980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mni4g-0006zr-Kh for 51947@debbugs.gnu.org; Thu, 18 Nov 2021 09:07:39 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 638DF184F65; Thu, 18 Nov 2021 14:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1637244457; 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: in-reply-to:in-reply-to:references:references; bh=lY7Th4iNii/QeRtAGNqwttPQYtly/lwDbsIuwAtT/AI=; b=gCqDRe61CjrlerblrCVO5VTiGNlolHlp32qOAB+r3wpb9c0Yp6eoHKWPGuszNwf68/O/E4 g5/UMjilk5bWhD0YIsITSIcA5NeJxrUEJY1V/JhCu1zE/ygFo/IhVBKUyMjgL2UrZebPxU Viuyn5x9rzrIumE7pi7CdvVJ9u5wY2zQrge+qZp678JciUPrVwKBzXfmyS1wxqRxgKtegB ggsnV+zsq8xU1+RY5dxib4FopuwCYRWI7uhEvYBNxWRlPV9pwkrI3yiVwaKMtL560zOR0F g6Nm2g+RNFoOlbkWWekiidEc7ZLSq736txDYPLzPSs09+7HZTf2Yc7KcpqQ4wg== From: Josselin Poiret To: Josselin Poiret Subject: [PATCH core-updates-frozen 1/2] gnu: xf86-video-mach64: Patch to build with xorg-server 21.1. Date: Thu, 18 Nov 2021 14:07:27 +0000 Message-Id: <20211118140728.7081-1-dev@jpoiret.xyz> In-Reply-To: <20211118140401.6593-1-dev@jpoiret.xyz> References: <20211118140401.6593-1-dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/xorg.scm (xf86-video-mach64): Use patch. * gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch: Add it. --- .../xf86-video-mach64-bool-to-boolean.patch | 79 +++++++++++++++++++ [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: 51947 Cc: 51947@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/xorg.scm (xf86-video-mach64): Use patch. * gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch: Add it. --- .../xf86-video-mach64-bool-to-boolean.patch | 79 +++++++++++++++++++ [...] Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/xorg.scm (xf86-video-mach64): Use patch. * gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch: Add it. --- .../xf86-video-mach64-bool-to-boolean.patch | 79 +++++++++++++++++++ gnu/packages/xorg.scm | 3 +- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch diff --git a/gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch b/gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch new file mode 100644 index 0000000000..b85acdd401 --- /dev/null +++ b/gnu/packages/patches/xf86-video-mach64-bool-to-boolean.patch @@ -0,0 +1,79 @@ +From ff1a69144735298d1a190fa23b3ae5747e914859 Mon Sep 17 00:00:00 2001 +From: Josselin Poiret +Date: Thu, 18 Nov 2021 13:18:25 +0000 +Subject: [PATCH] Rename bool to boolean for OptionInfoRec. + +* src/aticonfig.c: Change uses of .value.bool to .value.boolean +--- + src/aticonfig.c | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/src/aticonfig.c b/src/aticonfig.c +index 621e79e..8ea0c6e 100644 +--- a/src/aticonfig.c ++++ b/src/aticonfig.c +@@ -311,42 +311,42 @@ ATIProcessOptions + + (void)memcpy(PublicOption, ATIPublicOptions, ATIPublicOptionSize); + +-# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.bool +-# define Accel PublicOption[ATI_OPTION_ACCEL].value.bool +-# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.bool +-# define Blend PrivateOption[ATI_OPTION_BLEND].value.bool +-# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.bool +-# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.bool +-# define CSync PublicOption[ATI_OPTION_CSYNC].value.bool +-# define Devel PrivateOption[ATI_OPTION_DEVEL].value.bool +-# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.bool ++# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.boolean ++# define Accel PublicOption[ATI_OPTION_ACCEL].value.boolean ++# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.boolean ++# define Blend PrivateOption[ATI_OPTION_BLEND].value.boolean ++# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.boolean ++# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.boolean ++# define CSync PublicOption[ATI_OPTION_CSYNC].value.boolean ++# define Devel PrivateOption[ATI_OPTION_DEVEL].value.boolean ++# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.boolean + + #ifdef XF86DRI_DEVEL + +-# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.bool ++# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.boolean + # define DMAMode PublicOption[ATI_OPTION_DMA_MODE].value.str + # define AGPMode PublicOption[ATI_OPTION_AGP_MODE].value.num + # define AGPSize PublicOption[ATI_OPTION_AGP_SIZE].value.num +-# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.bool ++# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.boolean + # define BufferSize PublicOption[ATI_OPTION_BUFFER_SIZE].value.num + + #endif /* XF86DRI_DEVEL */ + + #ifdef TV_OUT + +-# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.bool ++# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.boolean + # define TvStd PublicOption[ATI_OPTION_TV_STD].value.str + + #endif /* TV_OUT */ + +-# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.bool +-# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.bool +-# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.bool +-# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.bool +-# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.bool ++# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.boolean ++# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.boolean ++# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.boolean ++# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.boolean ++# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.boolean + # define AccelMethod PublicOption[ATI_OPTION_ACCELMETHOD].value.str +-# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.bool +-# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.bool ++# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.boolean ++# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.boolean + + # define ReferenceClock \ + PublicOption[ATI_OPTION_REFERENCE_CLOCK].value.freq.freq +-- +2.33.1 + diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 391a4d33d8..2740d34deb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3107,7 +3107,8 @@ (define-public xf86-video-mach64 (sha256 (base32 "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs")) - (patches (search-patches "xf86-video-mach64-glibc-2.20.patch")))) + (patches (search-patches "xf86-video-mach64-glibc-2.20.patch" + "xf86-video-mach64-bool-to-boolean.patch")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xorgproto" ,xorgproto) -- 2.33.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 18 09:07:46 2021 Received: (at 51947) by debbugs.gnu.org; 18 Nov 2021 14:07:46 +0000 Received: from localhost ([127.0.0.1]:35251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mni4o-00070Q-9c for submit@debbugs.gnu.org; Thu, 18 Nov 2021 09:07:46 -0500 Received: from jpoiret.xyz ([206.189.101.64]:48058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mni4m-00070D-Aj for 51947@debbugs.gnu.org; Thu, 18 Nov 2021 09:07:44 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 6F7BF184BF8; Thu, 18 Nov 2021 14:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1637244463; 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: in-reply-to:in-reply-to:references:references; bh=XeGDk3XxD57MoNzgtTX9xMAqHjfh5/JRWXqiguUEfNk=; b=Xa4YW3QqklGZuKxGAP8oeBoUQbif3TPPlj8xcXi2OtBk+n/cF/k/WXb4+NE5Wn+qNijL+9 DJi7lWZzm+SC0yf8cgYob7lxpcowjSmKD9afxrWIXSJTpf31fifD3MU1B2C1T34mMgsDV0 G0lSOtHu/ZD9NfYz4XgSnZqlx7ImRmnoBGpPIz9lw7IwzAZabDEom8WcVtedSeBaWbVLf6 rYpNQXBBjUo+nLxM1RylQcXmOL2eWDNhIpEFUyTYN8+JLns3Lss50kq+iE8DFbju4o036m 4SCUVF5CW20Lcq7CXH3OpxnALW5xDMu9TIh4bdIPa5gx77tjNOh2151U/HQBbw== From: Josselin Poiret To: Josselin Poiret Subject: [PATCH core-updates-frozen 2/2] gnu: xf86-video-nouveau: Use upstream patch for xorg-server 21.1. Date: Thu, 18 Nov 2021 14:07:28 +0000 Message-Id: <20211118140728.7081-2-dev@jpoiret.xyz> In-Reply-To: <20211118140401.6593-1-dev@jpoiret.xyz> References: <20211118140401.6593-1-dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/xorg.scm (xf86-video-nouveau): Use patch. * gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch: Add it. --- .../xf86-video-nouveau-fixup-ABI.patch | 64 +++++++++++++++++++ gnu/pack [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: 51947 Cc: 51947@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/xorg.scm (xf86-video-nouveau): Use patch. * gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch: Add it. --- .../xf86-video-nouveau-fixup-ABI.patch | 64 +++++++++++++++++++ gnu/pack [...] Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: jpoiret.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/xorg.scm (xf86-video-nouveau): Use patch. * gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch: Add it. --- .../xf86-video-nouveau-fixup-ABI.patch | 64 +++++++++++++++++++ gnu/packages/xorg.scm | 3 +- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch diff --git a/gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch b/gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch new file mode 100644 index 0000000000..a18e3f8ab9 --- /dev/null +++ b/gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch @@ -0,0 +1,64 @@ +From e80e73ced69b15662103d0fd6837db4ce6c6eb5b Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Mon, 13 Jul 2020 09:20:15 +1000 +Subject: [PATCH] nouveau: fixup driver for new X server ABI + +--- + src/compat-api.h | 4 ++++ + src/nouveau_exa.c | 2 +- + src/nv_driver.c | 6 +++--- + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/compat-api.h b/src/compat-api.h +index fde2f4b..8a1fcf9 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -102,4 +102,8 @@ + + #endif + ++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) ++#define secondary_dst slave_dst ++#endif ++ + #endif +diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c +index 55df6f8..db3b112 100644 +--- a/src/nouveau_exa.c ++++ b/src/nouveau_exa.c +@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv) + + #ifdef NOUVEAU_PIXMAP_SHARING + static Bool +-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p) ++nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p) + { + struct nouveau_bo *bo = nouveau_pixmap_bo(ppix); + struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix); +diff --git a/src/nv_driver.c b/src/nv_driver.c +index e72a6b6..f9ab4af 100644 +--- a/src/nv_driver.c ++++ b/src/nv_driver.c +@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) + { + RegionRec pixregion; + +- PixmapRegionInit(&pixregion, dirty->slave_dst); ++ PixmapRegionInit(&pixregion, dirty->secondary_dst); + +- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); ++ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); + #ifdef HAS_DIRTYTRACKING_ROTATION + PixmapSyncDirtyHelper(dirty); + #else + PixmapSyncDirtyHelper(dirty, &pixregion); + #endif + +- DamageRegionProcessPending(&dirty->slave_dst->drawable); ++ DamageRegionProcessPending(&dirty->secondary_dst->drawable); + RegionUninit(&pixregion); + } + +-- +2.33.1 + diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2740d34deb..8a6e2951f9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3240,7 +3240,8 @@ (define-public xf86-video-nouveau (uri (string-append "mirror://xorg/individual/driver/xf86-video-nouveau-" version ".tar.bz2")) (sha256 - (base32 "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9")))) + (base32 "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9")) + (patches (search-patches "xf86-video-nouveau-fixup-ABI.patch")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) -- 2.33.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 18 10:54:56 2021 Received: (at 51947-done) by debbugs.gnu.org; 18 Nov 2021 15:54:56 +0000 Received: from localhost ([127.0.0.1]:36941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnjkW-00078V-7f for submit@debbugs.gnu.org; Thu, 18 Nov 2021 10:54:56 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:45201) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnjkU-00078B-Cs for 51947-done@debbugs.gnu.org; Thu, 18 Nov 2021 10:54:54 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id D7BCC5C01B0; Thu, 18 Nov 2021 10:54:48 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Thu, 18 Nov 2021 10:54:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=oD2XxdJsMr3kY/BJgF/02ts2bbqUXezQkXUA602gt ZE=; b=l9Op7yxb0sC8bVV8uChXJ3S7MI2PiyZaQutrWjrL5Uuhbj3WUSBYGwH38 KJYYx3HuK4IdyyrV8FcxToRAgO63Vm/9PpOgTQNSoypRht2KXDZIijz88EO59g/S Ka8j4v0GI7wrOCMBGadonfVJXg/a1FQ+mVXohbdn2H09Zo7gVDDaOctQ4ixJTfQM GxGKmUCY0niPc/B9epLf7HcEO1tM2OyPeRA5UFuDAoQEmEoSklNnmHYNIwj8FZlQ 3G3Yl1RMgJ+BDq/mVmBuJZAYsFvY0Q0WHN+IUL3bWn9sefSSEkY2tqaz+M8arDgq bEqb7D8/fUXjqxAezpo3ey8QVsdxQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrfeeigdejkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufhfffgjkfgfgggtgfesthhqre dttderjeenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthes nhhghihrohdrtghomheqnecuggftrfgrthhtvghrnhepieduuefhgeegleelveehgedugf euhfeikefftdevieelgfelhfdvtdfgieehtefgnecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 18 Nov 2021 10:54:48 -0500 (EST) From: Timothy Sample To: Josselin Poiret Subject: Re: [bug#51947] [PATCH core-updates-frozen 0/2] Fix xf86-video-mach64 and xf86-video-nouveau builds. References: <20211118140401.6593-1-dev@jpoiret.xyz> Date: Thu, 18 Nov 2021 10:54:47 -0500 In-Reply-To: <20211118140401.6593-1-dev@jpoiret.xyz> (Josselin Poiret via Guix-patches via's message of "Thu, 18 Nov 2021 14:04:01 +0000") Message-ID: <8735nt4fy0.fsf@ngyro.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 51947-done Cc: 51947-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Josselin, Josselin Poiret via Guix-patches via writes: > 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. Agreed. > 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. Pushed as 572641103880ce87b631e00e6212787747f694aa and 674dbeb43639db31c3f3a6e69ee7203296d0b50f. I made one small change, which is to list the patches in =E2=80=9Cgnu/local.mk=E2=80=9D under =E2=80= =98dist_patch_DATA=E2=80=99. Thanks! -- Tim From unknown Tue Aug 19 21:02:52 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 17 Dec 2021 12:24:12 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator