Commit 65814f60 authored by philm's avatar philm

update proprietary drivers nvidia and catalyst

parent 41e5b6c1
......@@ -9,7 +9,7 @@
_kernver="2.6.35-CHAKRA-LTS"
pkgname=catalyst-lts
pkgver=11.5
pkgver=11.6
pkgrel=1
pkgdesc="AMD/ATI Catalyst drivers for kernel26. fglrx kernel module only"
arch=('i686' 'x86_64')
......@@ -23,12 +23,14 @@ install=catalyst.install
source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run
ati_make.sh
makefile_compat.patch
no_bkl.patch)
no_bkl.patch
2.6.39_bkl.patch)
md5sums=('0a407ba5b7302239071a907e36a6934b'
md5sums=('516ea47b13d367e09a90acb9422df738'
'660396540b0ceaff71d6155c986734de'
'3e1b82bd69774ea808da69c983d6a43b'
'6a6b2133aa6ef3bcd377731b19c0553a')
'6a6b2133aa6ef3bcd377731b19c0553a'
'eb24250f8e537273bae9dbd79a022d61')
......@@ -60,8 +62,16 @@ build() {
## makefile patch to choose arch_compat_alloc_user_space or older compat_alloc_user_space
## works only in combination with ati_make.sh script
patch -Np1 -i ../makefile_compat.patch || return 1
patch -Np1 -i ../no_bkl.patch || return 1
if [[ ${_kernver:0:6} < "2.6.39" ]] && [[ `cat /lib/modules/${_kernver}/build/.config | grep -c CONFIG_BKL=y` = 0 ]]; then
patch -Np1 -i ../no_bkl.patch || return 1
fi
if [[ ${_kernver:0:6} == "2.6.39" ]] || [[ ${_kernver:0:6} > "2.6.39" ]]; then
patch -Np1 -i ../no_bkl.patch || return 1
patch -Np1 -i ../2.6.39_bkl.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
......
......@@ -5,7 +5,7 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=catalyst-utils
pkgver=11.5
pkgver=11.6
pkgrel=1
pkgdesc="AMD/ATI Catalyst drivers utilities and libraries."
arch=('i686' 'x86_64')
......@@ -13,6 +13,7 @@ url="http://www.ati.amd.com"
license=('custom')
depends=('xorg-server>=1.7.0' 'xorg-server<1.11.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')
provides=('libgl' "libatical=${pkgver}")
install=${pkgname}.install
......@@ -23,7 +24,7 @@ source=(
amdcccle.desktop
atieventsd.sh)
md5sums=('0a407ba5b7302239071a907e36a6934b'
md5sums=('516ea47b13d367e09a90acb9422df738'
'bdafe749e046bfddee2d1c5e90eabd83'
'4efa8414a8fe9eeb50da38b5522ef81d'
'f729bf913613f49b0b9759c246058a87')
......
......@@ -9,13 +9,13 @@
_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgname=catalyst
pkgver=11.5
pkgrel=3
pkgver=11.6
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.39' 'kernel26<2.6.40' 'catalyst-utils')
depends=('kernel26>=2.6.38' 'kernel26<2.6.39' 'catalyst-utils')
makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'kernel26-headers')
conflicts=('catalyst-test' 'nvidia' 'xf86-video-ati' 'xf86-video-radeonhd' 'ati-dri')
install=${pkgname}.install
......@@ -26,7 +26,7 @@ source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86
no_bkl.patch
2.6.39_bkl.patch)
md5sums=('e6efc5477b7da9125945f5047b60b923'
md5sums=('516ea47b13d367e09a90acb9422df738'
'660396540b0ceaff71d6155c986734de'
'3e1b82bd69774ea808da69c983d6a43b'
'6a6b2133aa6ef3bcd377731b19c0553a'
......
KERNEL_VERSION=2.6.39-CHAKRA
KERNEL_VERSION=2.6.38-CHAKRA
whisperer(){
......
......@@ -8,7 +8,7 @@
_kernver="2.6.35-CHAKRA-LTS"
pkgname=nvidia-lts
pkgver=270.41.06
pkgver=275.09.07
pkgrel=1
pkgdesc="NVIDIA drivers for kernel26."
arch=('i686' 'x86_64')
......@@ -23,12 +23,12 @@ if [ "$CARCH" = "i686" ]; then
ARCH='x86'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}"
source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('702868c77b13bba46f0fce26ed7a1fb7')
md5sums=('d779057af3a2f96a05ddda201606618b')
elif [ "$CARCH" = "x86_64" ]; then
ARCH='x86_64'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32"
source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('d62243b91d0dc8f2c4b2ab646b72ca65')
md5sums=('f75df248f7bf32199ed88db2f080cbfa')
fi
build() {
......
......@@ -5,7 +5,7 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=nvidia-utils
pkgver=270.41.19
pkgver=275.09.07
pkgrel=1
pkgdesc="NVIDIA drivers utilities and libraries."
arch=('i686' 'x86_64')
......@@ -23,12 +23,12 @@ if [ "$CARCH" = "i686" ]; then
ARCH='x86'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}"
source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('c167e32702f56599bd600add97943312')
md5sums=('d779057af3a2f96a05ddda201606618b')
elif [ "$CARCH" = "x86_64" ]; then
ARCH='x86_64'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32"
source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('cb518bdd70f356425b8c4a5a48c0ad9c')
md5sums=('f75df248f7bf32199ed88db2f080cbfa')
fi
source[1]='20-nvidia.conf'
......
......@@ -8,12 +8,12 @@
_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgname=nvidia
pkgver=270.41.19
pkgrel=2
pkgver=275.09.07
pkgrel=1
pkgdesc="NVIDIA drivers for kernel26."
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
depends=('kernel26>=2.6.39' 'kernel26<2.6.40' "nvidia-utils=${pkgver}")
depends=('kernel26>=2.6.38' 'kernel26<2.6.39' "nvidia-utils=${pkgver}")
makedepends=('kernel26-headers')
conflicts=('nvidia-96xx' 'nvidia-173xx')
license=('custom')
......@@ -23,12 +23,12 @@ if [ "$CARCH" = "i686" ]; then
ARCH='x86'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}"
source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('c167e32702f56599bd600add97943312')
md5sums=('d779057af3a2f96a05ddda201606618b')
elif [ "$CARCH" = "x86_64" ]; then
ARCH='x86_64'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32"
source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('cb518bdd70f356425b8c4a5a48c0ad9c')
md5sums=('f75df248f7bf32199ed88db2f080cbfa')
fi
build() {
......
post_install() {
KERNEL_VERSION='2.6.39-CHAKRA'
KERNEL_VERSION='2.6.38-CHAKRA'
depmod $KERNEL_VERSION
}
......@@ -9,6 +9,6 @@ post_upgrade() {
}
post_remove() {
KERNEL_VERSION='2.6.39-CHAKRA'
KERNEL_VERSION='2.6.38-CHAKRA'
depmod $KERNEL_VERSION
}
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