Support new kernel

svn path=/trunk/overlay/; revision=93

3 files changed, 103 insertions, 1 deletions

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 0bf3572..627cc48 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,5 +1,6 @@
 AUX 8.532/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX 8.552/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58
+AUX 8.593/2.6.29_support.patch 3100 RMD160 14fc6722b82637d2cecbc3a1a9de4f6d9abb09f8 SHA1 19d0a5d35c2ecc69882a09f269053079bde65373 SHA256 6cf743a912ef86a72c7bdd2bc5eb9dc57995efd6f90ceda01fd680c4cd1c765a
 AUX 8.593/ati-drivers-xen-8.552.patch 1994 RMD160 45fe1a96bfaec597214c2b058c720c5f71797085 SHA1 4fd6da4c726c67feed8a6484af484ea525f3a112 SHA256 514dad9629fc689ec0344875a29d713f9d8de7ccbb0a22a2b80ede11bbbc6c58
 AUX 8.593/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
@@ -7,4 +8,4 @@ AUX libGL.la.in 749 RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 SHA1 be41cc2
 DIST ati-driver-installer-9-1-x86.x86_64.run 82398155 RMD160 b7d047131c4c3dc80e8d025f312a417605c75a02 SHA1 d7a23a74bc0209c54f6a24e1622e496a6cbeda07 SHA256 178ceffc6ad195bd5b210b2531180a6c0c8bdfa69f2dbfa9ac438170ca0f299e
 DIST ati-driver-installer-9-3-x86.x86_64.run 84841550 RMD160 76d4aa6ec575403190b8feadce99000b69d64d14 SHA1 ceefdfd2f8ecee4998a4ce4b7b87a45f1851e8d0 SHA256 5efec58f92f2fbb90b0d9a9059eb27c9cfffcea0a4ba64f3c8f24fc5dbf8053e
 EBUILD ati-drivers-8.573.ebuild 14627 RMD160 5747ec8c9cfd4e9e339fbb886c17f11874be63f2 SHA1 b537041b540f9db67b6b86e0a750b19043bd5fe8 SHA256 484d07efc94b5310660cf85874ecdd8b8c00482f6901eb2a2679726c1f310bff
-EBUILD ati-drivers-8.593.ebuild 14794 RMD160 ad4ed636d62b9757977e4153c9cb3a1f0a8a401f SHA1 8c3900ed73f4343ddd57fc0051be8fccb3e70d0b SHA256 d28510cbd835fd205920f299ce5a305c52c54ecb659328d4188c52340db599e4
+EBUILD ati-drivers-8.593.ebuild 14866 RMD160 6e795f281d381362978183cefd563f1ac69c8ff9 SHA1 3cc0e9d8533dcb8301268d4b28a39b89dda30be3 SHA256 6d4a41ac261cad6f7a4eaa6678c1d3e1396f0159f5f6598c266996e7b0aaa2a5
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.593.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.593.ebuild
index 7007622..c0b29b3 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.593.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.593.ebuild
@@ -125,6 +125,7 @@ src_unpack() {
 	local src="${DISTDIR}/${A}"
 	sh "${src}" --extract "${S}"  2&>1 /dev/null
 	cd "${S}"
+	epatch "${FILESDIR}"/${PV}/2.6.29_support.patch || die "epatch failed"
 	epatch "${FILESDIR}"/${PV}/ati-drivers-xen-8.552.patch || die "epatch failed"
 
 	# These are the userspace utilities that we also have source for.
diff --git a/x11-drivers/ati-drivers/files/8.593/2.6.29_support.patch b/x11-drivers/ati-drivers/files/8.593/2.6.29_support.patch
new file mode 100644
index 0000000..5f6e886
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/8.593/2.6.29_support.patch
@@ -0,0 +1,100 @@
+
+Quick-and-dirty fixes to build on 2.6.29-rcX kernels.
+
+diff -Nparu build_mod/firegl_public.c fglrx-8.573-new/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- build_mod/firegl_public.c	2009-01-23 20:00:26.000000000 -0200
++++ fglrx-8.573-new/common/lib/modules/fglrx/build_mod/firegl_public.c	2009-02-13 15:25:00.000000000 -0200
+@@ -1460,7 +1460,11 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(vo
+  */
+ KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
+ {
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
++    return current->cred->euid;
++#else
+     return current->euid;
++#endif
+ }
+ 
+ /** /brief Delay execution for the specified number of microseconds
+@@ -1832,15 +1836,30 @@ int ATI_API_CALL KCL_PosixSecurityCapChe
+  */
+ void ATI_API_CALL KCL_PosixSecurityCapSetIPCLock(unsigned int lock)
+ {
++
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
++    struct cred *new = prepare_creds();
++    if (!new) {
++	    printk(KERN_ERR "fglrx: could not allocate memory\n");
++	    return;
++    }
++#else
++#define new current
++#endif
+     if (lock == 0 )
+     {
+-        cap_lower(current->cap_effective, CAP_IPC_LOCK);
++        cap_lower(new->cap_effective, CAP_IPC_LOCK);
+     }
+     else
+     {
+-        cap_raise(current->cap_effective, CAP_IPC_LOCK);
++        cap_raise(new->cap_effective, CAP_IPC_LOCK);
+     }    
+-    return; 
++
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
++    commit_creds(new);
++#else
++#undef new
++#endif
+ }
+ 
+ /** \brief Get number of available RAM pages
+diff -Nparu build_mod/firegl_public.h fglrx-8.573-new/common/lib/modules/fglrx/build_mod/firegl_public.h
+--- build_mod/firegl_public.h	2009-01-23 20:00:26.000000000 -0200
++++ fglrx-8.573-new/common/lib/modules/fglrx/build_mod/firegl_public.h	2009-02-16 14:02:50.000000000 -0300
+@@ -18,6 +18,7 @@
+ #define _FIREGL_PUBLIC_H_
+ 
+ #include <stdarg.h>
++#include <asm/pgtable.h>
+ #include "kcl_pci.h"
+ #include "kcl_io.h"
+ 
+@@ -590,6 +591,11 @@ extern unsigned long        KCL_SYSINFO_
+ #define cpu_has_pge test_bit(X86_FEATURE_PGE, &boot_cpu_data.x86_capability)
+ #endif
+ 
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
++#undef pgprot_writecombine
++#undef pgprot_noncached
++#endif
++
+ #ifndef pgprot_writecombine
+ #define pgprot_writecombine(prot) __pgprot((pgprot_val(prot) & ~(_PAGE_PCD)) | _PAGE_PWT)
+ #endif
+@@ -598,6 +604,7 @@ extern unsigned long        KCL_SYSINFO_
+ #define pgprot_noncached(prot) __pgprot(pgprot_val(prot) | _PAGE_PCD | _PAGE_PWT)
+ #endif
+ 
++
+ #endif //FIREGL_USWC_SUPPORT
+ 
+ 
+diff -Nparu build_mod/kcl_acpi.c fglrx-8.573-new/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- build_mod/kcl_acpi.c	2009-01-23 20:00:26.000000000 -0200
++++ fglrx-8.573-new/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2009-02-13 15:25:00.000000000 -0200
+@@ -18,6 +18,12 @@
+ #include <linux/autoconf.h>
+ #include <linux/acpi.h>
+ 
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
++#include <../drivers/acpi/acpica/acconfig.h>
++#include <../drivers/acpi/acpica/aclocal.h>
++#include <../drivers/acpi/acpica/acobject.h>
++#endif
++
+ #include "kcl_config.h"
+ #include "kcl_type.h"
+ #include "kcl_acpi.h"
+ #include "kcl_acpi.h"