From a5297457e168e15c33ffd525bc5e2e24f1ec0884 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 30 Oct 2019 12:01:52 -0400
Subject: [PATCH] libpciaccess 0.16

---
 .gitignore                                    |  1 +
 ...Don-t-try-to-include-sys-io.h-on-arm.patch | 27 -------------------
 libpciaccess.spec                             | 11 ++++----
 sources                                       |  2 +-
 4 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 0001-linux-Don-t-try-to-include-sys-io.h-on-arm.patch

diff --git a/.gitignore b/.gitignore
index a4a2869..0ffb1e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ libpciaccess-0.12.0.tar.bz2
 /libpciaccess-0.13.4.tar.bz2
 /libpciaccess-0.14.tar.bz2
 /libpciaccess-0.15.tar.bz2
+/libpciaccess-0.16.tar.bz2
diff --git a/0001-linux-Don-t-try-to-include-sys-io.h-on-arm.patch b/0001-linux-Don-t-try-to-include-sys-io.h-on-arm.patch
deleted file mode 100644
index 44a0fa1..0000000
--- a/0001-linux-Don-t-try-to-include-sys-io.h-on-arm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1d71669e577f5f2eb02542851696d3bcb722a80b Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 11 Jul 2019 12:56:40 -0400
-Subject: [PATCH libpciaccess] 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.
----
- src/linux_sysfs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
-index e74ad72..d022644 100644
---- a/src/linux_sysfs.c
-+++ b/src/linux_sysfs.c
-@@ -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
--- 
-2.21.0
-
diff --git a/libpciaccess.spec b/libpciaccess.spec
index 912ab5f..0c18aab 100644
--- a/libpciaccess.spec
+++ b/libpciaccess.spec
@@ -1,6 +1,6 @@
 Name:           libpciaccess
-Version:        0.15
-Release:        2%{?dist}
+Version:        0.16
+Release:        1%{?dist}
 Summary:        PCI access library
 
 License:        MIT
@@ -12,10 +12,6 @@ URL:            https://www.x.org/
 Source0:	https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 Source1:        make-libpciaccess-snapshot.sh
 
-# https://gitlab.freedesktop.org/xorg/lib/libpciaccess/merge_requests/7
-# will be in 0.16
-Patch0:         0001-linux-Don-t-try-to-include-sys-io.h-on-arm.patch
-
 Patch2:		libpciaccess-rom-size.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig xorg-x11-util-macros
@@ -59,6 +55,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Wed Oct 30 2019 Adam Jackson <ajax@redhat.com> - 0.16-1
+- libpciaccess 0.16
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 7d92252..74a50c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libpciaccess-0.15.tar.bz2) = c34abc438c549db22d27d71d63e13f93cb547eaea238ff2d193627b83a5877e2b34f6fcf4cdaf9b4f0c6b78206447fd9a578454783cfb4e9010e8de20de1364e
+SHA512 (libpciaccess-0.16.tar.bz2) = 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1