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

[Tobias Powalowski]

    Date: Monday, August 11, 2008 @ 01:23:30
  Author: tpowa
Revision: 8447

Merged revisions 6593-8445 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/catalyst/trunk

........
  r8215 | andyrtr | 2008-08-09 13:47:44 +0000 (Sa, 09 Aug 2008) | 2 lines
  
  upgpkg: catalyst 8.7-1.1
      try to fix #11068 for x86_64
........
  r8445 | tpowa | 2008-08-11 05:23:01 +0000 (Mo, 11 Aug 2008) | 1 line
  
  upgpkg: catalyst 8.7-2
........

Modified:
  catalyst/repos/extra-i686/	(properties)
  catalyst/repos/extra-i686/2.6.26.patch
  catalyst/repos/extra-i686/PKGBUILD

--------------+
 2.6.26.patch |    2 +-
 PKGBUILD     |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)


Property changes on: catalyst/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /catalyst/trunk:1-6592
   + /catalyst/trunk:1-8445

Modified: extra-i686/2.6.26.patch
===================================================================
--- extra-i686/2.6.26.patch	2008-08-11 05:23:05 UTC (rev 8446)
+++ extra-i686/2.6.26.patch	2008-08-11 05:23:30 UTC (rev 8447)
@@ -719,7 +719,7 @@
  /*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)) 
-+#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))
      on_each_cpu(KCL_flush_tlb_one, &va, 1, 1);
  #else
      flush_tlb_page(vma, va);

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-08-11 05:23:05 UTC (rev 8446)
+++ extra-i686/PKGBUILD	2008-08-11 05:23:30 UTC (rev 8447)
@@ -5,19 +5,20 @@
 pkgname=catalyst
 pkgver=8.7
 _kernel_version=2.6.26
-pkgrel=1
+pkgrel=2
 pkgdesc="Proprietary AMD/ATI kernel drivers for Radeon brand cards. Stock kernel."
 arch=('i686' 'x86_64')
 url="http://www.ati.amd.com"
 license=('custom') 
-depends=("catalyst-utils>=${pkgver}" "kernel26>=${_kernel_version}-1" "kernel26<=${_kernel_version}.9999")
+depends=("catalyst-utils>=${pkgver}" "kernel26>=2.6.26.2-1" "kernel26<=2.6.27")
 makedepends=()
 replaces=('ati-fglrx' 'fglrx') # Yay rebranding
 install=${pkgname}.install
 source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run
         2.6.26.patch)
 md5sums=('2d0788eaba71abcce6105ee659406721'
-         'a58a42a4b0b16f5883cc9d9ecd82c73b')
+         '1e012ff619fc424eb139666b2faa3764')
+
 _kernver=${_kernel_version}-ARCH
 
 build() {