[Pkg-fglrx-devel] Bug#508024: fglrx-source: 8-11 patch problem

[Balázs Hámorszky]

Package: fglrx-source
Version: 1:8-11-1
Severity: important
Tags: patch
Justification: fails to build from source

I've tried to build 8-11 from the original source
https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-8-11-x86.x86_64.run
with this:
http://svn.debian.org/wsvn/pkg-fglrx/fglrx-driver/trunk/debian/
it fails to apply a few patch.
13-fix_debian_485605.patch seems unnecessary.
14-deletes_unecessary_spaces.patch is failing in many places.
I've fixed up 10-CONFIG_SMP.patch
--- firegl_public.c	2008-11-11 17:18:15.000000000 +0100
+++ firegl_public.c	2008-12-07 01:54:26.000000000 +0100
@@ -243,7 +243,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
@@ -2481,7 +2481,7 @@
 
 /*****************************************************************************/
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 static atomic_t cpus_waiting;
 
 static void deferred_flush(void* contextp)
@@ -2497,7 +2497,7 @@
 	while (atomic_read(&cpus_waiting) > 0)
 		barrier();
 }
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
 
 /** \brief Run a function on all other CPUs.
  * \param func The function to run.
@@ -2513,7 +2513,7 @@
 
 int ATI_API_CALL __ke_flush_cache(void)
 {
-#ifdef __SMP__
+#ifdef CONFIG_SMP
     /* write back invalidate all other CPUs (exported by kernel) */
 	if (KCL_SmpCallFunction(deferred_flush, NULL, 1, 0) != 0)
 		panic("timed out waiting for the other CPUs!\n");
@@ -2529,7 +2529,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__)
@@ -2537,7 +2537,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)

this way 8-11 builds.

-- System Information:
Debian Release: 5.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.26-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=hu_HU.UTF-8, LC_CTYPE=hu_HU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages fglrx-source depends on:
ii  bzip2                         1.0.5-1    high-quality block-sorting file co
ii  debhelper                     7.0.17     helper programs for debian/rules
ii  make                          3.81-5     The GNU version of the "make" util

Versions of packages fglrx-source recommends:
ii  kernel-package                11.015     A utility for building Linux kerne
ii  module-assistant              0.10.11.0  tool to make module package creati

Versions of packages fglrx-source suggests:
ii  fglrx-driver                  1:8-11-1   non-free AMD/ATI r5xx, r6xx displa

-- no debconf information