From nobody Thu Mar 30 19:03:23 2023 X-Original-To: dev-commits-ports-all@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 4PnXrD0Y3Bz42Bm0; Thu, 30 Mar 2023 19:03:24 +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 4PnXrC6xwqz3LCT; Thu, 30 Mar 2023 19:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680203004; 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=yCAZZF4yd3fzaG5yak1506yTWPShuRB56Z7X2d5CWNg=; b=fxifP9NgwUpLtEu2mFfa/UBDznULM0fIAGMg0fA40DsdMH3m1ccvGjCghy0ioZ5nEwUdEF +e6eeMM11AsTOxEPLO5qp2A37NRimQk8DgNNWF3hLOPvXLlfQvI2Vx6+pb6krpM2yxsn8w ImENilXYe1fiLN/rEcYTxtzB1s57cFJF4OZADNiY51oFjQQj+pazkBTlJm13SI4pKc6Mx4 GrEqswFoVifwcCKY+GMHP9JX96JK1+segz1Vk+gkUM8vnNho9waA5LoCd3+SMtNb2RydiO WIoGQ7bPCN1IPADMSXR3WJiE3g/tGiS4ZiJoPLWwffxK7kjYICT2sTHqUmo54Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680203004; 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=yCAZZF4yd3fzaG5yak1506yTWPShuRB56Z7X2d5CWNg=; b=syhJCCP8gOw99A6oiQB0eah+UxGZ7lpEiooM6Alwg64tOFD+pS0PhS0/xUF8PVd+WfjWl2 dIIEiweMqye16cfNdCU18irP17EXX5I0tkv4UWphTLWMpbCvEYYpFBdgRm6RxqSJvoO2mX yBA0D8J+gOKr7V+p1sGgaEtDCcYILbBpjOMQc2I6JZ8l7StJlkHXSmub6SrATGdnZwfgq+ xtBQldI0RZpaDH31aYnQVi93g0kZdcDqcMPeAGGu+/FOUtSYwtBUCOf/7ur6LmIAa5+gFU QQUiEYS+Og8ZsjtRm/r9NnvTyOXBeD9kX6i9O3uGARUq4McgiKYkrOV1mcC9pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680203004; a=rsa-sha256; cv=none; b=ag+bQYSSsUY+Xf/PC7YcvBplvvFD0PnMDMkvEub8E5A3ofmWLobvdbEkQFnYNpHXHUzY2h osebFzKQeUr4TMrAx7KzBbNl+jU/SHV9hIU6SWNuxwcdfqjBngOtRfQ3rSAKXxeeAcfLui Ckl2E2Iw8aVoDPaJ/4Od9nCML2e8+vEL9gYJsWihKGJ+pS1+oQ/oVDkyrDXiO9j32/eyKk LwRXK1EtZIkWsK8OI+zPUaIfrfIjsHyb0OrRD11EVqMsSHiK6ZLutobQi/EU2ApyFpTFBK uM+xMlO9BakGJK9xXKvewY5/Q+bfz6whuAtFxRA35Ic/gkLvxk/F8qEj8VBvkQ== 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 4PnXrC60x0zNgg; Thu, 30 Mar 2023 19:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UJ3NsI023495; Thu, 30 Mar 2023 19:03:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UJ3NnS023494; Thu, 30 Mar 2023 19:03:23 GMT (envelope-from git) Date: Thu, 30 Mar 2023 19:03:23 GMT Message-Id: <202303301903.32UJ3NnS023494@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: b6d89731d542 - main - x11-drivers/xf86-video-vesa: Add patch for ignoring if kernel as a driver List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: b6d89731d542582d2cc751e7a56b78df76a38ce7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6d89731d542582d2cc751e7a56b78df76a38ce7 commit b6d89731d542582d2cc751e7a56b78df76a38ce7 Author: Emmanuel Vadot AuthorDate: 2023-03-30 08:05:52 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-30 19:03:20 +0000 x11-drivers/xf86-video-vesa: Add patch for ignoring if kernel as a driver The vesa driver checks if the kernel as a driver attached to the pci device. This used to work before df10dcefa427 ("devel/libpciaccess: Update to 0.17") because we had a patch in libpciaccess that always said that the kernel didn't had any driver attached. This is obviously not a correct way. The problem is that vgapci is always attached for us so for pci video devices we always have a driver attached. Ignoring the check in xf86-video-vesa seems the best way for us. PR: 270509 Sponsored by: Beckhoff Automation GmbH & Co. KG --- x11-drivers/xf86-video-vesa/Makefile | 2 +- x11-drivers/xf86-video-vesa/files/patch-src_vesa.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile index eed980de9624..94cdbdab9a68 100644 --- a/x11-drivers/xf86-video-vesa/Makefile +++ b/x11-drivers/xf86-video-vesa/Makefile @@ -1,6 +1,6 @@ PORTNAME= xf86-video-vesa PORTVERSION= 2.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-vesa/files/patch-src_vesa.c b/x11-drivers/xf86-video-vesa/files/patch-src_vesa.c new file mode 100644 index 000000000000..440cb0520e80 --- /dev/null +++ b/x11-drivers/xf86-video-vesa/files/patch-src_vesa.c @@ -0,0 +1,15 @@ +--- src/vesa.c.orig 2023-03-30 07:58:49 UTC ++++ src/vesa.c +@@ -464,10 +464,12 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci + if (pScrn != NULL) { + VESAPtr pVesa; + ++#ifndef __FreeBSD__ + if (pci_device_has_kernel_driver(dev)) { + ErrorF("vesa: Ignoring device with a bound kernel driver\n"); + return FALSE; + } ++#endif + + pVesa = VESAGetRec(pScrn); + VESAInitScrn(pScrn);