(#227389) Fix building against released DRM versions. Don't assume libdrm 2.3.1 has TTM support, push that to 2.4.0 instead.

Package-Manager: portage-2.1.5.6

5 files changed, 56 insertions, 7 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index 24a8cbcb1e86..200634669d8f 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,6 +1,12 @@
 # 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.94 2008/06/18 05:34:10 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.95 2008/07/01 19:17:33 dberkholz Exp $
+
+  01 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0001-intel-fix-drm-check.patch, xf86-video-i810-2.3.1-r2.ebuild,
+  xf86-video-i810-2.3.2.ebuild:
+  (#227389) Fix building against released DRM versions. Don't assume libdrm
+  2.3.1 has TTM support, push that to 2.4.0 instead.
 
 *xf86-video-i810-2.3.2 (18 Jun 2008)
 
diff --git a/x11-drivers/xf86-video-i810/Manifest b/x11-drivers/xf86-video-i810/Manifest
index 4c4613c5fec8..bf18436c85a9 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0001-fixup-pciaccess-version-detect.patch 824 RMD160 6e148f2fe467ba6e9d48e046f067ba405d10b0d1 SHA1 e80e2c8a24a4b54b35d6da5a28d4b70c0b20d8f1 SHA256 05d4ba845535c3bd6a28500251b9e6425af49e671a548d718cac81f57242823e
+AUX 0001-intel-fix-drm-check.patch 966 RMD160 f77d00d99bbc02d233fd3455055e6e8f6cd64f9e SHA1 93db1cf8fa34baf5728dfe1cbe0ffcdddb7ee065 SHA256 9edc49693ce22338057d3e06f391235cac82f3db3edce6dce1444175843c8b69
 AUX 1.6.5-fix_no_dri.patch 1236 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1 SHA1 60f13aad5aa5f2a199ebc4b38ff468df9728ce5d SHA256 5b560f31a70b1998749e6cbcbfb6d7a94d3f9caf9ca4dad147662bc6eeb344da
 AUX 2.3.1/0001-Skip-copying-on-FOURCC_XVMC-surfaces.patch 2102 RMD160 09b1aca271cc7bb823c1dc89141a8a4c8907c435 SHA1 04688d7cb945515f7c4b28c76b624363a01a5e3b SHA256 faf12d228421ca09c1dc31017eff7b9f660a83a6f87af3a04c2547b23a9dbc84
 AUX 2.3.1/0002-Only-use-FOURCC_XVMC-when-INTEL_XVMC-is-defined.patch 1396 RMD160 ae6deecd003ca335d21193013317f30e4faa9c7e SHA1 08aa46fb77f89ea981126d61356d95f70b57a8a9 SHA256 2ecad981cec8de4fead76957562f8f57c4334ce391de9b74fbaae424e833c95d
@@ -42,8 +46,15 @@ EBUILD xf86-video-i810-2.2.0.90.ebuild 1184 RMD160 9afd30f21c9112b2a70c8d6318465
 EBUILD xf86-video-i810-2.2.1.ebuild 1246 RMD160 784e0fb29f68161a01f9f330caad8fb241196b66 SHA1 d8c938d8b33e97e79a36ad9481553ba54405eee8 SHA256 287b7127f3635d35b05dc6ec57fe9c3667b9d8dac586f0df782292c57de7bd4d
 EBUILD xf86-video-i810-2.3.0.ebuild 1180 RMD160 2ff676518a6a0e45dfc274d68cb4b07e698c7068 SHA1 28d249dcc67e0a96f7a7daaacd1ac72922ea3419 SHA256 217385101dc388352f35d420cc591e38f519bb442975ad03bc2a03bcfdc3e05b
 EBUILD xf86-video-i810-2.3.1-r1.ebuild 1550 RMD160 98137c7a143d73d11fdb8906b86170620f1e0d72 SHA1 3ded76ae92fe51bc0d26a553a9c3547ea13e498b SHA256 72a41415c4976d0001610f11a1a211782599f50f129d6497130227674e20aabf
-EBUILD xf86-video-i810-2.3.1-r2.ebuild 3002 RMD160 d47e80a633901708d1a81b1303810acb13607c35 SHA1 4d98888c64c7a49952cf07c4432f8606f6dfa9e7 SHA256 8a3adcc9464f031cce7f958f2f1668ffe996dfc7d527e8e4781ad0eac3615a9e
+EBUILD xf86-video-i810-2.3.1-r2.ebuild 3052 RMD160 b83d89c824cd19c9915ac3be6341a1504fb9eb03 SHA1 ace145dd4faa277eeb64c33d00da91bc1dc3aec9 SHA256 940b25151b3c9a6aeaf4c3f95fa10f51337b2cbfc5461ad08ee77401e40384f9
 EBUILD xf86-video-i810-2.3.1.ebuild 1180 RMD160 6d5bf90f2aebeadafb4db430c4b5b3077a7513a2 SHA1 4e6348787ea102a738e485b377d82be4f85928ef SHA256 b006375303a8dcfe4f4a0c51ab030f846668d61e85dfe9f8cf20eca8486a402b
-EBUILD xf86-video-i810-2.3.2.ebuild 1180 RMD160 d83b23e210a67738dfc1e40327430c52b44c40bc SHA1 87e477d6712a5a8fca13eecfe9858206841f1b65 SHA256 ad8cc43bf3f26f0571159b8e48fc4c18ba6f52ad58dbd39d036da54f96dea02d
-MISC ChangeLog 19376 RMD160 2ebfd3e8acef92979c22417960b776c5b735b7b7 SHA1 c2e00f8e396a7730feafe5c31c6876f154dc06b4 SHA256 6a02f1a9b6906389b04c3438ea97e612cd61b018630401e914bf97a478e4eca8
+EBUILD xf86-video-i810-2.3.2.ebuild 1243 RMD160 a181cae7052a45d4c0d311c0bfbffb000adf8726 SHA1 aeb643b781acec378b8adde57cf9b7cd8659b732 SHA256 267edfdebab39955765c314f04d59583bcfdb9952aed5d42f2b7f339863a7e9b
+MISC ChangeLog 19672 RMD160 9d25ca1f3057e9f442a5a6375e6db27c86034d52 SHA1 38fdf219b08aa6e82768cbd795cf493236de6a67 SHA256 75ee7f32adfb38d267967f1baa085c4ed2d72b46f849ed5e2c577c6fba783cb4
 MISC metadata.xml 248 RMD160 1bc22252fb59ed171fe013e765baa171151843cf SHA1 1df26c31e85768bb440888be23ba6fdcb421843d SHA256 a52fe0f6937ba347182a10ae3c710ee5524086af9b011567f5629ba165bf7dcd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhqgtUACgkQXVaO67S1rttUFQCg4h3jKKOSnmI3JtnTczlgxXQk
+yXsAoLUcvH2wNLPrcdGDPEQW+XtKAk2b
+=gpkF
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-i810/files/0001-intel-fix-drm-check.patch b/x11-drivers/xf86-video-i810/files/0001-intel-fix-drm-check.patch
new file mode 100644
index 000000000000..8ae16e3ae25e
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/0001-intel-fix-drm-check.patch
@@ -0,0 +1,27 @@
+From 55678c64bc6e3ed613ea6db14c105c18a0cf28ce Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@linux.ie>
+Date: Tue, 1 Jul 2008 18:51:18 +1000
+Subject: [PATCH] intel: fix drm check.
+
+The -mm check is broken now that 2.3.1 is out.. make it 2.4.0, to be fixed
+with GEM etc.
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index af87299..2dabd4f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -201,7 +201,7 @@ if test "$DRI" = yes; then
+         PKG_CHECK_MODULES(DRI, [libdrm xf86driproto glproto])
+         AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
+         AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
+-	PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.3.1],[DRI_MM=yes], [DRI_MM=no])
++	PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.4.0],[DRI_MM=yes], [DRI_MM=no])
+ 	if test "x$DRI_MM" = xyes; then
+ 		AC_DEFINE(XF86DRI_MM,1,[Extended DRI memory management])
+ 	fi
+-- 
+1.5.5.4
+
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.1-r2.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.1-r2.ebuild
index 63560aa660af..a86e741b8c4b 100644
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.1-r2.ebuild
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.3.1-r2.ebuild,v 1.1 2008/06/13 05:15:02 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.1-r2.ebuild,v 1.2 2008/07/01 19:17:33 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 # Enable snapshot to get the man page in the right place
@@ -60,7 +60,8 @@ PATCHES=(
 "${FILESDIR}/2.3.1/0022-Fix-TV-programming-add-vblank-wait-after-TV_CTL-wr.patch"
 "${FILESDIR}/2.3.1/0023-Two-more-Dell-quirks.patch"
 "${FILESDIR}/2.3.1/0024-Set-up-restore-PWRCTXA-from-enter-leavevt-not-server.patch"
-"${FILESDIR}/2.3.1/0025-Fix-compiler-warning-when-disable-xvmc-config.patch")
+"${FILESDIR}/2.3.1/0025-Fix-compiler-warning-when-disable-xvmc-config.patch"
+"${FILESDIR}/0001-intel-fix-drm-check.patch")
 
 pkg_setup() {
 	if use dri && ! built_with_use x11-base/xorg-server dri; then
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.2.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.2.ebuild
index 220d9096377d..ede614f3eb7c 100644
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.2.ebuild
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # 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.3.2.ebuild,v 1.1 2008/06/18 05:34:10 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.3.2.ebuild,v 1.2 2008/07/01 19:17:33 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 # Enable snapshot to get the man page in the right place
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
 
+PATCHES=(
+"${FILESDIR}/0001-intel-fix-drm-check.patch"
+)
+
 pkg_setup() {
 	if use dri && ! built_with_use x11-base/xorg-server dri; then
 		die "Build x11-base/xorg-server with USE=dri."