Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c8b87a796cc214ef2498625fcebeb69a444c5b4
commit 3c8b87a796cc214ef2498625fcebeb69a444c5b4 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Sun Nov 16 14:45:20 2008 +0100 fglrx-8.552-1-i686 - version bump - kernel-2.6.27 patch still needed because we have CONFIG_MAGIC_SYSRQ disabled. diff --git a/source/x11-extra/fglrx/FrugalBuild b/source/x11-extra/fglrx/FrugalBuild index 9490fb0..1f1cae5 100644 --- a/source/x11-extra/fglrx/FrugalBuild +++ b/source/x11-extra/fglrx/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi <[EMAIL PROTECTED]> pkgname=fglrx -pkgver=8.542 -_shortver=8-10 +pkgver=8.552 +_shortver=8-11 pkgrel=1 pkgdesc="Hardware Accelerated ATi driver for xorg" url="http://www.ati.com/"; @@ -30,12 +30,14 @@ 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 kernel-2.6.27.patch) options=([EMAIL PROTECTED] 'nodocs') -sha1sums=('9d1870c13bc9d7e5dccfcc62376828ff28471f0a' \ +sha1sums=('75f9775f3df412617aa2897ef8d75e10c9fc9017' \ 'b64a2303c77f84f5e5db13c9c8fd55f43fa9699b' \ '650973d708466f5c4c21e70c1f1f6c118b27e614' \ 'bfbcbc939ca2d0cbe20eb306ed59ef49c2bea06a' \ - '3b3a6b7d380e9b4ce2f9837bae7f77029bb8eeea') + 'd4b3174a9d978b9a13605c8d869a27511e4b1f05') +# for xorg-server <1.5.0. need to change it to x740 once we have +# >=1.5.0! Xversion=x710 build() { diff --git a/source/x11-extra/fglrx/kernel-2.6.27.patch b/source/x11-extra/fglrx/kernel-2.6.27.patch index ad8e9f8..43cc14a 100644 --- a/source/x11-extra/fglrx/kernel-2.6.27.patch +++ b/source/x11-extra/fglrx/kernel-2.6.27.patch @@ -1,97 +1,10 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c.orig 2008-09-19 10:57:09.000000000 +0200 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c 2008-09-19 10:55:57.000000000 +0200 -@@ -199,6 +199,12 @@ - #define preempt_enable() - #endif +--- common/lib/modules/fglrx/build_mod/kcl_debug.c.orig 2008-11-16 14:43:25.000000000 +0100 ++++ common/lib/modules/fglrx/build_mod/kcl_debug.c 2008-11-16 14:43:42.000000000 +0100 +@@ -32,6 +32,7 @@ -+/* Since 2.6.27 smp_call_function doesn't have a nonatomic/retry argument */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) -+#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, wait) -+#else -+#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, retry, wait) -+#endif - // ============================================================ - /* globals */ + #include <linux/version.h> + #include <linux/kernel.h> ++#include <asm/errno.h> + #include <linux/sysrq.h> -@@ -250,7 +256,7 @@ - const char BUILD_KERNEL_HAS_MODVERSIONS_CLEARED; - #endif - --#ifdef __SMP__ -+#ifdef CONFIG_SMP - const unsigned long __ke_SMP_State = 1; - const char BUILD_KERNEL_HAS_SMP_SET; - #else -@@ -2516,8 +2522,8 @@ - { - /*Some kernel developer removed the export of symbol "flush_tlb_page" on 2.6.25 x86_64 SMP kernel. - Define a simple version here.*/ --#if defined(__x86_64__) && defined(__SMP__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) -- on_each_cpu(KCL_flush_tlb_one, &va, 1, 1); -+#if defined(__x86_64__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) -+ on_each_cpu(KCL_flush_tlb_one, &va, 1); - #else - flush_tlb_page(vma, va); - #endif -@@ -2902,7 +2908,7 @@ - - /*****************************************************************************/ - --#ifdef __SMP__ -+#ifdef CONFIG_SMP - static atomic_t cpus_waiting; - - static void deferred_flush(void* contextp) -@@ -2918,13 +2924,13 @@ - while (atomic_read(&cpus_waiting) > 0) - barrier(); - } --#endif /* __SMP__ */ -+#endif /* CONFIG_SMP */ - - int ATI_API_CALL __ke_flush_cache(void) - { --#ifdef __SMP__ -+#ifdef CONFIG_SMP - /* write back invalidate all other CPUs (exported by kernel) */ -- if (smp_call_function(deferred_flush, NULL, 1, 0) != 0) -+ if (SMP_CALL_FUNCTION(deferred_flush, NULL, 1, 0) != 0) - panic("timed out waiting for the other CPUs!\n"); - - /* invalidate this CPU */ -@@ -2938,7 +2944,7 @@ - - while (atomic_read(&cpus_waiting) > 0) - barrier(); --#else /* !__SMP__ */ -+#else /* !CONFIG_SMP */ - #if defined(__i386__) || defined(__x86_64__) - asm volatile ("wbinvd":::"memory"); - #elif defined(__alpha__) || defined(__sparc__) -@@ -2946,7 +2952,7 @@ - #else - #error "Please define flush_cache for your architecture." - #endif --#endif /* !__SMP__ */ -+#endif /* !CONFIG_SMP */ - - //for kernel 2.6.25, tlb_flush has been included when calling set_pages_*. - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) -@@ -4654,7 +4660,7 @@ - } - - #ifdef CONFIG_SMP -- if (smp_call_function(KCL_setup_pat, NULL, 0, 1) != 0) -+ if (SMP_CALL_FUNCTION(KCL_setup_pat, NULL, 0, 1) != 0) - return 0; - #endif - KCL_setup_pat(NULL); -@@ -4673,7 +4679,7 @@ - } - - #ifdef CONFIG_SMP -- if (smp_call_function(KCL_restore_pat, NULL, 0, 1) != 0) -+ if (SMP_CALL_FUNCTION(KCL_restore_pat, NULL, 0, 1) != 0) - return; - #endif - KCL_restore_pat(NULL); + #include "kcl_config.h" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
