diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2012-03-14 17:52:12 +0000 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2012-03-14 17:52:12 +0000 |
| commit | a21cef0201e2074c6ac4c8b0c2be5db1e7f5c745 (patch) | |
| tree | 93f892c3923a6e3d233cedc107500009ae054c32 /x11-libs/libpciaccess | |
| parent | http://my.opera.com/desktopteam/blog/2012/03/14/wahoo-snapshot (diff) | |
| download | gentoo-2-a21cef0201e2074c6ac4c8b0c2be5db1e7f5c745.tar.gz gentoo-2-a21cef0201e2074c6ac4c8b0c2be5db1e7f5c745.tar.bz2 gentoo-2-a21cef0201e2074c6ac4c8b0c2be5db1e7f5c745.zip | |
Add patch to fix bug 407299.
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/libpciaccess')
| -rw-r--r-- | x11-libs/libpciaccess/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libpciaccess/files/libpciaccess-0.13-fix-out-bwl-macros.patch | 32 | ||||
| -rw-r--r-- | x11-libs/libpciaccess/libpciaccess-0.13.ebuild | 4 |
3 files changed, 40 insertions, 2 deletions
diff --git a/x11-libs/libpciaccess/ChangeLog b/x11-libs/libpciaccess/ChangeLog index f119630f7a50..436beb716c2a 100644 --- a/x11-libs/libpciaccess/ChangeLog +++ b/x11-libs/libpciaccess/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libpciaccess # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/ChangeLog,v 1.73 2012/03/04 21:04:29 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/ChangeLog,v 1.74 2012/03/14 17:52:12 mattst88 Exp $ + + 14 Mar 2012; Matt Turner <mattst88@gentoo.org> libpciaccess-0.13.ebuild, + +files/libpciaccess-0.13-fix-out-bwl-macros.patch: + Add patch to fix bug 407299. *libpciaccess-0.13 (04 Mar 2012) diff --git a/x11-libs/libpciaccess/files/libpciaccess-0.13-fix-out-bwl-macros.patch b/x11-libs/libpciaccess/files/libpciaccess-0.13-fix-out-bwl-macros.patch new file mode 100644 index 000000000000..004b41adefff --- /dev/null +++ b/x11-libs/libpciaccess/files/libpciaccess-0.13-fix-out-bwl-macros.patch @@ -0,0 +1,32 @@ +Bug https://bugs.gentoo.org/show_bug.cgi?id=407299 + +From b16336c0b389ace07f7418f5a021bfbc68fec2b6 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Mon, 5 Mar 2012 11:01:01 -0500 +Subject: [PATCH] linux: Fix out[bwl] macros on non-I/O architectures + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + src/linux_sysfs.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +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 + +-- +1.7.3.4 + diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.ebuild index d4e7f5353d90..3f75627858be 100644 --- a/x11-libs/libpciaccess/libpciaccess-0.13.ebuild +++ b/x11-libs/libpciaccess/libpciaccess-0.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.13.ebuild,v 1.1 2012/03/04 21:04:29 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.13.ebuild,v 1.2 2012/03/14 17:52:12 mattst88 Exp $ EAPI=4 inherit xorg-2 @@ -13,6 +13,8 @@ DEPEND="!<x11-base/xorg-server-1.5 zlib? ( sys-libs/zlib )" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}"/${P}-fix-out-bwl-macros.patch ) + pkg_setup() { xorg-2_pkg_setup |