From patchwork Sun Dec 19 20:30:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35482 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 4434E27BBE9; Sun, 19 Dec 2021 20:32:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5009F27BBEA for ; Sun, 19 Dec 2021 20:32:27 +0000 (GMT) Received: from localhost ([::1]:47892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mz2r4-0000EY-Hc for patchwork@mira.cbaines.net; Sun, 19 Dec 2021 15:32:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mz2qg-0000EA-R9 for guix-patches@gnu.org; Sun, 19 Dec 2021 15:32:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36741) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mz2qg-0003wt-IM for guix-patches@gnu.org; Sun, 19 Dec 2021 15:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mz2qg-0005s9-FN for guix-patches@gnu.org; Sun, 19 Dec 2021 15:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52562] [PATCH] gnu: xorg-server: Update to 21.1.2. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Dec 2021 20:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52562 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kaelyn Cc: 52562@debbugs.gnu.org X-Debbugs-Original-Cc: 52562@debbugs.gnu.org, Kaelyn Takata via Guix-patches via Received: via spool by 52562-submit@debbugs.gnu.org id=B52562.163994587822505 (code B ref 52562); Sun, 19 Dec 2021 20:32:02 +0000 Received: (at 52562) by debbugs.gnu.org; 19 Dec 2021 20:31:18 +0000 Received: from localhost ([127.0.0.1]:48284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz2pt-0005qm-Ri for submit@debbugs.gnu.org; Sun, 19 Dec 2021 15:31:18 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:55929) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz2pq-0005qW-Qv for 52562@debbugs.gnu.org; Sun, 19 Dec 2021 15:31:12 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 7C8673200929; Sun, 19 Dec 2021 15:31:04 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sun, 19 Dec 2021 15:31:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=Yd/PSGqfD9kPyKTW8mVUUfHx Ru5swl/mP+6CTh4QRGc=; b=agqoHAqGkNV/hQLfnBAGwFOSJ62tVQKjm4jBrzvq +zVfbwt3FsTiI13X5BMIcZ7T0M7tqfWyh1wBVs6/rn7CNsCxlULics4/uoWhY7yD cdbLyocmfs95P3mel9L3kwRNIX6ACFQgqauZbI8j/QZ1RmSVC2wtoY2/LpLXD3xV Jpw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc: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=Yd/PSG qfD9kPyKTW8mVUUfHxRu5swl/mP+6CTh4QRGc=; b=EmB6Q3njWwIdPKrVuWO0aV BlpGaJfBWt4QHNqil2SshSEZDqyv9ZvlLDi5bTIVJIYARsXNlI41/L4yvcD4vjOe a1DvI/lXFzjnCInn7RHXSa7zShH3EL+3qk65V1NBtiyhF3f05bb9tte1nacXLvQK +8N9vFt6UDgX292bJ59LCL1x7Xj7mYpXtB6LQOEWPqcDxfg/WGLZtO+bVnHVv3/8 J27+cdjnULUQjG40anP6mIjvOgRJkG3lHPJGtRbGq8lmz7sSkd4t3KwHKJKC+JJM 1RMCJbfnGyO5PfQPdDr5EXRo2INRLuUJCCaL2is1TgPfJtGxh3OOT1aQ/KVZXDZg == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddttddgudegtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepvdevgeekudeivdeileduveekuefgueeuleehtdffgefftdefkeevleffueef udeknecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 19 Dec 2021 15:31:03 -0500 (EST) Date: Sun, 19 Dec 2021 15:30:59 -0500 From: Leo Famulari Message-ID: References: <20211216232942.31686-1-kaelyn.alexi@protonmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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" X-getmail-retrieved-from-mailbox: Patches On Sat, Dec 18, 2021 at 11:56:53PM -0500, Leo Famulari wrote: > Sure, I intend to land the patch in the next day or so. Alright, with the attached patch, X works in my tests, and xorg-server-for-tests is unchanged. It would be great to get some more testing from other X users. I tested with QEMU, using our VM image template: `guix environment guix -- ./pre-inst-env guix system vm-image --image-size=20G -t qcow2 gnu/system/examples/vm-image.tmpl` I can't test on bare metal due to . From 2b597e7887be70a0faaa04b9dabd69030dca6614 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 18 Dec 2021 15:30:41 -0500 Subject: [PATCH] gnu: xorg-server: Update to 21.1.2. * gnu/packages/xorg.scm (xorg-server): Update to 21.1.2. (xorg-server-for-tests): Use version 21.1.1. --- gnu/packages/xorg.scm | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9a854bcbf8..b09d95f770 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5235,16 +5235,15 @@ (define-public libxcvt (define-public xorg-server (package (name "xorg-server") - (version "21.1.1") + (version "21.1.2") (source (origin (method url-fetch) - (uri (string-append "https://xorg.freedesktop.org/archive/individual" "/xserver/xorg-server-" version ".tar.xz")) (sha256 (base32 - "0md7dqsc5qb30gym06c4zc2cjsdc5ps8nywk1bkcpix05kppybkq")) + "1c4dgvpv3kib8rhw37b00vc056nlb1z66c2lwzs4prz8kxmg82y2")) (patches (list ;; See: @@ -5361,7 +5360,30 @@ (define-public xorg-server (define-public xorg-server-for-tests (hidden-package (package - (inherit xorg-server)))) + (inherit xorg-server) + (version "21.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://xorg.freedesktop.org/archive/individual" + "/xserver/xorg-server-" version ".tar.xz")) + (sha256 + (base32 + "0md7dqsc5qb30gym06c4zc2cjsdc5ps8nywk1bkcpix05kppybkq")) + (patches + (list + ;; See: + ;; https://lists.fedoraproject.org/archives/list/devel@lists. + ;; fedoraproject.org/message/JU655YB7AM4OOEQ4MOMCRHJTYJ76VFOK/ + (origin + (method url-fetch) + (uri (string-append + "http://pkgs.fedoraproject.org/cgit/rpms/xorg-x11-server.git" + "/plain/06_use-intel-only-on-pre-gen4.diff")) + (sha256 + (base32 + "0mm70y058r8s9y9jiv7q2myv0ycnaw3iqzm7d274410s0ik38w7q")) + (file-name "xorg-server-use-intel-only-on-pre-gen4.diff"))))))))) (define-public eglexternalplatform (package