intermodule fix for kernel 2.6.16 wrt bug #123643

(Portage version: 2.1_pre4-r1)

4 files changed, 36 insertions, 5 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 308b70dbed4d..148b651c7896 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.24 2006/02/22 09:57:27 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.25 2006/02/23 21:08:51 anarchy Exp $
+
+  23 Feb 2006; <anarchy@gentoo.org>
+  +files/ati-drivers-8.22.5-intermodule.patch, ati-drivers-8.22.5.ebuild:
+  intermodule fix for kernel 2.6.16 wrt bug#123643
 
   22 Feb 2006; Luca Barbato <lu_zero@gentoo.org>
   ati-drivers-8.14.13-r3.ebuild, ati-drivers-8.14.13-r5.ebuild,
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 581ff57ccdd3..a5c8bb6da456 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -43,9 +43,9 @@ SHA256 8601e455bd7a6161bfeb47d95ad2c02cc867357a9b2a3a77fe4cb7b8aaf4b535 ati-driv
 MD5 938ae1a4bff6e6e33ee859dd2a3ca5a6 ati-drivers-8.21.7.ebuild 8469
 RMD160 68784475bce2aefee05a6ef9eea3ea03476ea2d5 ati-drivers-8.21.7.ebuild 8469
 SHA256 ae67a291c40ed09e8726c4ed65a6f93cc4cca90b9eb5d16105f23638a2b10096 ati-drivers-8.21.7.ebuild 8469
-MD5 047e531675f8a055b6a65239200348f1 ati-drivers-8.22.5.ebuild 8364
-RMD160 b24e3b42d5f857b3d1ff2bea35444f909ce483d3 ati-drivers-8.22.5.ebuild 8364
-SHA256 a6f882e88c1f683885f9f7312f06aad82607dd088dc35ae81df27a3866706e6d ati-drivers-8.22.5.ebuild 8364
+MD5 a74cfe4e21c2b26fca901d3ba7bbc4f4 ati-drivers-8.22.5.ebuild 8479
+RMD160 d0807c07b27f30b23763cd347b27e483eba96dce ati-drivers-8.22.5.ebuild 8479
+SHA256 0569625341cc7a10c803057a1d7716eb499b955ba7e396fc3c560c15614c16d8 ati-drivers-8.22.5.ebuild 8479
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 RMD160 2eb917685ae226a6913f00d0247514faf998d92f files/09ati 39
 SHA256 44336cd56c2712a3260a1289c1085f08e4cb61e6a73175eac4a7b3ebabe5011e files/09ati 39
@@ -61,6 +61,9 @@ SHA256 0e5a1cf04bd4d45be694e6df82a5c784fa5e4257ea738a98178168cfb1808999 files/at
 MD5 12b0f155a9a1089d55b85d9c89c2ef86 files/ati-drivers-8.21.7-linux-2.6.15.patch 447
 RMD160 4c2f538cda5a52f8696a99cc722137b08d86fcea files/ati-drivers-8.21.7-linux-2.6.15.patch 447
 SHA256 134172104d1e7bcf056e723b05eff9d16745b49a4911a765666f4f5c81c59c51 files/ati-drivers-8.21.7-linux-2.6.15.patch 447
+MD5 ead3d9f8477752d9059916e567916e5d files/ati-drivers-8.22.5-intermodule.patch 831
+RMD160 fdc33818770a97f1b90a8b413cf88c1ad381bdc8 files/ati-drivers-8.22.5-intermodule.patch 831
+SHA256 b2cd8404b415ec472ba07604ba77aa6b52aa9a7bb98b08fbf9d18ac180bfe749 files/ati-drivers-8.22.5-intermodule.patch 831
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r2 157
 RMD160 64a8113b9d97d97e499206831806f92b9fbd08e7 files/digest-ati-drivers-8.14.13-r2 157
 SHA256 835d5b4060013736135b0a18a0e8805c379a2b811f326489c6194ecf0b947f00 files/digest-ati-drivers-8.14.13-r2 157
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild
index 875088c87f3e..a58131822583 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild,v 1.2 2006/02/22 09:57:27 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.22.5.ebuild,v 1.3 2006/02/23 21:08:51 anarchy Exp $
 
 IUSE="opengl"
 
@@ -120,6 +120,11 @@ src_unpack() {
 	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
 
 	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+
+	# remove intermodule calls for 2.6.16
+	if kernel_is 2 6 16; then
+		epatch ${FILESDIR}/${P}-intermodule.patch
+	fi
 }
 
 
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.22.5-intermodule.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.22.5-intermodule.patch
new file mode 100644
index 000000000000..af91b48be721
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-8.22.5-intermodule.patch
@@ -0,0 +1,19 @@
+--- firegl_public.c-orig	2006-02-23 14:54:16.386740016 -0600
++++ firegl_public.c	2006-02-23 14:56:38.054203288 -0600
+@@ -361,13 +361,15 @@
+ } firegl_drm_stub_info_t;
+ static firegl_drm_stub_info_t firegl_stub_info;
+ 
+-#if LINUX_VERSION_CODE < 0x020400
++#if LINUX_VERSION_CODE > 0x02060F
+ struct firegl_drm_stub_info_t *firegl_stub_pointer = NULL;
+ #define inter_module_put(x)
+ #define inter_module_unregister(x)
+ #define inter_module_get_request(x,y)   firegl_stub_pointer
+ #define inter_module_register(x,y,z)    do { firegl_stub_pointer = z; } while (0)
++#endif
+ /* This is a kludge for backward compatibility that is only useful in DRM(stub_open) */
++#if LINUX_VERSION_CODE < 0x020400
+ #define fops_put(fops)      MOD_DEC_USE_COUNT
+ #define fops_get(fops)      (fops); MOD_INC_USE_COUNT
+ #endif // LINUX_VERSION_CODE < 0x020400