[arch-commits] Commit in catalyst/repos (4 files)

[andyrtr at archlinux.org]

    Date: Saturday, February 21, 2009 @ 10:26:26
  Author: andyrtr
Revision: 27435

Merged revisions 27434 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/catalyst/trunk

........
  r27434 | andyrtr | 2009-02-21 15:25:52 +0000 (Sa, 21 Feb 2009) | 2 lines
  
  upgpkg: catalyst 9.2-1
      new version 9.2; still broken for x86_64
........

Added:
  catalyst/repos/extra-i686/flush_tlb_page.patch
    (from rev 27434, catalyst/trunk/flush_tlb_page.patch)
Modified:
  catalyst/repos/extra-i686/	(properties)
  catalyst/repos/extra-i686/ChangeLog
  catalyst/repos/extra-i686/PKGBUILD

----------------------+
 ChangeLog            |    7 +++++++
 PKGBUILD             |   13 +++++++++----
 flush_tlb_page.patch |   11 +++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)


Property changes on: catalyst/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /catalyst/trunk:1-25885
   + /catalyst/trunk:1-27434

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-02-21 15:25:52 UTC (rev 27434)
+++ extra-i686/ChangeLog	2009-02-21 15:26:26 UTC (rev 27435)
@@ -1,6 +1,13 @@
+2009-02-21 Andreas Radke <andyrtr at archlinux.org>
+  * 9.2-1
+	new release
+	still broken for x86_64
+
 2009-01-30 Andreas Radke <andyrtr at archlinux.org>
   * 9.1-1
 	new release
+	broken for x86_64/is prelinked to 
+	 /usr/lib64 we don't allow
 
 2008-12-12 Andreas Radke <andyrtr at archlinux.org>
   * 8.12-1

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-21 15:25:52 UTC (rev 27434)
+++ extra-i686/PKGBUILD	2009-02-21 15:26:26 UTC (rev 27435)
@@ -3,7 +3,7 @@
 # Contributor: amdviaman
 
 pkgname=catalyst
-pkgver=9.1
+pkgver=9.2
 pkgrel=1
 pkgdesc="Proprietary AMD/ATI kernel drivers for Radeon brand cards. Stock kernel."
 arch=('i686' 'x86_64')
@@ -13,14 +13,19 @@
 makedepends=()
 replaces=('ati-fglrx' 'fglrx') # Yay rebranding
 install=catalyst.install
-source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run)
+source=(#http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run
+	http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver}-x86.x86_64.run
+	flush_tlb_page.patch)
 _kernver=2.6.28-ARCH
-md5sums=('cc4ff401586a6c099c9fd002c25cf7bb')
+md5sums=('3ef8f805be93eede480f56eaa4e3bee1'
+         'e743aab05f6cb815b2ebc5cf8ea2886a')
 
 build() {
-  /bin/sh ./ati-driver-installer-${pkgver/./-}-x86.x86_64.run --extract archive_files
+#  /bin/sh ./ati-driver-installer-${pkgver/./-}-x86.x86_64.run --extract archive_files
+  /bin/sh ./ati-driver-installer-${pkgver}-x86.x86_64.run --extract archive_files
 #  /bin/sh ./ati-driver-installer-XXXXXXXX-x86.x86_64.run --extract archive_files
 
+  patch -Np0 -i $srcdir/flush_tlb_page.patch || return 1
   if [ "${CARCH}" = "x86_64" ]; then
     BUILDARCH=x86_64
     _archdir=x86_64

Copied: catalyst/repos/extra-i686/flush_tlb_page.patch (from rev 27434, catalyst/trunk/flush_tlb_page.patch)
===================================================================
--- extra-i686/flush_tlb_page.patch	                        (rev 0)
+++ extra-i686/flush_tlb_page.patch	2009-02-21 15:26:26 UTC (rev 27435)
@@ -0,0 +1,11 @@
+--- archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c	2009-02-11 17:40:35.000000000 +0000
++++ archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c.new	2009-02-21 15:22:11.632031227 +0000
+@@ -2256,7 +2256,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__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) 
++#if defined(__x86_64__) && (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