From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id CHwiDm/+b2fqwgAAqHPOHw:P1 (envelope-from ) for ; Sat, 28 Dec 2024 13:34:39 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id CHwiDm/+b2fqwgAAqHPOHw (envelope-from ) for ; Sat, 28 Dec 2024 14:34:39 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="IGG0f/Hd"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735392879; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=3ysXK+i56XvG5PJO0EkKtiO26U2C2U5W6YeJLrXUQzg=; b=dDiZ1l691SKKkjcB03V+hRTft4uJAXlqiVhhmuI/4qNV2hB1vTBMQcZcao359wFdhI8NHJ SdRu5uxPe8ZXF8nT2Kpl3JOJe6e6A5TPjtRvrCQDeZMAU/yYFYOjkU84SOmt5HwUvAq/UE Nl38WiDEunopdnrZv+2vSJZRiOGCIl9VG1LDYvoXuV5UOXP6JlXem8sYJXQgbBjzcRmSpD sNANgyCj7rtzTb2k0KAcvmuoP9cB/YF2AXZ8E0ej/hmznqixy7h6rlEeUND6d81O1JywMe qtHxiw3MphH8YlQ4lPDmTNwU98WGMuZCT7H1FuN1Ez4/BuV9vXxRIK94QgcFrw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="IGG0f/Hd"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735392879; a=rsa-sha256; cv=none; b=pkr7YTAJZgc7ofZ1qphopVpLrNmRCo6G5TCFtWxMcucvF8jwnPjGfg+lHQH2vT1oVdD1wR YiGtrHZzkSorslIZSVCRv14XY2sY0EJwDr/uzKCuZ2z05lLboGzxh96nPC/Ob62MsIu7Df xLs1IsR7RvMCrD8MlCKaX6GA9n/YjGD5KhrnlO/AGkzD+3QeGMAiSDFtP0I8TbGJwzvfVo 6RleZKdBOT7tAIqLlYWCMY8iaL1+9tjcndWbIumT2Ngeyc1p1jadPglS3ErwVgq2gtjERz 0xkvKhgRNm5NmqcOx8BhAAN7Kdxh2c0T9Vmy94tPETYMMOElmhQOOTQ7gG7S5A== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BBB7998C8A for ; Sat, 28 Dec 2024 14:34:38 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRUov-00053F-Qi; Sat, 28 Dec 2024 06:17:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRUoi-0004s3-Dt for guix-patches@gnu.org; Sat, 28 Dec 2024 06:17:12 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tRUoh-00022N-PT for guix-patches@gnu.org; Sat, 28 Dec 2024 06:17:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3ysXK+i56XvG5PJO0EkKtiO26U2C2U5W6YeJLrXUQzg=; b=IGG0f/HdGjO9ac4rl1nVxUu33+RrHYwAnRgAicaCMS8Ah1x6QcDXnrWgZjGiUHObq0D+d2KxK7FBgfULozYaXvow+mmtvJypVzRNu6BRI+1Zi5Ys9Ymk4eZg9I1l8z7+unTk4+E7sd32PROcXyD7A69vt3VTt+jfA0zIiHP/YbJxKjt35es2tVtF8C7G2YntHJ9m4JGvlS1sa+nEEQrdBpcZLdbYPFrAQLu69hiYM+u8D3+NCOpgJn1oFRsAU/yIrj7nACXmAT76fLZ6R5Jxd8PVF1F+9B6saHc4SvfeOJx/lslzOsgoXi/XwYhNehN2Gg8Ea7HUBPSnPgWVO6j+ew==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRUoh-0007DJ-ID for guix-patches@gnu.org; Sat, 28 Dec 2024 06:17:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75160] [PATCH xorg-updates 091/109] gnu: xf86-video-nouveau: Update to 1.0.18. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Dec 2024 11:17:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75160 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75160@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 75160-submit@debbugs.gnu.org id=B75160.173538461027424 (code B ref 75160); Sat, 28 Dec 2024 11:17:11 +0000 Received: (at 75160) by debbugs.gnu.org; 28 Dec 2024 11:16:50 +0000 Received: from localhost ([127.0.0.1]:49230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUoL-000788-LY for submit@debbugs.gnu.org; Sat, 28 Dec 2024 06:16:50 -0500 Received: from mail.envs.net ([5.199.136.28]:56594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUnI-00071U-1m for 75160@debbugs.gnu.org; Sat, 28 Dec 2024 06:15:44 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id A2F6238A3E6B; Sat, 28 Dec 2024 11:15:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id dm5RmxcHaluT; Sat, 28 Dec 2024 11:15:40 +0000 (UTC) Received: from localhost (unknown [112.44.73.41]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sat, 28 Dec 2024 11:15:29 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id d1732aa9; Sat, 28 Dec 2024 11:17:16 +0000 (UTC) Date: Sat, 28 Dec 2024 19:16:02 +0800 Message-ID: <760b112fb014eb3c31f8377b4750589d8309645a.1735384288.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <2b8157bebabbffec03739fcad2c79bb7314b7173.1735384288.git.iyzsong@member.fsf.org> References: <2b8157bebabbffec03739fcad2c79bb7314b7173.1735384288.git.iyzsong@member.fsf.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches From: iyzsong--- via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.50 X-Spam-Score: -6.50 X-Migadu-Queue-Id: BBB7998C8A X-Migadu-Scanner: mx10.migadu.com X-TUID: rwbYrzQJ+JRD From: 宋文武 * gnu/packages/xorg.scm (xf86-video-nouveau): Update to 1.0.18. * gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. Change-Id: I0632a55df5b3364c63cdfd53bf31d004d2b1c3b9 --- gnu/local.mk | 1 - .../xf86-video-nouveau-fixup-ABI.patch | 64 ------------------- gnu/packages/xorg.scm | 7 +- 3 files changed, 3 insertions(+), 69 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch diff --git a/gnu/local.mk b/gnu/local.mk index 171e1d5e94..d56edd4251 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2386,7 +2386,6 @@ dist_patch_DATA = \ %D%/packages/patches/x265-arm-flags.patch \ %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ - %D%/packages/patches/xf86-video-nouveau-fixup-ABI.patch \ %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \ %D%/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch \ %D%/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch \ diff --git a/gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch b/gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch deleted file mode 100644 index a18e3f8ab9..0000000000 --- a/gnu/packages/patches/xf86-video-nouveau-fixup-ABI.patch +++ /dev/null @@ -1,64 +0,0 @@ -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 f467db643c..b0aa740f19 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3166,15 +3166,14 @@ (define-public xf86-video-nv (define-public xf86-video-nouveau (package (name "xf86-video-nouveau") - (version "1.0.17") + (version "1.0.18") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/xf86-video-nouveau-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 - (base32 "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9")) - (patches (search-patches "xf86-video-nouveau-fixup-ABI.patch")))) + (base32 "1z9bqfr81w2ahq2vyphgjbl0ffxndrpxb4mqqly76srjcj7d6ap8")))) (build-system gnu-build-system) (inputs (list xorg-server)) (native-inputs (list pkg-config)) -- 2.46.0