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

[Eric Belanger]

    Date: Thursday, May 29, 2008 @ 23:20:12
  Author: eric
Revision: 2243

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

........
  r2110 | travis | 2008-05-25 07:57:34 -0400 (Sun, 25 May 2008) | 1 line
  
  Update PKGBUILD for Catalyst 8.5 - don't push to repos yet.
........
  r2127 | travis | 2008-05-25 20:05:52 -0400 (Sun, 25 May 2008) | 2 lines
  
  upgpkg: catalyst 8.5-1
      Upstream update
........

Modified:
  catalyst/repos/extra-x86_64/	(properties)
  catalyst/repos/extra-x86_64/ChangeLog
  catalyst/repos/extra-x86_64/PKGBUILD
Deleted:
  catalyst/repos/extra-x86_64/compat-2.6.25.diff

--------------------+
 ChangeLog          |    5 +++++
 PKGBUILD           |   12 ++++--------
 compat-2.6.25.diff |   46 ----------------------------------------------
 3 files changed, 9 insertions(+), 54 deletions(-)


Property changes on: catalyst/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /catalyst/trunk:1-1534
   + /catalyst/trunk:1-2242

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2008-05-30 03:17:59 UTC (rev 2242)
+++ extra-x86_64/ChangeLog	2008-05-30 03:20:12 UTC (rev 2243)
@@ -1,3 +1,8 @@
+2008-05-24 Travis Willard <travis at archlinux.org>
+
+  * 8.5-1
+	New upstream release.
+
 2008-04-19 Simo Leone <simo at archlinux.org>
 
 	* 8.4-1

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-05-30 03:17:59 UTC (rev 2242)
+++ extra-x86_64/PKGBUILD	2008-05-30 03:20:12 UTC (rev 2243)
@@ -3,9 +3,9 @@
 # Contributor: amdviaman
 
 pkgname=catalyst
-pkgver=8.4
+pkgver=8.5
 _kernel_version=2.6.25
-pkgrel=2
+pkgrel=1
 pkgdesc="Proprietary AMD/ATI kernel drivers for Radeon brand cards. Stock kernel."
 arch=('i686' 'x86_64')
 url="http://www.ati.amd.com"
@@ -14,9 +14,8 @@
 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 compat-2.6.25.diff)
-md5sums=('8fa23f45b4becc9721e67858e41ff85c'
-         'b5eab9bcdbe05913ed263f3a3cd01a4f')
+source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run)
+md5sums=('f0df93149fc44a8aacabcd9fc58e6d3c')
 _kernver=${_kernel_version}-ARCH
 
 build() {
@@ -38,9 +37,6 @@
     cd $startdir/src
     cd $startdir/src/lib/modules/fglrx/build_mod/
 
-    # patch catalyst 8.4 to work with 2.6.25
-    patch -p1 < $startdir/src/compat-2.6.25.diff
-
     # Build the kernel module
     cp 2.6.x/Makefile .
     make -C /lib/modules/${_kernver}/build SUBDIRS="`pwd`" modules || return 1

Deleted: extra-x86_64/compat-2.6.25.diff
===================================================================
--- extra-x86_64/compat-2.6.25.diff	2008-05-30 03:17:59 UTC (rev 2242)
+++ extra-x86_64/compat-2.6.25.diff	2008-05-30 03:20:12 UTC (rev 2243)
@@ -1,46 +0,0 @@
-This patch came from http://sarah-a-happy.livejournal.com/90345.html
-It makes compatability changes for changed function names and a macro change
-in kernel 2.6.25.
---- build_mod/firegl_public.c.orig     2008-04-06 01:20
-:21.000000000 -0300
-+++ build_mod/firegl_public.c  2008-04-06 01:17:58.0000
-00000 -0300
-@@ -1885,7 +1885,7 @@
-  */
- KCL_TYPE_Cap ATI_API_CALL KCL_PosixSecurityCapGetEffectiveVector()
- {
--    return cap_t(current->cap_effective);
-+    return (current->cap_effective).cap[0];
- }
- 
- /** \brief Set vector of effective security caps for the current process
-@@ -1893,7 +1893,7 @@
-  */
- void ATI_API_CALL KCL_PosixSecurityCapSetEffectiveVector(KCL_TYPE_Cap cap)
- {
--    cap_t(current->cap_effective) = cap;
-+    (current->cap_effective).cap[0] = cap;
- }
- 
- /** \brief Get number of available RAM pages
---- build_mod/firegl_public.c.orig     2008-04-06 02:10
-:13.000000000 -0300
-+++ build_mod/firegl_public.c  2008-04-06 02:23:05.0000
-00000 -0300
-@@ -120,6 +120,7 @@
- #include <asm/cpufeature.h>
- #ifdef CONFIG_MTRR
- #include <asm/mtrr.h>
-+#include <asm/cacheflush.h>
- #endif
- #include <asm/delay.h>
- #include <linux/agp_backend.h>
-@@ -1158,7 +1159,7 @@
- 
- int ATI_API_CALL KCL_SetPageNoCache(void* virt, int pages)
- {
--    return change_page_attr(virt_to_page(virt), pages, PAGE_KERNEL_NOCACHE);
-+    return set_pages_uc(virt_to_page(virt), pages);
- }
- 
- /** /brief Call global kernel task/thread scheduler */