From 630a2ed122111bd9a946f1f244cd22b0b9a89ec8 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 28 Mar 2012 17:34:26 -0400
Subject: [PATCH] libpciaccess-macros.patch: Fix out* macros again

---
 libpciaccess-macros.patch | 16 ++++++++++++++++
 libpciaccess.spec         |  7 ++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 libpciaccess-macros.patch

diff --git a/libpciaccess-macros.patch b/libpciaccess-macros.patch
new file mode 100644
index 0000000..b9a809a
--- /dev/null
+++ b/libpciaccess-macros.patch
@@ -0,0 +1,16 @@
+diff -up libpciaccess-0.13/src/linux_sysfs.c.jx libpciaccess-0.13/src/linux_sysfs.c
+--- libpciaccess-0.13/src/linux_sysfs.c.jx	2012-03-28 17:23:45.000000000 -0400
++++ libpciaccess-0.13/src/linux_sysfs.c	2012-03-28 17:33:39.064766960 -0400
+@@ -51,9 +51,9 @@
+ #define inb(x) -1
+ #define inw(x) -1
+ #define inl(x) -1
+-#define outb(x) do {} while (0)
+-#define outw(x) do {} while (0)
+-#define outl(x) do {} while (0)
++#define outb(x,y) do {} while (0)
++#define outw(x,y) do {} while (0)
++#define outl(x,y) do {} while (0)
+ #define iopl(x) -1
+ #endif
+ 
diff --git a/libpciaccess.spec b/libpciaccess.spec
index 428bf2c..455f614 100644
--- a/libpciaccess.spec
+++ b/libpciaccess.spec
@@ -3,7 +3,7 @@
 
 Name:           libpciaccess
 Version:        0.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -16,6 +16,7 @@ URL:            http://gitweb.freedesktop.org/?p=xorg/lib/libpciaccess.git
 Source0:	http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 Source1:        make-libpciaccess-snapshot.sh
 
+Patch0:		libpciaccess-macros.patch
 Patch2:		libpciaccess-rom-size.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig xorg-x11-util-macros
@@ -36,6 +37,7 @@ Development package for libpciaccess.
 
 %prep
 %setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%patch0 -p1 -b .macros
 %patch2 -p1 -b .rom-size
 
 %build
@@ -67,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Wed Mar 28 2012 Adam Jackson <ajax@redhat.com> 0.13-2
+- libpciaccess-macros.patch: Fix out* macros again
+
 * Wed Mar 28 2012 Adam Jackson <ajax@redhat.com> 0.13-1
 - libpciaccess 0.13