[xsrc/trunk]: xsrc/external/mit/libpciaccess/dist initial import of libpciacc...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/468c50210b07
branches:  trunk
changeset: 10458:468c50210b07
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Feb 23 09:57:46 2020 +0000

description:
initial import of libpciaccess-0.16

diffstat:

 external/mit/libpciaccess/dist/ChangeLog         |  21 +++++++++++++++++++++
 external/mit/libpciaccess/dist/configure         |  20 ++++++++++----------
 external/mit/libpciaccess/dist/configure.ac      |   2 +-
 external/mit/libpciaccess/dist/src/linux_sysfs.c |   2 +-
 external/mit/libpciaccess/dist/src/x86_pci.c     |  14 ++++++--------
 5 files changed, 39 insertions(+), 20 deletions(-)

diffs (187 lines):

diff -r e48d230a0edc -r 468c50210b07 external/mit/libpciaccess/dist/ChangeLog
--- a/external/mit/libpciaccess/dist/ChangeLog  Sun Feb 23 09:57:41 2020 +0000
+++ b/external/mit/libpciaccess/dist/ChangeLog  Sun Feb 23 09:57:46 2020 +0000
@@ -1,3 +1,24 @@
+commit fbd1f0fe79ba25b72635f8e36a6c33d7e0ca19f6
+Author: Adam Jackson <ajax%redhat.com@localhost>
+Date:   Wed Jul 17 12:24:48 2019 -0400
+
+    libpciaccess 0.16
+
+commit f834c15afb49aa340c44374c6e00ef303b076ace
+Author: Damien Zammit <damien%zamaudio.com@localhost>
+Date:   Sun May 19 20:33:21 2019 +1000
+
+    x86: Use MAP_SHARED for memory/rom region mmap && fix mode
+
+commit 1d71669e577f5f2eb02542851696d3bcb722a80b
+Author: Adam Jackson <ajax%redhat.com@localhost>
+Date:   Thu Jul 11 12:56:40 2019 -0400
+
+    linux: Don't try to include <sys/io.h> on arm
+    
+    It no longer exists in newer glibc, and didn't work like you'd have
+    hoped on anything but strongarm anyway.
+
 commit 726e27bedf163597b5c948b66daeacf9b76f441a
 Author: Adam Jackson <ajax%redhat.com@localhost>
 Date:   Thu Jul 11 12:27:36 2019 -0400
diff -r e48d230a0edc -r 468c50210b07 external/mit/libpciaccess/dist/configure
--- a/external/mit/libpciaccess/dist/configure  Sun Feb 23 09:57:41 2020 +0000
+++ b/external/mit/libpciaccess/dist/configure  Sun Feb 23 09:57:46 2020 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libpciaccess 0.15.
+# Generated by GNU Autoconf 2.69 for libpciaccess 0.16.
 #
 # Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libpciaccess/issues>.
 #
@@ -591,8 +591,8 @@
 # Identity of this package.
 PACKAGE_NAME='libpciaccess'
 PACKAGE_TARNAME='libpciaccess'
-PACKAGE_VERSION='0.15'
-PACKAGE_STRING='libpciaccess 0.15'
+PACKAGE_VERSION='0.16'
+PACKAGE_STRING='libpciaccess 0.16'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libpciaccess/issues'
 PACKAGE_URL=''
 
@@ -1361,7 +1361,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libpciaccess 0.15 to adapt to many kinds of systems.
+\`configure' configures libpciaccess 0.16 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1431,7 +1431,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpciaccess 0.15:";;
+     short | recursive ) echo "Configuration of libpciaccess 0.16:";;
    esac
   cat <<\_ACEOF
 
@@ -1559,7 +1559,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpciaccess configure 0.15
+libpciaccess configure 0.16
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1974,7 +1974,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libpciaccess $as_me 0.15, which was
+It was created by libpciaccess $as_me 0.16, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2841,7 +2841,7 @@
 
 # Define the identity of the package.
  PACKAGE='libpciaccess'
- VERSION='0.15'
+ VERSION='0.16'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -19482,7 +19482,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libpciaccess $as_me 0.15, which was
+This file was extended by libpciaccess $as_me 0.16, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19548,7 +19548,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libpciaccess config.status 0.15
+libpciaccess config.status 0.16
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -r e48d230a0edc -r 468c50210b07 external/mit/libpciaccess/dist/configure.ac
--- a/external/mit/libpciaccess/dist/configure.ac       Sun Feb 23 09:57:41 2020 +0000
+++ b/external/mit/libpciaccess/dist/configure.ac       Sun Feb 23 09:57:46 2020 +0000
@@ -23,7 +23,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libpciaccess],[0.15],
+AC_INIT([libpciaccess],[0.16],
         [https://gitlab.freedesktop.org/xorg/lib/libpciaccess/issues],[libpciaccess])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([.])
diff -r e48d230a0edc -r 468c50210b07 external/mit/libpciaccess/dist/src/linux_sysfs.c
--- a/external/mit/libpciaccess/dist/src/linux_sysfs.c  Sun Feb 23 09:57:41 2020 +0000
+++ b/external/mit/libpciaccess/dist/src/linux_sysfs.c  Sun Feb 23 09:57:46 2020 +0000
@@ -50,7 +50,7 @@
 #include <dirent.h>
 #include <errno.h>
 
-#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
+#if defined(__i386__) || defined(__x86_64__)
 #include <sys/io.h>
 #else
 #define inb(x) -1
diff -r e48d230a0edc -r 468c50210b07 external/mit/libpciaccess/dist/src/x86_pci.c
--- a/external/mit/libpciaccess/dist/src/x86_pci.c      Sun Feb 23 09:57:41 2020 +0000
+++ b/external/mit/libpciaccess/dist/src/x86_pci.c      Sun Feb 23 09:57:46 2020 +0000
@@ -445,7 +445,7 @@
     if (memfd == -1)
        return errno;
 
-    bios = mmap(NULL, dev->rom_size, PROT_READ, 0, memfd, d->rom_base);
+    bios = mmap(NULL, dev->rom_size, PROT_READ, MAP_SHARED, memfd, d->rom_base);
     if (bios == MAP_FAILED) {
        close(memfd);
        return errno;
@@ -594,12 +594,12 @@
         }
 
         /* Map the region in our space */
-        memfd = open ("/dev/mem", O_RDONLY | O_CLOEXEC);
+        memfd = open ("/dev/mem", O_RDWR | O_CLOEXEC);
         if (memfd == -1)
             return errno;
 
         dev->regions[reg_num].memory =
-         mmap (NULL, dev->regions[reg_num].size, PROT_READ | PROT_WRITE, 0,
+         mmap (NULL, dev->regions[reg_num].size, PROT_READ | PROT_WRITE, MAP_SHARED,
                memfd, dev->regions[reg_num].base_addr);
         if (dev->regions[reg_num].memory == MAP_FAILED)
         {
@@ -607,8 +607,6 @@
             close (memfd);
             return errno;
         }
-
-        close (memfd);
     }
 
     return 0;
@@ -857,10 +855,10 @@
        prot |= PROT_WRITE;
 
     map->memory = mmap(NULL, map->size, prot, MAP_SHARED, memfd, map->base);
-    close(memfd);
-    if (map->memory == MAP_FAILED)
+    if (map->memory == MAP_FAILED) {
+       close(memfd);
        return errno;
-
+    }
     return 0;
 }