From patchwork Thu Nov 18 14:07:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 34616 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 630B327BBE3; Thu, 18 Nov 2021 14:08:26 +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 D9B6027BBE1 for ; Thu, 18 Nov 2021 14:08:25 +0000 (GMT) Received: from localhost ([::1]:33958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mni5O-00022S-2q for patchwork@mira.cbaines.net; Thu, 18 Nov 2021 09:08:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mni54-00020W-55 for guix-patches@gnu.org; Thu, 18 Nov 2021 09:08:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mni53-00008G-SG for guix-patches@gnu.org; Thu, 18 Nov 2021 09:08:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mni53-000716-N3 for guix-patches@gnu.org; Thu, 18 Nov 2021 09:08:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51947] [PATCH core-updates-frozen 1/2] gnu: xf86-video-mach64: Patch to build with xorg-server 21.1. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Nov 2021 14:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51947 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 51947@debbugs.gnu.org Received: via spool by 51947-submit@debbugs.gnu.org id=B51947.163724446026913 (code B ref 51947); Thu, 18 Nov 2021 14:08:01 +0000 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== 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 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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 * 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) From patchwork Thu Nov 18 14:07:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 34617 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 93FEE27BBE3; Thu, 18 Nov 2021 14:13:00 +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 52A8127BBE1 for ; Thu, 18 Nov 2021 14:13:00 +0000 (GMT) Received: from localhost ([::1]:42718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mni9r-0008DX-Ba for patchwork@mira.cbaines.net; Thu, 18 Nov 2021 09:12:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mni54-000215-Gg for guix-patches@gnu.org; Thu, 18 Nov 2021 09:08:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51939) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mni54-00008V-87 for guix-patches@gnu.org; Thu, 18 Nov 2021 09:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mni54-00071D-3W for guix-patches@gnu.org; Thu, 18 Nov 2021 09:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51947] [PATCH core-updates-frozen 2/2] gnu: xf86-video-nouveau: Use upstream patch for xorg-server 21.1. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Nov 2021 14:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51947 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 51947@debbugs.gnu.org Received: via spool by 51947-submit@debbugs.gnu.org id=B51947.163724446626938 (code B ref 51947); Thu, 18 Nov 2021 14:08:02 +0000 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== 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 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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 * 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)))