From nobody Thu Aug 01 13:35:05 2024 X-Original-To: dev-commits-ports-main@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 4WZVMF1mn2z5SmqY; Thu, 01 Aug 2024 13:35:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZVMF1B1rz494P; Thu, 1 Aug 2024 13:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722519305; 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=2KszjjPFl4/5XN2EOPoylqAvOEroRoDfwZn3wcpfgCk=; b=oW5U13kuqRWP6VPVPqwiInu+PFcRRJj/XYlUJhWkwP4YQjGV8Sh4qQ4IR3/W9YOl3tqIpK FLia7lcOmSHoNMif/dlwHAJlgi+1Bhkti+WHZZj5DH+s0U+bSZKlB/v3FHq9Sfkq9Zjc0j Ogfo9Vr45v+NxLHY5sGPM5WBKw2kJI5BWbGZWojc8r8NFh43nAdCF6PahgqJIbvyDL4H0y tH/IjPssrZps3+qbKvaDBFrHGnei6iXy6+aF5ypTnpdSGIks72b9Z4kXg/R08+P8EZTnvO CYAFsPkjRBFwM2w+xa0VwZnvq1yrQSRMAp1jwXAPuPvmwwc7WZNffRITPGvoFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722519305; a=rsa-sha256; cv=none; b=UADQ1xf0JQY9O+BBYZ/PIOv3fENDj+Xwl3o6UqKa9UFBx2E420ii0JsZ2vmNZDspNIKlID CRURprKOwYmkqy8bp3dKt36h7iGr1UL9GqdAx/WKJ2GO67LU/LPq9FRWAxcaO1ioy4I7QH 5r9NEu/x7Ep5nEaZSYo5iObV3xpJUz5PzoJ9mCHqB/pI5E7mVDuiOYB4H2blFRUsXph4Sx nfWdfqNXn8nbgPELDJQEivT6WQVa3Selqzzu9U/N7f2VUSZcz9VQEIt87LgF6LvkmU1hqF lefHl8vmH7Dv6VyaHBE0IVV5/jMfqGjP004uhahFhSg+pbKtxWrTkP6e5wVemg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722519305; 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=2KszjjPFl4/5XN2EOPoylqAvOEroRoDfwZn3wcpfgCk=; b=k3jACEJ7HTsAXNx+DCl4epqG2LOflimirr1Oj6AtkhM21dQ0arqauqgygFhBS8m/2PKvSE CQ9onaAmNR/NuMqfUcwFuN9WsWZkHsv+1n9oVgYlXE2XI3jU+ODm1m8ggpP6Kq7UYgbdlr 1iE4Z7NgrrQeVn9yPzWZlg9Oh8N92G9t4AuyGCu9yiXpu+mCZY7Ylefofo+qLhB92ILTPh 3FeHzt8fEaYdaQVWVPbrWM6NJZ1l85GhHJGmwBhDMT7BdImqfdfk+It+XTqGq97lHbJUeq Z/R1vMnz6Ah+kMlBUM2RBJsqJSgSdJb1YHIjNag71eI3nv9t+VWG4ap4i92RvA== 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 4WZVMF0nRLzmcf; Thu, 1 Aug 2024 13:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471DZ5H7021191; Thu, 1 Aug 2024 13:35:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471DZ5D1021188; Thu, 1 Aug 2024 13:35:05 GMT (envelope-from git) Date: Thu, 1 Aug 2024 13:35:05 GMT Message-Id: <202408011335.471DZ5D1021188@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: 29ca44b9b5b8 - main - x11-drivers/xf86-video-ast: Fix pci access after df10dcefa427 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 29ca44b9b5b8893d4a80b3053fa40756303668b2 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=29ca44b9b5b8893d4a80b3053fa40756303668b2 commit 29ca44b9b5b8893d4a80b3053fa40756303668b2 Author: Emmanuel Vadot AuthorDate: 2024-08-01 13:32:52 +0000 Commit: Emmanuel Vadot CommitDate: 2024-08-01 13:34:26 +0000 x11-drivers/xf86-video-ast: Fix pci access after df10dcefa427 Sponsored by: Beckhoff Automation GmbH & Co. KG PR: 270509 --- x11-drivers/xf86-video-ast/Makefile | 2 +- .../xf86-video-ast/files/patch-src_ast__driver.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/x11-drivers/xf86-video-ast/Makefile b/x11-drivers/xf86-video-ast/Makefile index 82ed3865bc7f..b9bfc30f72ee 100644 --- a/x11-drivers/xf86-video-ast/Makefile +++ b/x11-drivers/xf86-video-ast/Makefile @@ -1,6 +1,6 @@ PORTNAME= xf86-video-ast PORTVERSION= 1.1.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-ast/files/patch-src_ast__driver.c b/x11-drivers/xf86-video-ast/files/patch-src_ast__driver.c new file mode 100644 index 000000000000..172e8a4ed7a3 --- /dev/null +++ b/x11-drivers/xf86-video-ast/files/patch-src_ast__driver.c @@ -0,0 +1,19 @@ +--- src/ast_driver.c.orig 2024-08-01 13:20:24 UTC ++++ src/ast_driver.c +@@ -273,6 +273,8 @@ ASTProbe(DriverPtr drv, int flags) + + #ifdef XSERVER_LIBPCIACCESS + { ++#ifndef __FreeBSD__ ++ /* FreeBSD always has vgapci driver attached. */ + struct pci_device *pPci = xf86GetPciInfoForEntity(usedChips[i]); + + if (pci_device_has_kernel_driver(pPci)) { +@@ -289,6 +291,7 @@ ASTProbe(DriverPtr drv, int flags) + free(devSections); + return FALSE; + } ++#endif + } + #endif +