Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=30ef910c467e0d8c3c9fd6f004dad2d7570414c3

commit 30ef910c467e0d8c3c9fd6f004dad2d7570414c3
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Mon Apr 13 21:44:23 2009 +0200

fglrx-8.593-2-i686

- kernel-2.6.29

diff --git a/source/x11-extra/fglrx/FrugalBuild 
b/source/x11-extra/fglrx/FrugalBuild
index 16a3dfb..e2c2e3f 100644
--- a/source/x11-extra/fglrx/FrugalBuild
+++ b/source/x11-extra/fglrx/FrugalBuild
@@ -5,7 +5,7 @@
pkgname=fglrx
pkgver=8.593
_shortver=9-3
-pkgrel=1
+pkgrel=2
pkgdesc="Hardware Accelerated ATi driver for xorg"
url="http://www.ati.com/";
# libstdc++5: no hardware acceleration without it
@@ -28,12 +28,13 @@ archs=('i686' 'x86_64')
install=$pkgname.install
up2date=$pkgver
source=(https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-${_shortver}-x86.x86_64.run
 \
-       README.Frugalware libGL.la license.diff)
+       README.Frugalware libGL.la license.diff fglrx-2.6.29-fixes.patch)
options=(${optio...@]} 'nodocs')
sha1sums=('ceefdfd2f8ecee4998a4ce4b7b87a45f1851e8d0' \
'b64a2303c77f84f5e5db13c9c8fd55f43fa9699b' \
'650973d708466f5c4c21e70c1f1f6c118b27e614' \
-          'bfbcbc939ca2d0cbe20eb306ed59ef49c2bea06a')
+          'bfbcbc939ca2d0cbe20eb306ed59ef49c2bea06a' \
+          '23428bf618d85ee166022362a015a277213aeae6')

# for xorg-server <1.5.0. need to change it to x740 once we have
# >=1.5.0!
diff --git a/source/x11-extra/fglrx/fglrx-2.6.29-fixes.patch 
b/source/x11-extra/fglrx/fglrx-2.6.29-fixes.patch
new file mode 100644
index 0000000..8c3acf3
--- /dev/null
+++ b/source/x11-extra/fglrx/fglrx-2.6.29-fixes.patch
@@ -0,0 +1,98 @@
+
+Quick-and-dirty fixes to build on 2.6.29-rcX kernels.
+
+ACPICA header files are now in drivers/acpi/acpica/
+
+--- common/lib/modules/fglrx/build_mod/firegl_public.c 2009-01-23 
20:00:26.000000000 -0200
++++ 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
+--- common/lib/modules/fglrx/build_mod/firegl_public.h 2009-01-23 
20:00:26.000000000 -0200
++++ 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
+
+
+--- common/lib/modules/fglrx/build_mod/kcl_acpi.c      2009-01-23 
20:00:26.000000000 -0200
++++ 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"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to