Date: Wed, 7 Aug 2019 09:59:52 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r508309 - in branches/2019Q3/devel/libpciaccess: . files Message-ID: <201908070959.x779xqMt040740@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Wed Aug 7 09:59:52 2019 New Revision: 508309 URL: https://svnweb.freebsd.org/changeset/ports/508309 Log: MFH: r508214 devel/libpciaccess: Update to 0.16, fix regression Update devel/libpciaccess to 0.16. All local patches have been included in this version, so delete those files. Add a patch to fix a regression when using certain video drivers, xf86-video-mga, xf86-video-nv and xf86-video-vesa, at least, have been reported to have issues with 0.14. PR: 239065 (tracking the regression) Reported by: george@m5p.com, several others MFC after: 2019Q3 (fixes regression in 0.14) Sponsored by: B3 Init Obtained from: Graphics Team dev repo Approved by: ports-secteam (miwi) Added: branches/2019Q3/devel/libpciaccess/files/patch-src_freebsd__pci.c - copied unchanged from r508214, head/devel/libpciaccess/files/patch-src_freebsd__pci.c Deleted: branches/2019Q3/devel/libpciaccess/files/patch-configure.ac branches/2019Q3/devel/libpciaccess/files/patch-src-common_init.c branches/2019Q3/devel/libpciaccess/files/patch-src-freebsd_pci.c branches/2019Q3/devel/libpciaccess/files/patch-src-pciaccess_private.h Modified: branches/2019Q3/devel/libpciaccess/Makefile branches/2019Q3/devel/libpciaccess/distinfo Directory Properties: branches/2019Q3/ (props changed) Modified: branches/2019Q3/devel/libpciaccess/Makefile ============================================================================== --- branches/2019Q3/devel/libpciaccess/Makefile Wed Aug 7 09:58:15 2019 (r508308) +++ branches/2019Q3/devel/libpciaccess/Makefile Wed Aug 7 09:59:52 2019 (r508309) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libpciaccess -PORTVERSION= 0.14 +PORTVERSION= 0.16 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org @@ -9,8 +9,6 @@ COMMENT= Generic PCI access library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING - -USES= autoreconf BUILD_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pciids RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pciids Modified: branches/2019Q3/devel/libpciaccess/distinfo ============================================================================== --- branches/2019Q3/devel/libpciaccess/distinfo Wed Aug 7 09:58:15 2019 (r508308) +++ branches/2019Q3/devel/libpciaccess/distinfo Wed Aug 7 09:59:52 2019 (r508309) @@ -1,3 +1,3 @@ -TIMESTAMP = 1560371905 -SHA256 (xorg/lib/libpciaccess-0.14.tar.bz2) = 3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4 -SIZE (xorg/lib/libpciaccess-0.14.tar.bz2) = 361375 +TIMESTAMP = 1564692641 +SHA256 (xorg/lib/libpciaccess-0.16.tar.bz2) = 214c9d0d884fdd7375ec8da8dcb91a8d3169f263294c9a90c575bf1938b9f489 +SIZE (xorg/lib/libpciaccess-0.16.tar.bz2) = 366603 Copied: branches/2019Q3/devel/libpciaccess/files/patch-src_freebsd__pci.c (from r508214, head/devel/libpciaccess/files/patch-src_freebsd__pci.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q3/devel/libpciaccess/files/patch-src_freebsd__pci.c Wed Aug 7 09:59:52 2019 (r508309, copy of r508214, head/devel/libpciaccess/files/patch-src_freebsd__pci.c) @@ -0,0 +1,36 @@ +--- 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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908070959.x779xqMt040740>