[Midnightbsd-cvs] mports [23788] trunk/devel/libpciaccess: update to 0.13.5

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Aug 19 14:02:11 EDT 2018 

Revision: 23788
          http://svnweb.midnightbsd.org/mports/?rev=23788
Author:   laffer1
Date:     2018-08-19 14:02:11 -0400 (Sun, 19 Aug 2018)
Log Message:
-----------
update to 0.13.5

Modified Paths:
--------------
    trunk/devel/libpciaccess/Makefile
    trunk/devel/libpciaccess/distinfo
    trunk/devel/libpciaccess/files/patch-src-common_init.c
    trunk/devel/libpciaccess/files/patch-src-freebsd_pci.c
    trunk/devel/libpciaccess/files/patch-src-pciaccess_private.h
    trunk/devel/libpciaccess/pkg-descr
    trunk/devel/libpciaccess/pkg-plist

Modified: trunk/devel/libpciaccess/Makefile
===================================================================
--- trunk/devel/libpciaccess/Makefile	2018-08-19 17:59:48 UTC (rev 23787)
+++ trunk/devel/libpciaccess/Makefile	2018-08-19 18:02:11 UTC (rev 23788)
@@ -1,8 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	libpciaccess
-PORTVERSION=	0.13.2
-PORTREVISION=	2
+PORTVERSION=	0.13.5
 CATEGORIES=	devel
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -10,11 +9,13 @@
 
 LICENSE=	mit
 
-BUILD_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
-RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
+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
+CONFIGURE_ARGS=	--with-pciids-path=${LOCALBASE}/share/pciids
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd10.4
 
 XORG_CAT=	lib
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>

Modified: trunk/devel/libpciaccess/distinfo
===================================================================
--- trunk/devel/libpciaccess/distinfo	2018-08-19 17:59:48 UTC (rev 23787)
+++ trunk/devel/libpciaccess/distinfo	2018-08-19 18:02:11 UTC (rev 23788)
@@ -1,2 +1,3 @@
-SHA256 (xorg/lib/libpciaccess-0.13.2.tar.bz2) = abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19
-SIZE (xorg/lib/libpciaccess-0.13.2.tar.bz2) = 359231
+TIMESTAMP = 1491605095
+SHA256 (xorg/lib/libpciaccess-0.13.5.tar.bz2) = 752c54e9b3c311b4347cb50aea8566fa48eab274346ea8a06f7f15de3240b999
+SIZE (xorg/lib/libpciaccess-0.13.5.tar.bz2) = 381729

