From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iPXlGUv/b2deUgAAe85BDQ:P1 (envelope-from ) for ; Sat, 28 Dec 2024 13:38:19 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id iPXlGUv/b2deUgAAe85BDQ (envelope-from ) for ; Sat, 28 Dec 2024 14:38:19 +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=fWd+wd+b; 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=1735393099; 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=XfUmEABC3bIZOKZ6QQIKe1skgwtV1Tc8Xg8bBXK6wJI=; b=J1K0cFr26uL42mQyvvgQSL4YPuQgtv/cB/xTTI+H8Vf1SqgaFFjQW/yvzS7YmQRrTjq0/o +/35QYEQewQYtwH4G76tmzeB8K1LD+Wk3eRYKSug9MomBC1Zr0LkULtivGYLpMsJUE9Ybc qhBEIdnVg62QikVX0A3b1us+Wr1rxxaOmhW0cTDkV4rxpfeg52tyCN14698OKWrH7NmssS zRwxbgXTgFq+cqlqVivygfw0oZDMuyvO/Lp8iKNfOp9ccbIZfab4U/7I5AsP4k1FB1ge8n pe1YcqxKBQrkHj9dm4PVo0ZrftaWCj3kcw3vc/C60mMQEvFGMVHWA8nZvT0OPQ== 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=fWd+wd+b; 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=1735393099; a=rsa-sha256; cv=none; b=RWka+7UL+XCYRCWWkIGYw6zMBbmyWoMJeH3oCeOJpRj9xyVMS3BUN1t11O45RMtcHlVPpG l0UoIMTRoHuHtTRhPCk38eLl1O5dWfQCGjtbjXxJdHCiSQzr9LLndFkrptjmQd7AZjk7eh gKBnBwOOTsKbY+hUVdWoao8XYnhqpOF87vxrj9jaM28drJGl8vvZ1K9kcV8k8cwMLbNpwA xE6tY2kL/caPocZ+sfJwR7KrIVu3kRs0kEgPUfw7cdZH9OzlOtqDoGiSnFs69KXtpueYGS pBP0rzzUjeY2ShUWclVazsW5Leg65TSEagaOwE+Dgh2o/xhoUx/gnm/pvYV6Vg== 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 1CDBC33C50 for ; Sat, 28 Dec 2024 14:38:19 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRUox-000563-DO; Sat, 28 Dec 2024 06:17:27 -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 1tRUoo-0004wY-1j for guix-patches@gnu.org; Sat, 28 Dec 2024 06:17:19 -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 1tRUol-00023s-W6 for guix-patches@gnu.org; Sat, 28 Dec 2024 06:17:16 -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=XfUmEABC3bIZOKZ6QQIKe1skgwtV1Tc8Xg8bBXK6wJI=; b=fWd+wd+bUHx37Ayr/sFpXht/TmTMYFR9i8wgKmqb2UfHVsGHBI43k9gO8R7Hzv4l1CO3PFU3O5oM7I7ZdVkky6/ecDTuOqs4T9IkC2VzPRYMvjJgZnmq/RSe3zbJAyLj5KWRMUZ59MdVLyfBmhaVfIXT4QnH81evk6V8EMlYRehoPwPGEpeKS3Vt0Ie5oAkmGzEyWtLM8MISXitzTxQTqtVVvctr9K0WON2U6IzMAMZGjmv0iSz0vVqOfSE5VVubrjBuSiaS+k3kfbNk4haID2QKZ07Nnmfr7ENT3/XLxrmgAobMtqIDTeW0nzIPKbOmFAuAqHu5TET/o2l7SyHb9w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRUol-0007EL-QD for guix-patches@gnu.org; Sat, 28 Dec 2024 06:17:15 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75160] [PATCH xorg-updates 090/109] gnu: xf86-video-savage: Update to 2.4.1. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Dec 2024 11:17:15 +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.173538461427501 (code B ref 75160); Sat, 28 Dec 2024 11:17:15 +0000 Received: (at 75160) by debbugs.gnu.org; 28 Dec 2024 11:16:54 +0000 Received: from localhost ([127.0.0.1]:49248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUoP-00079Q-US for submit@debbugs.gnu.org; Sat, 28 Dec 2024 06:16:54 -0500 Received: from mail.envs.net ([5.199.136.28]:47824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUnW-00072Z-T6 for 75160@debbugs.gnu.org; Sat, 28 Dec 2024 06:15:59 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 7CDD138A3E74; Sat, 28 Dec 2024 11:15:58 +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 UPXJlb2GE9W0; Sat, 28 Dec 2024 11:15:55 +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:49 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id c4ba28dd; Sat, 28 Dec 2024 11:17:16 +0000 (UTC) Date: Sat, 28 Dec 2024 19:16:01 +0800 Message-ID: <79bfd5b1887307a24fd5b5d79be9adc2e1d95b94.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -3.70 X-Spam-Score: -3.70 X-Migadu-Queue-Id: 1CDBC33C50 X-TUID: XdrzpP9t0psE From: 宋文武 * gnu/packages/xorg.scm (xf86-video-savage): Update to 2.4.1. * gnu/packages/patches/xf86-video-savage-xorg-compat.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. Change-Id: I186c93badb813aa0fc4a3d558ff8a084c6c652af --- gnu/local.mk | 1 - .../xf86-video-savage-xorg-compat.patch | 33 ------------------- gnu/packages/xorg.scm | 7 ++-- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-savage-xorg-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index f0e4b16a8e..171e1d5e94 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2387,7 +2387,6 @@ dist_patch_DATA = \ %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-savage-xorg-compat.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-savage-xorg-compat.patch b/gnu/packages/patches/xf86-video-savage-xorg-compat.patch deleted file mode 100644 index 9524032676..0000000000 --- a/gnu/packages/patches/xf86-video-savage-xorg-compat.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix build against xorg-server >= 1.20. - -Patch taken from upstream: -https://cgit.freedesktop.org/xorg/driver/xf86-video-savage/commit/?id=0ece556daa8a88771b669d8104396abd9166d2d0 - -diff --git a/src/savage_driver.c b/src/savage_driver.c -index 58a294d..3cda923 100644 ---- a/src/savage_driver.c -+++ b/src/savage_driver.c -@@ -2034,8 +2034,6 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) - xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected current MCLK value of %1.3f MHz\n", - mclk / 1000.0); - -- pScrn->maxHValue = 2048 << 3; /* 11 bits of h_total 8-pixel units */ -- pScrn->maxVValue = 2048; /* 11 bits of v_total */ - pScrn->virtualX = pScrn->display->virtualX; - pScrn->virtualY = pScrn->display->virtualY; - -@@ -3637,6 +3635,14 @@ static ModeStatus SavageValidMode(SCRN_ARG_TYPE arg, DisplayModePtr pMode, - (pMode->VDisplay > psav->PanelY))) - return MODE_PANEL; - -+ /* 11 bits of h_total 8-pixel units */ -+ if (pMode->HTotal > (2048 << 3)) -+ return MODE_BAD_HVALUE; -+ -+ /* 11 bits of v_total */ -+ if (pMode->VTotal > 2048) -+ return MODE_BAD_VVALUE; -+ - if (psav->UseBIOS) { - refresh = SavageGetRefresh(pMode); - return (SavageMatchBiosMode(pScrn,pMode->HDisplay, diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a0318644c8..f467db643c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3233,18 +3233,17 @@ (define-public xf86-video-r128 (define-public xf86-video-savage (package (name "xf86-video-savage") - (version "2.3.9") + (version "2.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/driver/xf86-video-savage-" version - ".tar.bz2")) - (patches (search-patches "xf86-video-savage-xorg-compat.patch")) + ".tar.xz")) (sha256 (base32 - "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc")))) + "1bqhgldb6yahpgav7g7cyc4kl5pm3mgkq8w2qncj36311hb92hb7")))) (build-system gnu-build-system) (inputs (list mesa xorgproto xorg-server)) (native-inputs (list pkg-config)) -- 2.46.0