From nobody Sun Mar 26 17:32:36 2023 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 4Pl31J5Dr7z425TH; Sun, 26 Mar 2023 17:32:36 +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 4Pl31J2bF8z3mL5; Sun, 26 Mar 2023 17:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679851956; 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=MJfIZCoQCrl7gRNyebRKieDYYN4J6FQXSadSAQRtfxQ=; b=fnYfq+ISVQd2vTSQ6M0Dr0BrW232XdVPoL1yEQQSl+8kuVZATGG8L+mdM8kv+/XaEE6CDF R3gsRrNBmx9qIfIuHp8xKWpQj8NEesdZSQxTKfRXwkt8vCNE9HOG0oWR0Aps9/VIu+4V/T IenXuT09OV5ti42O0swJwSRHljQw9EMMmS5MRZ6IVD5WmphmW7RGt48074HO6xcOPHu2LH deHY6kE0OsfsNsC84QMjh+Dlg0DOPoRb3qkqb3rWOnFKgMDHYBuEeElftz7igSQCJLv9Ev H5tecqqE5a6Y+4ikhYEy9qfZgPkbA93XcI5ReP7MTMwOtjB1IaVvE0abYyH8/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679851956; 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=MJfIZCoQCrl7gRNyebRKieDYYN4J6FQXSadSAQRtfxQ=; b=jXil/sWwF0UriFtahMfddjg956+gOjmP2k05buAsFGkhOz9oFqpvfDMw8HzCcOycVzZS51 vVUOv3M2FzmJHsTlS7eo/+IkFdPTf6K8lUzP+9qHJeabOTSG+cvy4fUPyqNljZhP02HwTP KsFUOrh9O0/klbzr8Xn9uwv9yQpRrz/kEI75s8DMmZH5+XDojvZAE+St7WYWBroj9enzK+ FzIfMxSiSI8dY2nBAT0ugG6fbHV+r/OiIm/vBDRexY4Qatgz03ZKHWklJ9pqZx546tQfWJ TF4HtTWpTqE7Z49o1xFB6/vwwnqghvshe3rtHd30mAa86cTNtDuEwigPynH1Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679851956; a=rsa-sha256; cv=none; b=PYYajipuRa8XXPV+kM3NvDncIXxQZ2PACV+Nffm1QmoQfD5OUj/X12tUbUrvVLSaD0N3wg d3By4tqVYTEqLlOR5jj10a96NvjGObU0KXbpWrNnp1oe7crmD24ny9eVXnZaYEdtmY2O8Y F83P/KKNm6M90lQDNDjtzqOoAyA3/DR42qAYf1gtXKxh9nDdMnIyirBJ34/AwqfaPP47x6 bJIaRtrmMElhN783IdJtNMBjmszpXxhvlD7R0N5nXhvi4MJ/zcUD/wtIy04PhFE9PbGd7U xDxsz7HCzBuyD8DmlWB8q0uuSLVbm/bBU5O0eh1HP0pUJ+aWlDa1OPz8AsIl4A== 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 4Pl31J1gzGzq88; Sun, 26 Mar 2023 17:32:36 +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 32QHWa7Q099036; Sun, 26 Mar 2023 17:32:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32QHWaV9099035; Sun, 26 Mar 2023 17:32:36 GMT (envelope-from git) Date: Sun, 26 Mar 2023 17:32:36 GMT Message-Id: <202303261732.32QHWaV9099035@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: df10dcefa427 - main - devel/libpciaccess: Update to 0.17 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: df10dcefa427fcc3a4b1405387b12466dc5a9cdc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=df10dcefa427fcc3a4b1405387b12466dc5a9cdc commit df10dcefa427fcc3a4b1405387b12466dc5a9cdc Author: Emmanuel Vadot AuthorDate: 2023-03-24 08:55:10 +0000 Commit: Emmanuel Vadot CommitDate: 2023-03-26 17:31:30 +0000 devel/libpciaccess: Update to 0.17 While here use upstreamed patches and remove dep on pciics, if the file exists it is prefered but by default use pci_vendors from base. Releases notes: https://lists.x.org/archives/xorg-announce/2022-October/003226.html Sponsored by: Beckhoff Automation GmbH & Co. KG --- devel/libpciaccess/Makefile | 13 ++++---- devel/libpciaccess/distinfo | 10 +++++-- devel/libpciaccess/files/patch-src_freebsd__pci.c | 36 ----------------------- devel/libpciaccess/pkg-plist | 1 - 4 files changed, 13 insertions(+), 47 deletions(-) diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile index b8536bf4b9b7..9673f4c94651 100644 --- a/devel/libpciaccess/Makefile +++ b/devel/libpciaccess/Makefile @@ -1,7 +1,11 @@ PORTNAME= libpciaccess -PORTVERSION= 0.16 +PORTVERSION= 0.17 CATEGORIES= devel +PATCH_SITES= https://gitlab.freedesktop.org/xorg/lib/${PORTNAME}/-/commit/ +PATCHFILES+= 7f7d12445c3c.patch:-p1 #https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/merge_requests/27 +PATCHFILES+= 4ee437c98c2d.patch:-p1 #https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/merge_requests/28 + MAINTAINER= x11@FreeBSD.org COMMENT= Generic PCI access library WWW= https://www.freedesktop.org/wiki/Software/xlibs/ @@ -9,12 +13,7 @@ WWW= https://www.freedesktop.org/wiki/Software/xlibs/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pciids -RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pciids - -CONFIGURE_ARGS= --with-pciids-path=${LOCALBASE}/share/pciids - -USES= xorg-cat:lib +USES= tar:xz xorg-cat:lib,meson INSTALL_TARGET= install-strip .include diff --git a/devel/libpciaccess/distinfo b/devel/libpciaccess/distinfo index 37085ff2c0d7..b42c4e613c50 100644 --- a/devel/libpciaccess/distinfo +++ b/devel/libpciaccess/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1564692641 -SHA256 (xorg/lib/libpciaccess-0.16.tar.bz2) = 214c9d0d884fdd7375ec8da8dcb91a8d3169f263294c9a90c575bf1938b9f489 -SIZE (xorg/lib/libpciaccess-0.16.tar.bz2) = 366603 +TIMESTAMP = 1679655835 +SHA256 (xorg/lib/libpciaccess-0.17.tar.xz) = 74283ba3c974913029e7a547496a29145b07ec51732bbb5b5c58d5025ad95b73 +SIZE (xorg/lib/libpciaccess-0.17.tar.xz) = 331768 +SHA256 (xorg/lib/7f7d12445c3c.patch) = 372a5615b3643b7d67b22f542033c9a2a5ba70e570eeda3cfdb2331c3927d431 +SIZE (xorg/lib/7f7d12445c3c.patch) = 1002 +SHA256 (xorg/lib/4ee437c98c2d.patch) = 10065f02a32c00b2e234cd89c973f4346cd633c1c812463eb02dc805b326cc39 +SIZE (xorg/lib/4ee437c98c2d.patch) = 7331 diff --git a/devel/libpciaccess/files/patch-src_freebsd__pci.c b/devel/libpciaccess/files/patch-src_freebsd__pci.c deleted file mode 100644 index 434267b954e0..000000000000 --- a/devel/libpciaccess/files/patch-src_freebsd__pci.c +++ /dev/null @@ -1,36 +0,0 @@ ---- src/freebsd_pci.c.orig 2019-07-17 16:25:27 UTC -+++ src/freebsd_pci.c -@@ -421,24 +421,6 @@ pci_system_freebsd_destroy( void ) - freebsd_pci_sys = NULL; - } - --static int --pci_device_freebsd_has_kernel_driver( struct pci_device *dev ) --{ -- struct pci_io io; -- -- io.pi_sel.pc_domain = dev->domain; -- io.pi_sel.pc_bus = dev->bus; -- io.pi_sel.pc_dev = dev->dev; -- io.pi_sel.pc_func = dev->func; -- -- if ( ioctl( freebsd_pci_sys->pcidev, PCIOCATTACHED, &io ) < 0 ) { -- return 0; -- } -- -- /* if io.pi_data is 0, no driver is attached */ -- return io.pi_data == 0 ? 0 : 1; --} -- - static struct pci_io_handle * - pci_device_freebsd_open_legacy_io( struct pci_io_handle *ret, - struct pci_device *dev, pciaddr_t base, -@@ -614,7 +596,7 @@ static const struct pci_system_methods freebsd_pci_met - .fill_capabilities = pci_fill_capabilities_generic, - .enable = NULL, - .boot_vga = NULL, -- .has_kernel_driver = pci_device_freebsd_has_kernel_driver, -+ .has_kernel_driver = NULL, - - .open_device_io = pci_device_freebsd_open_io, - .open_legacy_io = pci_device_freebsd_open_legacy_io, diff --git a/devel/libpciaccess/pkg-plist b/devel/libpciaccess/pkg-plist index 1c283a8a1e5f..b6196a03d1b4 100644 --- a/devel/libpciaccess/pkg-plist +++ b/devel/libpciaccess/pkg-plist @@ -1,5 +1,4 @@ include/pciaccess.h -lib/libpciaccess.a lib/libpciaccess.so lib/libpciaccess.so.0 lib/libpciaccess.so.0.11.1