Modified: trunk/devel/libpciaccess/files/patch-src-common_init.c
===================================================================
--- trunk/devel/libpciaccess/files/patch-src-common_init.c	2018-08-19 17:59:48 UTC (rev 23787)
+++ trunk/devel/libpciaccess/files/patch-src-common_init.c	2018-08-19 18:02:11 UTC (rev 23788)
@@ -1,6 +1,6 @@
---- src/common_init.c.orig	2008-10-11 18:31:00.000000000 +0000
-+++ src/common_init.c	2009-03-29 20:10:52.000000000 +0000
-@@ -70,7 +70,9 @@
+--- src/common_init.c.orig	2015-02-03 23:59:14 UTC
++++ src/common_init.c
+@@ -72,7 +72,9 @@ pci_system_init( void )
  void
  pci_system_init_dev_mem(int fd)
  {

Modified: trunk/devel/libpciaccess/files/patch-src-freebsd_pci.c
===================================================================
--- trunk/devel/libpciaccess/files/patch-src-freebsd_pci.c	2018-08-19 17:59:48 UTC (rev 23787)
+++ trunk/devel/libpciaccess/files/patch-src-freebsd_pci.c	2018-08-19 18:02:11 UTC (rev 23788)
@@ -1,5 +1,5 @@
---- src/freebsd_pci.c.orig	2013-08-14 12:31:57.519923558 +0200
-+++ src/freebsd_pci.c	2013-08-14 12:31:36.809923955 +0200
+--- src/freebsd_pci.c.orig	2015-02-03 23:59:14 UTC
++++ src/freebsd_pci.c
 @@ -39,6 +39,11 @@
  #include <unistd.h>
  #include <fcntl.h>
@@ -23,7 +23,7 @@
  /**
   * FreeBSD private pci_system structure that extends the base pci_system
   * structure.
-@@ -105,12 +114,18 @@
+@@ -105,12 +114,18 @@ pci_device_freebsd_map_range(struct pci_
  {
      const int prot = ((map->flags & PCI_DEV_MAP_FLAG_WRITABLE) != 0)
          ? (PROT_READ | PROT_WRITE) : PROT_READ;
@@ -42,7 +42,7 @@
      if (fd == -1)
  	return errno;
  
-@@ -120,6 +135,7 @@
+@@ -120,6 +135,7 @@ pci_device_freebsd_map_range(struct pci_
  	err = errno;
      }
  
@@ -50,7 +50,7 @@
      mrd.mr_base = map->base;
      mrd.mr_len = map->size;
      strncpy(mrd.mr_owner, "pciaccess", sizeof(mrd.mr_owner));
-@@ -140,6 +156,7 @@
+@@ -140,6 +156,7 @@ pci_device_freebsd_map_range(struct pci_
      }
  
      close(fd);
@@ -58,7 +58,7 @@
  
      return err;
  }
-@@ -148,6 +165,7 @@
+@@ -148,6 +165,7 @@ static int
  pci_device_freebsd_unmap_range( struct pci_device *dev,
  				struct pci_device_mapping *map )
  {
@@ -66,7 +66,7 @@
      struct mem_range_desc mrd;
      struct mem_range_op mro;
      int fd;
-@@ -173,6 +191,7 @@
+@@ -173,6 +191,7 @@ pci_device_freebsd_unmap_range( struct p
  	    fprintf(stderr, "Failed to open /dev/mem\n");
  	}
      }
@@ -74,7 +74,7 @@
  
      return pci_device_generic_unmap_range(dev, map);
  }
-@@ -295,7 +314,11 @@
+@@ -295,7 +314,11 @@ pci_device_freebsd_read_rom( struct pci_
      }
  
      printf("Using rom_base = 0x%lx\n", (long)rom_base);
@@ -86,7 +86,7 @@
      if ( memfd == -1 )
  	return errno;
  
-@@ -308,7 +331,9 @@
+@@ -308,7 +331,9 @@ pci_device_freebsd_read_rom( struct pci_
      memcpy( buffer, bios, dev->rom_size );
  
      munmap( bios, dev->rom_size );
@@ -96,7 +96,7 @@
  
      if (pci_rom) {
  	pci_device_cfg_write_u32( dev, PCIR_BIOS, rom );
-@@ -343,7 +368,6 @@
+@@ -343,7 +368,6 @@ pci_device_freebsd_get_num_regions( stru
  static int
  pci_device_freebsd_probe( struct pci_device * dev )
  {
@@ -104,7 +104,7 @@
      struct pci_bar_io bar;
      uint8_t irq;
      int err, i;
-@@ -563,136 +587,152 @@
+@@ -563,138 +587,153 @@ pci_system_freebsd_destroy(void)
      freebsd_pci_sys = NULL;
  }
  
@@ -115,7 +115,10 @@
  static struct pci_io_handle *
 -pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
 -    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
--{
++pci_device_freebsd_open_legacy_io( struct pci_io_handle *ret,
++				   struct pci_device *dev, pciaddr_t base,
++				   pciaddr_t size )
+ {
 -#if defined(__i386__) || defined(__amd64__)
 -	ret->fd = open("/dev/io", O_RDWR | O_CLOEXEC);
 -
@@ -124,6 +127,7 @@
 -
 -	ret->base = base;
 -	ret->size = size;
+-	ret->is_legacy = 1;
 -	return ret;
 -#elif defined(PCI_MAGIC_IO_RANGE)
 -	ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
@@ -133,11 +137,8 @@
 -
 -	ret->base = base;
 -	ret->size = size;
+-	ret->is_legacy = 1;
 -	return ret;
-+pci_device_freebsd_open_legacy_io( struct pci_io_handle *ret,
-+				   struct pci_device *dev, pciaddr_t base,
-+				   pciaddr_t size )
-+{
 +#if defined(__sparc64__)
 +    ret->memory = mmap( NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
 +	screenfd, base );
@@ -150,6 +151,7 @@
  #endif
 +    ret->base = base;
 +    ret->size = size;
++    ret->is_legacy = 1;
 +    return ret;
  }
  
@@ -333,7 +335,7 @@
  }
  
  static const struct pci_system_methods freebsd_pci_methods = {
-@@ -706,9 +746,7 @@
+@@ -708,9 +747,7 @@ static const struct pci_system_methods f
      .write = pci_device_freebsd_write,
      .fill_capabilities = pci_fill_capabilities_generic,
      .open_legacy_io = pci_device_freebsd_open_legacy_io,
@@ -343,7 +345,7 @@
      .read32 = pci_device_freebsd_read32,
      .read16 = pci_device_freebsd_read16,
      .read8 = pci_device_freebsd_read8,
-@@ -790,3 +828,11 @@
+@@ -792,3 +829,11 @@ pci_system_freebsd_create( void )
  
      return 0;
  }

Modified: trunk/devel/libpciaccess/files/patch-src-pciaccess_private.h
===================================================================
--- trunk/devel/libpciaccess/files/patch-src-pciaccess_private.h	2018-08-19 17:59:48 UTC (rev 23787)
+++ trunk/devel/libpciaccess/files/patch-src-pciaccess_private.h	2018-08-19 18:02:11 UTC (rev 23788)
@@ -1,6 +1,6 @@
---- src/pciaccess_private.h.orig	2008-10-11 18:31:00.000000000 +0000
-+++ src/pciaccess_private.h	2009-03-29 20:07:50.000000000 +0000
-@@ -136,6 +136,7 @@
+--- src/pciaccess_private.h.orig	2015-02-03 23:59:14 UTC
++++ src/pciaccess_private.h
+@@ -185,6 +185,7 @@ extern struct pci_system * pci_sys;
  
  extern int pci_system_linux_sysfs_create( void );
  extern int pci_system_freebsd_create( void );

Modified: trunk/devel/libpciaccess/pkg-descr
===================================================================
--- trunk/devel/libpciaccess/pkg-descr	2018-08-19 17:59:48 UTC (rev 23787)
+++ trunk/devel/libpciaccess/pkg-descr	2018-08-19 18:02:11 UTC (rev 23788)
@@ -1,3 +1,3 @@
 This package contains the pciaccess library.
 
-WWW: http://www.freedesktop.org/Software/xlibs
+WWW: https://www.freedesktop.org/wiki/Software/xlibs/

Modified: trunk/devel/libpciaccess/pkg-plist
===================================================================
--- trunk/devel/libpciaccess/pkg-plist	2018-08-19 17:59:48 UTC (rev 23787)
+++ trunk/devel/libpciaccess/pkg-plist	2018-08-19 18:02:11 UTC (rev 23788)
@@ -1,6 +1,5 @@
 include/pciaccess.h
 lib/libpciaccess.a
-lib/libpciaccess.la
 lib/libpciaccess.so
 lib/libpciaccess.so.0
 lib/libpciaccess.so.0.11.1

More information about the Midnightbsd-cvs mailing list