diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-11-11 01:32:44 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-11-11 01:32:44 +0000 |
| commit | a7744f8cc5495784adce5661a6ca54c2e61c3af5 (patch) | |
| tree | 740c8cef60dd51cfeab485e38c04187534300f9b /x11-drivers | |
| parent | whitespace (diff) | |
| download | gentoo-2-a7744f8cc5495784adce5661a6ca54c2e61c3af5.tar.gz gentoo-2-a7744f8cc5495784adce5661a6ca54c2e61c3af5.tar.bz2 gentoo-2-a7744f8cc5495784adce5661a6ca54c2e61c3af5.zip | |
add patch to fix building against AGP-less kernel, bug #435322.
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-drivers')
3 files changed, 37 insertions, 2 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index d8c0d2e761ab..db86746cf7dc 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/ati-drivers # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.302 2012/10/26 17:37:55 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.303 2012/11/11 01:32:44 chithanh Exp $ + + 11 Nov 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +files/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch, + ati-drivers-12.11_beta.ebuild: + add patch to fix building against AGP-less kernel, bug #435322. 26 Oct 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> ati-drivers-12.6_beta_pre897.ebuild: diff --git a/x11-drivers/ati-drivers/ati-drivers-12.11_beta.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.11_beta.ebuild index 405d638084e9..7f1e97ca1246 100644 --- a/x11-drivers/ati-drivers/ati-drivers-12.11_beta.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-12.11_beta.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-drivers/ati-drivers/ati-drivers-12.11_beta.ebuild,v 1.1 2012/10/26 14:24:29 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.11_beta.ebuild,v 1.2 2012/11/11 01:32:44 chithanh Exp $ EAPI=4 @@ -338,6 +338,9 @@ src_prepare() { # https://bugs.gentoo.org/show_bug.cgi?id=438516 epatch "${FILESDIR}/ati-drivers-vm-reserverd.patch" + # compile fix for AGP-less kernel, bug #435322 + epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch + cd "${MODULE_DIR}" # bugged fglrx build system, this file should be copied by hand diff --git a/x11-drivers/ati-drivers/files/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch b/x11-drivers/ati-drivers/files/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch new file mode 100644 index 000000000000..0ea461b82e88 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch @@ -0,0 +1,27 @@ +From: Vasiliy Yeremeyev <vayerx@gmail.com> +Date: Sun, 4 Nov 2012 23:59:36 +0400 +Subject: [PATCH] KCL_AGP_FindCapsRegisters stub for AGP-less systems + +--- + common/lib/modules/fglrx/build_mod/kcl_agp.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/common/lib/modules/fglrx/build_mod/kcl_agp.c b/common/lib/modules/fglrx/build_mod/kcl_agp.c +index b9c0655..cb1902b 100644 +--- a/common/lib/modules/fglrx/build_mod/kcl_agp.c ++++ b/common/lib/modules/fglrx/build_mod/kcl_agp.c +@@ -479,6 +479,11 @@ int ATI_API_CALL KCL_AGP_Enable(unsigned long mode) + return -EINVAL; + } + ++int ATI_API_CALL KCL_AGP_FindCapsRegisters(KCL_PCI_DevHandle dev) ++{ ++ return -EINVAL; ++} ++ + int ATI_API_CALL KCL_AGP_ReadCapsRegisters(KCL_PCI_DevHandle dev, unsigned int *caps) + { + return -EINVAL; +-- +1.7.12 + |