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

[Simo Leone]

    Date: Saturday, April 19, 2008 @ 19:28:07
  Author: simo
Revision: 468

upgpkg: catalyst-8.4-1 . build against 2.6.25

Added:
  catalyst/trunk/compat-2.6.25.diff
Modified:
  catalyst/trunk/ChangeLog
  catalyst/trunk/PKGBUILD
  catalyst/trunk/catalyst.install

--------------------+
 ChangeLog          |    5 +++++
 PKGBUILD           |   13 ++++++++-----
 catalyst.install   |    6 +++---
 compat-2.6.25.diff |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 8 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2008-04-19 23:27:04 UTC (rev 467)
+++ ChangeLog	2008-04-19 23:28:07 UTC (rev 468)
@@ -1,3 +1,8 @@
+2008-04-19 Simo Leone <simo at archlinux.org>
+
+	* 8.4-1
+	New upstream release and built against 2.6.25
+
 2008-03-06 Travis Willard <travis at archlinux.org>
 
 	* 8.3-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-04-19 23:27:04 UTC (rev 467)
+++ PKGBUILD	2008-04-19 23:28:07 UTC (rev 468)
@@ -3,9 +3,9 @@
 # Contributor: amdviaman
 
 pkgname=catalyst
-pkgver=8.3
+pkgver=8.4
 _kernel_version=2.6.25
-pkgrel=3
+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,9 @@
 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)
-md5sums=('42d8b1581a61c1945196dd5ed47519b8')
-
+source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run compat-2.6.25.diff)
+md5sums=('8fa23f45b4becc9721e67858e41ff85c'
+         'b5eab9bcdbe05913ed263f3a3cd01a4f')
 _kernver=${_kernel_version}-ARCH
 
 build() {
@@ -38,6 +38,9 @@
     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

Modified: catalyst.install
===================================================================
--- catalyst.install	2008-04-19 23:27:04 UTC (rev 467)
+++ catalyst.install	2008-04-19 23:28:07 UTC (rev 468)
@@ -13,20 +13,20 @@
   echo "You can use the tool 'aticonfig' to generate an xorg.conf file."
   echo "Remember to add fglrx to the MODULES list in /etc/rc.conf."
   echo "--------------------------------------------------------------"
-  KERNEL_VERSION=2.6.24-ARCH
+  KERNEL_VERSION=2.6.25-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-  KERNEL_VERSION=2.6.24-ARCH
+  KERNEL_VERSION=2.6.25-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
 # arg 1:  the old package version
 post_remove() {
-  KERNEL_VERSION=2.6.24-ARCH
+  KERNEL_VERSION=2.6.25-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 

Added: compat-2.6.25.diff
===================================================================
--- compat-2.6.25.diff	                        (rev 0)
+++ compat-2.6.25.diff	2008-04-19 23:28:07 UTC (rev 468)
@@ -0,0 +1,46 @@
+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 */