From nobody Fri Oct 27 09:17:48 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SGxs84PK6z4y25C; Fri, 27 Oct 2023 09:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SGxs83sMZz3ZHj; Fri, 27 Oct 2023 09:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698398268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uoDtc2nDauIf3s7x1qXKmilhdV+2PvY5PJ4LXmm6P6M=; b=eYj05JOpp2FGNBsUingKzPN8f+tFJNclgbQ6X61Hc/zgUs18B+kK252JQpPXMTT28vMC6p RI1LX/5ZVUtfAc0wP7B5a9IHwF/cfCtEpXs2NQp3d2nJRTPgIJDBoGGGY3aCmmflOQEBjg kQoXPuox9Dg98p8DFqo+P8BTE2bBZOZkxBK+0uLjpt8JR3uQ8oQN2rOxQtFSfMCc5WJDcq p4oKYAN4GUsrq8cnT20tdBbY4u/xVvI+M1EWs22LblHvdS0gOQmavYPmIJBcrUA+ThPjPS Rbfc+U3e2I15TY33hqV5aqr8gZE68eIwPHRkEE7Qq1qdGfmqsmP9XlCM9RF1BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698398268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uoDtc2nDauIf3s7x1qXKmilhdV+2PvY5PJ4LXmm6P6M=; b=rceT3rpiynBcIAqkjADVs2XCy0vilN85UiPiXh63gI3WJ/y9xtEGvekB8S0N700Daq1yV8 u2CFDgA6k6ehwuxMKFT0TtQO5C0N92sl1SJnaTbuA7Gw41XuvEXfqPGzu434+gcDu54PLz iatgkUsixnb/vxXwb8XGtAv1PyilTiFuAzqYlsJUSSCIsVBJUkF3A6YrGdXcL/o1Gtz9Eb xxfksok4XHxmfWp10YRREFOdEjWFkqQilQw5ZcX7q0M49wwdIaEoxymgLdmxH9ZuP/YBRG tD8BlCxobGIQCKHuQ5llRem/nAJqlx912ORYT31DjnPZFjJdz/l6CnIdHreEFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698398268; a=rsa-sha256; cv=none; b=U1Y4tVSyJ1CFufF6b2+2oN9vWI6zZGIAR4oko2iQ+XZPt+QgUtQ5q3eMFSlFsFDe8F/wCA JlH44YUvhBi1DgK6e3/mCga0isCdlQXA7ZYmLrl6q8t+RbWbllNHTQiAARH/FozRQTqxaG qheKwRfl6H8VyVPivnPxjwcMAYiEgBjfDleHouGs1wSpKK97rOPoxnbH/dlVfONoIPEhS7 FRHAY0Lm5LLbr1TgENQ+BNJFOOPyJ++wbaBRODqyQLBMJNnqjFMXUp7KWF7emAdJ1o/hlS p7Bi4veZJdHlsHIom+j97OiBghc+V6MTDl9G3icakF/wVHVthA8hhpiT5cbnHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SGxs82ysPz17NC; Fri, 27 Oct 2023 09:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39R9HmPJ059721; Fri, 27 Oct 2023 09:17:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39R9HmUU059718; Fri, 27 Oct 2023 09:17:48 GMT (envelope-from git) Date: Fri, 27 Oct 2023 09:17:48 GMT Message-Id: <202310270917.39R9HmUU059718@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 285157eaa532 - 2023Q4 - x11-servers/xorg-server: Implement -novtswitch option handling. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 285157eaa53251edf421d5dc46bc86436ee26e5d Auto-Submitted: auto-generated The branch 2023Q4 has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=285157eaa53251edf421d5dc46bc86436ee26e5d commit 285157eaa53251edf421d5dc46bc86436ee26e5d Author: Gleb Popov AuthorDate: 2023-09-28 18:13:22 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-27 09:17:33 +0000 x11-servers/xorg-server: Implement -novtswitch option handling. Sponsored by: Serenity Cybersecurity, LLC Differential Revision: https://reviews.freebsd.org/D42014 (cherry picked from commit 3f2ce0f6a0e48c004c02b00e79658180f424574c) --- x11-servers/xorg-server/Makefile | 2 +- .../patch-hw_xfree86_os-support_bsd_bsd__init.c | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 089fe72c7c99..7903e64aa44c 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= xorg PORTVERSION= 21.1.8 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c index 011f3becc26f..09ab0b818b37 100644 --- a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c +++ b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c @@ -1,5 +1,5 @@ ---- hw/xfree86/os-support/bsd/bsd_init.c.orig 2022-01-02 23:41:56.000000000 +0100 -+++ hw/xfree86/os-support/bsd/bsd_init.c 2022-06-29 11:57:25.596851000 +0200 +--- hw/xfree86/os-support/bsd/bsd_init.c.orig 2023-03-29 12:55:03 UTC ++++ hw/xfree86/os-support/bsd/bsd_init.c @@ -48,6 +48,8 @@ static int initialVT = -1; #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) static int VTnum = -1; @@ -54,6 +54,15 @@ } else { /* xf86Info.ShareVTs */ close(xf86Info.consoleFd); +@@ -303,7 +329,7 @@ xf86OpenConsole() + else { + /* serverGeneration != 1 */ + #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) +- if (!xf86Info.ShareVTs && ++ if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch && + (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT)) { + if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0) { + xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n"); @@ -594,6 +620,8 @@ xf86CloseConsole() case SYSCONS: case PCVT: @@ -63,3 +72,12 @@ if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1) { VT.mode = VT_AUTO; ioctl(xf86Info.consoleFd, VT_SETMODE, &VT); /* dflt vt handling */ +@@ -604,7 +632,7 @@ xf86CloseConsole() + strerror(errno)); + } + #endif +- if (initialVT != -1) ++ if (xf86Info.autoVTSwitch && initialVT != -1) + ioctl(xf86Info.consoleFd, VT_ACTIVATE, initialVT); + break; + #endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */