summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-05-02 17:04:17 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-05-02 17:04:17 +0200
commit62db4fffdee16798cc082f05ab33c2329087212f (patch)
tree686d9d5cb082c1a0330b5683ba9e066bec36e020
parentc2ef76f233a03e87ba6f2a39ca06d6c8411525bd (diff)
Remove libpciaccess patch applied upstream.
-rw-r--r--extra/libpciaccess/PKGBUILD7
-rw-r--r--extra/libpciaccess/libpciaccess-0.13-io.patch26
2 files changed, 2 insertions, 31 deletions
diff --git a/extra/libpciaccess/PKGBUILD b/extra/libpciaccess/PKGBUILD
index cf7be835d..db3c9d398 100644
--- a/extra/libpciaccess/PKGBUILD
+++ b/extra/libpciaccess/PKGBUILD
@@ -12,14 +12,11 @@ url="http://xorg.freedesktop.org/"
depends=('glibc')
makedepends=('pkgconfig' 'xorg-util-macros')
options=('!libtool')
-source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2
- libpciaccess-0.13-io.patch)
-sha1sums=('ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac'
- '614be5f7328b18f00e456eb99082ee3b634e7fa9')
+source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i "$srcdir/libpciaccess-0.13-io.patch"
./configure --prefix=/usr --sysconfdir=/etc
make
}
diff --git a/extra/libpciaccess/libpciaccess-0.13-io.patch b/extra/libpciaccess/libpciaccess-0.13-io.patch
deleted file mode 100644
index e6a498d76..000000000
--- a/extra/libpciaccess/libpciaccess-0.13-io.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b16336c0b389ace07f7418f5a021bfbc68fec2b6 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 05 Mar 2012 16:01:01 +0000
-Subject: linux: Fix out[bwl] macros on non-I/O architectures
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
-index b817860..97fcf36 100644
---- a/src/linux_sysfs.c
-+++ b/src/linux_sysfs.c
-@@ -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
-
---
-cgit v0.9.0.2-2-gbebe