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

commit 40e9e270157e77d5745e6ee80a08a111bad01402
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sat Oct 24 18:23:55 2009 +0200

fglrx-8.661-1-i686

- version bump

diff --git a/source/x11-extra/fglrx/FrugalBuild 
b/source/x11-extra/fglrx/FrugalBuild
index e9abc0e..f07c9a7 100644
--- a/source/x11-extra/fglrx/FrugalBuild
+++ b/source/x11-extra/fglrx/FrugalBuild
@@ -3,9 +3,9 @@
# Maintainer: voroskoi <voros...@frugalware.org>

pkgname=fglrx
-pkgver=8.632
-_shortver=9-7
-pkgrel=7
+pkgver=8.661
+_shortver=9-10
+pkgrel=1
pkgdesc="Hardware Accelerated ATi driver for xorg"
url="http://www.ati.com/";
# libstdc++5: no hardware acceleration without it
@@ -28,17 +28,14 @@ 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 fglrx-2.6.29-fixes.patch 
fglrx-2.6.30-irqreturn_t.patch \
-       fglrx-missing-pci_enable_msi.patch fglrx-flush_tlb_page.patch)
+       README.Frugalware libGL.la license.diff \
+       fglrx-missing-pci_enable_msi.patch)
options=(${optio...@]} 'nodocs')
-sha1sums=('d04d31ae473e7e5b98b075f2082d60b56f6fe403' \
+sha1sums=('d4188de2c44f2960f7a7ddc3c837206863509062' \
'b64a2303c77f84f5e5db13c9c8fd55f43fa9699b' \
'650973d708466f5c4c21e70c1f1f6c118b27e614' \
'bfbcbc939ca2d0cbe20eb306ed59ef49c2bea06a' \
-          '23428bf618d85ee166022362a015a277213aeae6' \
-          '181ed7332ecb53dee38e2c080f9fda20ad0f90a2' \
-          '27d6fd2ed6547143c69b7ad9957cddc8bfc08e83' \
-          'cca8de69837a248934e92f2d00e0eba92c9e3db3')
+          '27d6fd2ed6547143c69b7ad9957cddc8bfc08e83')

Xversion=x740

diff --git a/source/x11-extra/fglrx/fglrx-2.6.29-fixes.patch 
b/source/x11-extra/fglrx/fglrx-2.6.29-fixes.patch
deleted file mode 100644
index 8c3acf3..0000000
--- a/source/x11-extra/fglrx/fglrx-2.6.29-fixes.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-
-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"
diff --git a/source/x11-extra/fglrx/fglrx-2.6.30-irqreturn_t.patch 
b/source/x11-extra/fglrx/fglrx-2.6.30-irqreturn_t.patch
deleted file mode 100644
index 090498f..0000000
--- a/source/x11-extra/fglrx/fglrx-2.6.30-irqreturn_t.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- common/lib/modules/fglrx/build_mod/drm_os_linux.h  2009-05-27 
19:24:11.944421623 -0500
-+++ common/lib/modules/fglrx/build_mod/drm_os_linux.h  2009-05-27 
19:28:12.424780164 -0500
-@@ -42,10 +42,12 @@
- #define DRM_IRQ_ARGS          int irq, void *arg, struct pt_regs *regs
- /** backwards compatibility with old irq return values */
- #ifndef IRQ_HANDLED
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
- typedef void irqreturn_t;
- #define IRQ_HANDLED   /* nothing */
- #define IRQ_NONE      /* nothing */
- #endif
-+#endif
-
- /** AGP types */
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,70)
-
diff --git a/source/x11-extra/fglrx/fglrx-flush_tlb_page.patch 
b/source/x11-extra/fglrx/fglrx-flush_tlb_page.patch
deleted file mode 100644
index 2193f8d..0000000
--- a/source/x11-extra/fglrx/fglrx-flush_tlb_page.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-tlb_flush_page is no longer exported on i686, either.
-
---- common/lib/modules/fglrx/build_mod/firegl_public.c.orig    2009-06-13 
23:34:05.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2009-06-13 
23:34:51.000000000 +0200
-@@ -2308,7 +2308,7 @@
-  * kernel <  2.6.27, on_each_cpu has 4 parameters.
-  * kernel >= 2.6.27, on_each_cpu has 3 parameters (removed the "retry" 
parameter)
-  */
--#if defined(__x86_64__) && (defined(__SMP__) || defined(CONFIG_SMP)) && 
(LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
-+#if (defined(__SMP__) || defined(CONFIG_SMP)) && (LINUX_VERSION_CODE >= 
KERNEL_VERSION(2,6,25))
- #   if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
-         on_each_cpu(KCL_flush_tlb_one, &va, 1, 1);
- #   else
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to