Detect libpciaccess correctly to fix build with 1.5 servers.

Package-Manager: portage-2.1.4.4

4 files changed, 50 insertions, 5 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index f5fe7948fd90..143662a0ad1e 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-i810
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.80 2008/02/27 10:55:37 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.81 2008/03/15 02:16:33 dberkholz Exp $
+
+  15 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0001-fixup-pciaccess-version-detect.patch,
+  xf86-video-i810-2.2.1.ebuild:
+  Detect libpciaccess correctly to fix build with 1.5 servers.
 
 *xf86-video-i810-2.2.1 (27 Feb 2008)
 
diff --git a/x11-drivers/xf86-video-i810/Manifest b/x11-drivers/xf86-video-i810/Manifest
index db80f5d107aa..8daa0a4d4ecf 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0001-fixup-pciaccess-version-detect.patch 824 RMD160 6e148f2fe467ba6e9d48e046f067ba405d10b0d1 SHA1 e80e2c8a24a4b54b35d6da5a28d4b70c0b20d8f1 SHA256 05d4ba845535c3bd6a28500251b9e6425af49e671a548d718cac81f57242823e
 AUX 1.6.5-fix_no_dri.patch 1236 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1 SHA1 60f13aad5aa5f2a199ebc4b38ff468df9728ce5d SHA256 5b560f31a70b1998749e6cbcbfb6d7a94d3f9caf9ca4dad147662bc6eeb344da
 AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f6fa0734ea56ff9a167098649d8e3767e SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347
 AUX xf86-video-i810-2.1.1-fix_build_without_dri.patch 1207 RMD160 8f562c70bb6f0612981bacf28bd0bc005d358cf3 SHA1 226de2c0d345099c3eb4eb48fddd37c384b5557c SHA256 48d2864503d3bc756fcb766cd61a7e0f4b71bfa0fbe78b3a22bf46cf6249ee61
@@ -12,6 +16,13 @@ EBUILD xf86-video-i810-1.6.5.ebuild 903 RMD160 b0f667881f34ec0aaf6c84c4722343aa8
 EBUILD xf86-video-i810-1.7.4.ebuild 863 RMD160 6e9e46e03134f840dfcdc0263871bd77ac57b9af SHA1 2d523f124ccb9c19014c977091ec02414a7bc8bc SHA256 d8998319b1fe36e5d6be2fc001f8061fe1395644d13e191f952fca882aa41175
 EBUILD xf86-video-i810-2.1.1.ebuild 1271 RMD160 42bb0909762236767f46048651c2c8692db339b9 SHA1 b8d4fff6c7354bc0faabdcafe4c74ea8e4d4f718 SHA256 04c59a29df8f52cbe8efb97be1bd6e0e1de2949f71a8695468d35ea97ff45fed
 EBUILD xf86-video-i810-2.2.0.90.ebuild 1163 RMD160 25a179cd03fb49fcccca211a8ec9cc437a3169b2 SHA1 5037d9aa3954cd69a159960d1fd66228fdb2b7f9 SHA256 130c083c10dcaf77cb6232b17e12ecf21d8580e8a05acdde21ddc462455102d7
-EBUILD xf86-video-i810-2.2.1.ebuild 1160 RMD160 84c6697e7b5fecc5f76d1ffb3cc8e8740364d1ba SHA1 03d2848cb3e42d841b446989f87fdc971c6a9556 SHA256 24c24928584d6a035718d406dbeccb7bbba8d7f55f04792b81a0e59352380c46
-MISC ChangeLog 14536 RMD160 25ab3431ad4a8241f487db628863eca5291ebffa SHA1 f6e58633613426ea666cd66b3202609b6b1ef3a6 SHA256 c9dd840f3116e1d032e58d2d51d01f114492db1252bd5b80032445f84ba3a9a4
+EBUILD xf86-video-i810-2.2.1.ebuild 1228 RMD160 822d64308393e0c31fc932c6472df53dcd4d27fb SHA1 b8cb314fc8ac83bd99e7cf0f31a7e877219051b9 SHA256 ab145dea0fce22fc47a1f2a588f2ed5a8ccd45800fe8ebeb4e1ed3e321b589f2
+MISC ChangeLog 14744 RMD160 7c6c5730c10467ab90f8a9e33351aa201247acf2 SHA1 bdfff040612f2359325ac8369fe7e1da3c27c223 SHA256 37d7f837233ef66c267c02f5b9bda87ae161d47ec6c032786ca2f944ed2439cc
 MISC metadata.xml 248 RMD160 1bc22252fb59ed171fe013e765baa171151843cf SHA1 1df26c31e85768bb440888be23ba6fdcb421843d SHA256 a52fe0f6937ba347182a10ae3c710ee5524086af9b011567f5629ba165bf7dcd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH2zGGXVaO67S1rtsRAnZVAKDJpGEoeVdD1LB1ucEPhjhsPemU8ACbBt5O
+Sytiaaa8FPpulXgJD9flnGs=
+=JI0d
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-i810/files/0001-fixup-pciaccess-version-detect.patch b/x11-drivers/xf86-video-i810/files/0001-fixup-pciaccess-version-detect.patch
new file mode 100644
index 000000000000..0644a02c11b1
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/0001-fixup-pciaccess-version-detect.patch
@@ -0,0 +1,28 @@
+From 13ae79b415d944891cfdc2cd2d5397fec36a4e8e Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Fri, 7 Mar 2008 08:04:37 +1000
+Subject: [PATCH] fixup pciaccess version detect
+
+---
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9e7c5b9..da44018 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -115,9 +115,9 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ CFLAGS="$save_CFLAGS"
+ 
+ if test x$XSERVER_LIBPCIACCESS = xyes; then
+-	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0])
++	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
+ else
+-	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0],
++	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10],
+ 				       have_libpciaccess=yes,
+ 				       have_libpciaccess=no)
+ fi
+-- 
+1.5.4.3
+
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.1.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.1.ebuild
index c871673245e6..e907ac505d5f 100644
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.1.ebuild
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.1.ebuild,v 1.1 2008/02/27 10:55:37 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.1.ebuild,v 1.2 2008/03/15 02:16:33 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 # Enable snapshot to get the man page in the right place
 # This should be fixed with a XDP patch later
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 XDPVER=-1
 
 inherit x-modular
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
 			>=x11-libs/libdrm-2.2
 			x11-libs/libX11 )"
 
+PATCHES="${FILESDIR}/0001-fixup-pciaccess-version-detect.patch"
 CONFIGURE_OPTIONS="$(use_enable dri)"
 
 pkg_setup() {