summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2012-03-14 17:52:12 +0000
committerMatt Turner <mattst88@gentoo.org>2012-03-14 17:52:12 +0000
commit591216990d7f0ed91b7868202ca14f53a16033e7 (patch)
treed4163c0c506523694b7a12f06288f6a8010091e2 /x11-libs/libpciaccess
parenthttp://my.opera.com/desktopteam/blog/2012/03/14/wahoo-snapshot (diff)
downloadhistorical-591216990d7f0ed91b7868202ca14f53a16033e7.tar.gz
historical-591216990d7f0ed91b7868202ca14f53a16033e7.tar.bz2
historical-591216990d7f0ed91b7868202ca14f53a16033e7.zip
Add patch to fix bug 407299.
Package-Manager: portage-2.1.10.44/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/libpciaccess')
-rw-r--r--x11-libs/libpciaccess/ChangeLog6
-rw-r--r--x11-libs/libpciaccess/Manifest25
-rw-r--r--x11-libs/libpciaccess/files/libpciaccess-0.13-fix-out-bwl-macros.patch32
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.13.ebuild4
4 files changed, 63 insertions, 4 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/Manifest b/x11-libs/libpciaccess/Manifest
index b5f216a9d325..98d13aef43a1 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,6 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libpciaccess-0.13-fix-out-bwl-macros.patch 852 RMD160 0e884835498dae61f8263f367a43ce1e6b0dca93 SHA1 6de9e0caec183a00cb4caa12af7e4e1a4419f13f SHA256 acfe9987b6d96145d43b875044cecc47555376052002dcf1286d36b9eeb0b0a6
DIST libpciaccess-0.12.1.tar.bz2 326217 RMD160 d74b62e6d6dd502805f7c4d456f4bcf3f2a0780e SHA1 4933bda545df37395e57ff6b4bd61e17a5431770 SHA256 cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
DIST libpciaccess-0.13.tar.bz2 334074 RMD160 179151e65ca8a7d36f4a2000d370c24446bd9d4d SHA1 7ddd8e1de27326f6f4a3ac6b4d2241fe77ef5353 SHA256 24368520b0947487ec73729e3c97c95f3d9bf83704a910bb0abe1d5a63df32fd
EBUILD libpciaccess-0.12.1.ebuild 985 RMD160 3a93d8d69b4852398df8d2382a3688476d237eba SHA1 85aa04e9f70ae91357db74d1f0359e550aaa464d SHA256 6faf47dfcc606d8f3144b7e97c7ac2184d02d7437d6091e38f666fc273c23037
-EBUILD libpciaccess-0.13.ebuild 991 RMD160 e3543b377b7585c7f89d05a52e091c85af89a8dc SHA1 cd17f76b19f321ffafc82a8b58d697fe2857d7ba SHA256 4df373b7992bd72917d0a9540374f5dccb7b5db583c6cf1d05b20072ae55b908
-MISC ChangeLog 9173 RMD160 8ea8377f1bb6bcb2929248ef171fddb42a94c6e6 SHA1 a68acb26489292087673f802994c70d56980b928 SHA256 6b8d434f7245de34493b021cf689d2a42ba74b066bad5a55ed894ebbc8f8b1d4
+EBUILD libpciaccess-0.13.ebuild 1048 RMD160 928913bd60e77bbb3284198515c38cb0c3247734 SHA1 cd0955bf6b1aeeff18fbc96449cc558496984971 SHA256 84d6a612b9c8094eea7753cf6a489d15c86b286ad37737e9c2866dc50340b3b1
+MISC ChangeLog 9333 RMD160 d16a978b546786e375226c655ac27ab42a977f00 SHA1 55b3499c16b255735772067de31dd578b8d9ae65 SHA256 b37b599e2e05f4161aaabfd69fb98d2e36d4e2338a42def32f07a77bbc1ca620
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPYNrjAAoJEA/daC2XTKcq77IP/Ruv+M6384yRN8OE13LdqE6t
+1EZba/vQ9qTIx1J10oa9FsMOnNls0wgltWheFJtmlfOvm97BZcmsItwHaieFXrQl
+XjtyTf5N8p6yxtT5yGNtdt0OH3yrUVJxnbFQOPYINo5PtQn8RlZQjiJLbqwPCZZY
+GQQFD3w9YiYBtZXmCIIRWrE5NqAIv946EYVFvXMxogh4gykYmpC2qQMudEkhSNGM
+nNu8nT0j90cyDaXxJeW5z/ZbWQ4vtlzS3vB/5paK3s/VPd08/KxH35zocGI9sLIU
+i8hlh9aWOEt6U3a1aptPFDkV5Ovp8iK8pwfsENNYyDEkf88sbNK/ALLjrLBlH/lQ
+B7+aSzkedfa/HE0XaccA+t3MQkKxr3oxJ8iKISPlreq4dT7jd3DGAoKhhND4zTCt
+e+7fxFyn7jwMEOtuRoZmiYs0Tr6tMAkNiS3cCLW4hJFJwp864ebTGjOZo186piuA
+qUoOCkPEU7TNAwYOmDRvLQL52wVsFN84zPtI9Xneykq72hAvib00ozSh4NKkHvUI
+25n6uiRx3o6lBIrwsmyL2n+x2CAs1Kt1N2ENKkcqz1rZZX5JtFfwnA2kU60r0gMQ
+ix8PgwQQIteM0jfWkKokgX3+5nO4zxDA9854cVCczwO3PepOvkblbs5sPFIkegIB
+Y526Nz6Pb8bBltBqq2II
+=FIVb
+-----END PGP SIGNATURE-----
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