Commit 7fc668fb authored by Phil's avatar Phil
Browse files

update catalyst to 11.01 which is the first driver supporting 2.6.37

parent cba52b5f
......@@ -5,13 +5,13 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=catalyst-utils
pkgver=10.12
pkgver=11.1
pkgrel=1
pkgdesc="AMD/ATI Catalyst drivers utilities and libraries."
arch=('i686' 'x86_64')
url="http://www.ati.amd.com"
license=('custom')
depends=('xorg-server>=1.7.0' 'xorg-server<1.10.0' 'netkit-bsd-finger' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs')
depends=('xorg-server>=1.9.0' 'xorg-server<1.10.0' 'netkit-bsd-finger' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs')
optdepends=('qt: to run ATi Catalyst Control Center (amdcccle)')
replaces=('libgl')
conflicts=('catalyst-test' 'nvidia-utils' 'libgl')
......@@ -25,7 +25,7 @@ source=(
amdcccle.desktop
atieventsd.sh)
md5sums=('debf1518bd58c49b49aafddbae60b748'
md5sums=('f28f358b3a40a0a06e16f45925d9a875'
'bdafe749e046bfddee2d1c5e90eabd83'
'4efa8414a8fe9eeb50da38b5522ef81d'
'f729bf913613f49b0b9759c246058a87')
......
......@@ -22,11 +22,6 @@ whisperer(){
echo "[as root] kill Xserver and use this command:"
echo "# aticonfig --set-pcs-str=DDX,ForceXAA,TRUE"
echo "----------------------------------------------------------------"
echo "IMPORTANT NOTE:"
echo "If you are using libva and xvba-video packages then you need to"
echo "reinstall them, and type this as root:"
echo "rm /usr/lib/xorg/modules/dri/*_drv_video.so"
echo "----------------------------------------------------------------"
}
check_libdri_so(){
......
......@@ -4,33 +4,33 @@
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# Find the kernel name inside the chroot
_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgname=catalyst
pkgver=10.12
pkgrel=2
pkgver=11.1
pkgrel=1
pkgdesc="AMD/ATI Catalyst drivers for kernel26. fglrx kernel module only"
arch=('i686' 'x86_64')
url="http://www.ati.amd.com"
license=('custom')
depends=('kernel26>=2.6.26' 'kernel26<2.6.38' 'kernel26-headers' "catalyst-utils=${pkgver}" 'gcc-libs' 'gcc>4.0.0' 'make')
depends=('kernel26>=2.6.37' 'kernel26<2.6.39' "catalyst-utils=${pkgver}")
makedepends=('kernel26-headers' 'gcc-libs' 'gcc>4.0.0' 'make')
conflicts=('catalyst-test' 'nvidia' 'xf86-video-ati' 'xf86-video-radeonhd' 'ati-dri')
install=${pkgname}.install
patch_file="fglrx-2.6.36.patch"
patch_md5="eb58dbf993dbf8d77924055cc8caaeb6"
patch_target="2.6.36"
#patch_file="fglrx-2.6.36.patch"
#patch_md5="eb58dbf993dbf8d77924055cc8caaeb6"
#patch_target="2.6.36"
source=(
http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run
makefile_compat.patch
sema_init.patch
${patch_file})
makefile_compat.patch)
# ${patch_file})
md5sums=('debf1518bd58c49b49aafddbae60b748'
'3e1b82bd69774ea808da69c983d6a43b'
'ae25aec26013bdd541441617bb112a24'
${patch_md5})
md5sums=('f28f358b3a40a0a06e16f45925d9a875'
'3e1b82bd69774ea808da69c983d6a43b')
# ${patch_md5}
......@@ -54,11 +54,9 @@ build() {
patch -Np1 -i ../makefile_compat.patch || return 1
patch -Np1 -i ../fglrx-2.6.36.patch || return 1
if [[ ${_kernver:0:6} == "2.6.37" ]]; then
patch -Np1 -i ../sema_init.patch || return 1
fi
# if [[ ${_kernver:0:6} == "2.6.37" ]] || [[ ${_kernver:0:6} > "2.6.37" ]]; then
# patch -Np1 -i ../sema_init.patch || return 1
# fi
###--- cut ---### ati's code from their make.sh file
......
--- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-08-20 21:51:48.000000000 +0200
+++ work/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-08-20 23:46:37.000000000 +0200
@@ -320,7 +320,11 @@
return firegl_release((KCL_IO_FILE_Handle)filp);
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg)
+#else
int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg)
+#endif
{
return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg);
}
@@ -407,7 +411,11 @@
#endif
open: ip_firegl_open,
release: ip_firegl_release,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+ unlocked_ioctl: ip_firegl_ioctl,
+#else
ioctl: ip_firegl_ioctl,
+#endif
mmap: ip_firegl_mmap,
write: ip_firegl_write,
\ No newline at end of file
diff -Naur orig/common/lib/modules/fglrx/build_mod/firegl_public.c final/common/lib/modules/fglrx/build_mod/firegl_public.c
--- orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-09-22 03:15:33.000000000 -0400
+++ final/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-11-01 23:00:32.672955001 -0400
@@ -5094,7 +5094,7 @@
unsigned int ATI_API_CALL KAS_Mutex_Initialize(void* hMutex)
{
kasMutex_t* mutex_obj = (kasMutex_t*)hMutex;
- init_MUTEX(&(mutex_obj->mutex));
+ sema_init(&(mutex_obj->mutex),1);
return 1;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment