Commit 0d60bfe6 authored by Radu's avatar Radu
Browse files

Updated and fixed catalyst.

parent b31451af
......@@ -6,13 +6,15 @@
pkgname=catalyst-utils
pkgver=11.6
pkgrel=2
pkgrel=3
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.11.0' 'netkit-bsd-finger' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'libgl')
optdepends=('qt: to run ATi Catalyst Control Center (amdcccle)')
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)'
'libgl: support for AMD PowerXpress'
)
conflicts=('catalyst-testing' 'nvidia-utils')
provides=("libatical=${pkgver}")
install=${pkgname}.install
......@@ -20,13 +22,16 @@ install=${pkgname}.install
source=(
http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run
catalyst.sh
radeon.conf
amdcccle.desktop
atieventsd.sh)
md5sums=('516ea47b13d367e09a90acb9422df738'
md5sums=('645e3b06f802e3edaa52244ff550c4f7'
'bdafe749e046bfddee2d1c5e90eabd83'
'9ad03a78a863bc0b9f279b330669bd4c'
'4efa8414a8fe9eeb50da38b5522ef81d'
'f729bf913613f49b0b9759c246058a87')
build() {
## Unpack archive
/bin/sh ./ati-driver-installer-${pkgver/./-}-x86.x86_64.run --extract archive_files
......@@ -38,6 +43,7 @@ package() {
install -m755 -d "${pkgdir}/etc/ati"
install -m755 -d "${pkgdir}/etc/rc.d"
install -m755 -d "${pkgdir}/etc/profile.d"
install -m755 -d "${pkgdir}/etc/modprobe.d"
install -m755 -d "${pkgdir}/etc/acpi/events"
install -m755 -d "${pkgdir}/etc/security/console.apps"
......@@ -61,6 +67,9 @@ package() {
install -m755 -d "${pkgdir}/usr/share/man/man8"
install -m755 -d "${pkgdir}/usr/share/pixmaps"
# Blacklist radeon
install -m644 "${srcdir}/radeon.conf" "${pkgdir}/etc/profile.d"
# X.org driver
if [ "${CARCH}" = "i686" ]; then
cd "${srcdir}/archive_files/xpic/usr/X11R6/lib/modules" || return 1
......@@ -109,6 +118,10 @@ package() {
install -m755 X11R6/${_lib}/modules/dri/*.so "${pkgdir}/usr/lib/xorg/modules/dri/" || return 1
install -m755 ${_lib}/*.so* "${pkgdir}/usr/lib/" || return 1
# Install powerXpress scripts
install -m755 ${_lib}/fglrx/switchlibGL "${pkgdir}/usr/lib/fglrx"
install -m755 ${_lib}/fglrx/switchlibglx "${pkgdir}/usr/lib/fglrx"
## QT libs (only 2 files) - un-comment 2 lines below if you don't want to install qt package
# install -m755 -d "${pkgdir}/usr/share/ati/${_lib}"
# install -m755 share/ati/${_lib}/*.so* "${pkgdir}/usr/share/ati/${_lib}/" || return 1
......@@ -155,4 +168,4 @@ package() {
# License
install -m644 "${srcdir}/archive_files/ATI_LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
}
\ No newline at end of file
}
......@@ -33,12 +33,20 @@ check_libdri_so(){
}
link_libgl_so(){
#check if libGL is installed
LIBGL=`pacman -Qq libgl`
MARCH=`uname -m`
if [ "$LIBGL" = "libgl" ]; then
if [ "$MARCH" = "x86_64" ]; then
ln -snf /usr/lib /usr/lib64
fi
ln -snf /usr/lib/libGL.so.1.2.mesa /usr/lib/FGL.renamed.libGL.so.1.2
ln -snf libglx.xorg /usr/lib/xorg/modules/extensions/FGL.renamed.libglx.so
fi
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so.1.2
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so.1
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so
ln -snf /usr/lib/libGL.so.1.2 /usr/lib/libGL.so.1
ln -snf /usr/lib/libGL.so.1.2 /usr/lib/libGL.so
ln -snf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so /usr/lib/xorg/modules/extensions/libglx.so
ln -snf libglx.xorg /usr/lib/xorg/modules/extensions/FGL.renamed.libglx.so
ln -snf /usr/lib/libGL.so.1.2.mesa /usr/lib/FGL.renamed.libGL.so.1.2
}
restore_libgl_so(){
......
......@@ -10,7 +10,7 @@ _kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgname=catalyst
pkgver=11.6
pkgrel=1
pkgrel=2
pkgdesc="AMD/ATI Catalyst drivers for kernel26. fglrx kernel module only"
arch=('i686' 'x86_64')
url="http://www.ati.amd.com"
......@@ -25,11 +25,11 @@ source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86
makefile_compat.patch
no_bkl.patch)
md5sums=('516ea47b13d367e09a90acb9422df738'
'660396540b0ceaff71d6155c986734de'
'3e1b82bd69774ea808da69c983d6a43b'
'6a6b2133aa6ef3bcd377731b19c0553a')
md5sums=('645e3b06f802e3edaa52244ff550c4f7'
'660396540b0ceaff71d6155c986734de'
'3e1b82bd69774ea808da69c983d6a43b'
'6a6b2133aa6ef3bcd377731b19c0553a')
build() {
......@@ -87,4 +87,4 @@ package() {
install -m644 "${srcdir}/archive_files/ATI_LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" $startdir/*.install
}
\ No newline at end of file
}
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