diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2005-06-19 20:58:49 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2005-06-19 20:58:49 +0000 |
| commit | a542a63393c856021133a253ab49820a3d50b51c (patch) | |
| tree | 38688a429afaf28719562baf9222fcd93145d318 /media-video/ati-drivers | |
| parent | fixed a horrific description (diff) | |
| download | gentoo-2-a542a63393c856021133a253ab49820a3d50b51c.tar.gz gentoo-2-a542a63393c856021133a253ab49820a3d50b51c.tar.bz2 gentoo-2-a542a63393c856021133a253ab49820a3d50b51c.zip | |
2.6.12 fix part II
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'media-video/ati-drivers')
5 files changed, 34 insertions, 11 deletions
diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog index dd3d91a9d7a8..5bd1dbfd451d 100644 --- a/media-video/ati-drivers/ChangeLog +++ b/media-video/ati-drivers/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/ati-drivers # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.96 2005/06/19 14:33:21 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.97 2005/06/19 20:58:49 lu_zero Exp $ + + 19 Jun 2005; Luca Barbato <lu_zero@gentoo.org> + +files/fglrx-2.6.12-inter_module_get.patch, + files/fglrx-2.6.12-pci_name.patch, ati-drivers-8.14.13.ebuild, + ati-drivers-8.14.13-r1.ebuild: + Final fix for 2.6.12 support 19 Jun 2005; Luca Barbato <lu_zero@gentoo.org> +files/fglrx-2.6.12-pci_name.patch, ati-drivers-8.14.13.ebuild, diff --git a/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild b/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild index 5d923c386921..efd7ef7ef338 100644 --- a/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild +++ b/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild,v 1.4 2005/06/19 14:33:21 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild,v 1.5 2005/06/19 20:58:49 lu_zero Exp $ IUSE="opengl" @@ -72,6 +72,7 @@ src_unpack() { if kernel_is 2 6 then epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch + epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch fi epatch ${FILESDIR}/8.8.25-via-amd64.patch epatch ${FILESDIR}/8.8.25-smp.patch diff --git a/media-video/ati-drivers/ati-drivers-8.14.13.ebuild b/media-video/ati-drivers/ati-drivers-8.14.13.ebuild index 19e65ac1ae5c..ac7b54d411ff 100644 --- a/media-video/ati-drivers/ati-drivers-8.14.13.ebuild +++ b/media-video/ati-drivers/ati-drivers-8.14.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13.ebuild,v 1.6 2005/06/19 14:33:21 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13.ebuild,v 1.7 2005/06/19 20:58:49 lu_zero Exp $ IUSE="opengl" @@ -86,6 +86,7 @@ src_unpack() { if kernel_is 2 6 then epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch + epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch fi epatch ${FILESDIR}/8.8.25-via-amd64.patch epatch ${FILESDIR}/8.8.25-smp.patch diff --git a/media-video/ati-drivers/files/fglrx-2.6.12-inter_module_get.patch b/media-video/ati-drivers/files/fglrx-2.6.12-inter_module_get.patch new file mode 100644 index 000000000000..47433de8fae7 --- /dev/null +++ b/media-video/ati-drivers/files/fglrx-2.6.12-inter_module_get.patch @@ -0,0 +1,23 @@ +--- build_mod.orig/firegl_public.c 2005-06-19 21:37:23.000000000 +0200 ++++ build_mod/firegl_public.c 2005-06-19 21:22:49.000000000 +0200 +@@ -343,17 +343,17 @@ + struct firegl_drm_stub_info_t *firegl_stub_pointer = NULL; + #define inter_module_put(x) + #define inter_module_unregister(x) +-#define inter_module_get(x) firegl_stub_pointer ++#define inter_module_get_request(x,y) firegl_stub_pointer + #define inter_module_register(x,y,z) do { firegl_stub_pointer = z; } while (0) + /* This is a kludge for backward compatibility that is only useful in DRM(stub_open) */ + #define fops_put(fops) MOD_DEC_USE_COUNT + #define fops_get(fops) (fops); MOD_INC_USE_COUNT + #endif // LINUX_VERSION_CODE < 0x020400 + +-#define DRM_MODULE_GET (firegl_drm_stub_info_t *)inter_module_get("drm") ++#define DRM_MODULE_GET (firegl_drm_stub_info_t *)inter_module_get_request("drm", "drm") + #define DRM_MODULE_PUT inter_module_put("drm") + +-#define DRM_AGP_MODULE_GET (drm_agp_t *)inter_module_get("drm_agp") ++#define DRM_AGP_MODULE_GET (drm_agp_t *)inter_module_get_request("drm_agp","drm_agp") + #define DRM_AGP_MODULE_PUT inter_module_put("drm_agp") + + unsigned long ATI_API_CALL __ke_cpu_to_le32(unsigned long _u) diff --git a/media-video/ati-drivers/files/fglrx-2.6.12-pci_name.patch b/media-video/ati-drivers/files/fglrx-2.6.12-pci_name.patch index d62eb3ff5fc3..03197a9748cb 100644 --- a/media-video/ati-drivers/files/fglrx-2.6.12-pci_name.patch +++ b/media-video/ati-drivers/files/fglrx-2.6.12-pci_name.patch @@ -1,13 +1,5 @@ --- build_mod.orig/agpgart_be.c 2005-06-19 15:59:55.000000000 +0200 +++ build_mod/agpgart_be.c 2005-06-19 15:58:59.000000000 +0200 -@@ -117,6 +117,10 @@ - #include <linux/miscdevice.h> - #include <linux/pm.h> - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12) -+#define pci_name(x) (x)->slot_name -+#endif -+ #if (LINUX_VERSION_CODE >= 0x020400) #define FGL_PM_PRESENT #else |