From nobody Mon Aug 05 07:17:34 2024 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 4Wcnnp6MT9z5SjdL; Mon, 05 Aug 2024 07:17:34 +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 4Wcnnp5lZsz4h5r; Mon, 5 Aug 2024 07:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722842254; 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=BQ/JMH1UygTuLV+PQTbnkG3Kh0E2O4iiOPVI7+KHCJM=; b=aN3QjTWfMAHzlxum0EsYFvd1LNaZVRNR6mDeyExNPKd29zcJYdNEmIJgRjRX4hcE2w9oY5 Guze/nvhqLegn+zbdUMyVPXCxoxUSZlYKxaOwVKf9rjb/TMvKEIE1AjyS9R6VD9pPzPkST 9oMUWeRkvVdaR/tPIsKGGLQC2Fbf/+KOESd1ppfSl47lgM7Esz+RfJQHBxRwm85wZMoBqg /hs57TxJz6PGkRP3Rdu0gMgtWPWvCHku3otyNeXxXDKriYNxFw8aZpGjOQjfMQIyy2MJgU L4PetdkxjuoTNwvv+xM/aYqudQPgQ7Q0ssFC1VQHxtSI5kKXIgEwVXLhqRDjbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722842254; a=rsa-sha256; cv=none; b=WB79kQQIAPvEb52hnkxbzyqp4X9uyHgWW6z722iFx+wDQvu2zyN1O2W4YSl3fKRsEh4ezJ km602NGaHfMMW3cqwhfEX7rdZtrE9Xelfkyd2OSx9x3kxMNcsndrEy4Bmgxi4wJ+eC/Me2 +1BzJzItQ/cA3jjeR9OK9NpGgHMJ8DB0Un/9jjS+W4IOFY1bfB4yWGi1Jg1W5GGNZmAP7d 5sCWU5b5LIxjyvoTJYeid3U9ZoqrVRLks2fEqLN6qgtq5OaaGeRk2tKnTHgJ7Lyut+Wtlc U4jD66JuAvB/e1a+y0pagUqPGtFq32kvwcNKsOY4agkPZoqpcrVUK7SZUdbAqg== 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=1722842254; 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=BQ/JMH1UygTuLV+PQTbnkG3Kh0E2O4iiOPVI7+KHCJM=; b=eSkIS6CsrTPCi6HrN9XTTTH1wKDxTYxHASvNdUNLFg2IgIZgY5KdBsEliGldT1O2lJU0no wrrCJhaKNQGruTQZ/N4vQmDBfcYwLpfrBttLR878w0TAkg2c1e76KpD70q4qbeHViBAQL/ xbTFk+2FAXPG0vYSuAfKbcW2w22yi3wyNrsWjCvg/yEZy+Ua49ZGVr2988yoxPS6m5JZkS f62HYwOP6mVw3Ta8DA2+sIdeBxuGcfCcIUjjRqsQ0864mHuj9Q1gXsYrL/vXBlU4sMSBDm erOcoa/ozZg5HcjXvJhfyo4Zza5UcAKAFyvGM6lhqb9qbt0bpFBtssrkLEeW6w== 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 4Wcnnp4MmczDjD; Mon, 5 Aug 2024 07:17:34 +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 4757HY36080061; Mon, 5 Aug 2024 07:17:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4757HYNF080058; Mon, 5 Aug 2024 07:17:34 GMT (envelope-from git) Date: Mon, 5 Aug 2024 07:17:34 GMT Message-Id: <202408050717.4757HYNF080058@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: 898cd9b14352 - 2024Q3 - x11-drivers/xf86-video-ast: Fix pci access after df10dcefa427 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 898cd9b1435203590d214138cf2b45197ddb9141 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=898cd9b1435203590d214138cf2b45197ddb9141 commit 898cd9b1435203590d214138cf2b45197ddb9141 Author: Emmanuel Vadot AuthorDate: 2024-08-01 13:32:52 +0000 Commit: Emmanuel Vadot CommitDate: 2024-08-05 07:17:05 +0000 x11-drivers/xf86-video-ast: Fix pci access after df10dcefa427 Sponsored by: Beckhoff Automation GmbH & Co. KG PR: 270509 (cherry picked from commit 29ca44b9b5b8893d4a80b3053fa40756303668b2) --- 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 +