Commit d6391de6 authored by Radu's avatar Radu

Upgraded catalyst to 11.7 and merged my libdrm(no changes but checksums)

parent b95f0bb3
......@@ -5,8 +5,8 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=catalyst-utils
pkgver=11.6
pkgrel=3
pkgver=11.7
pkgrel=1
pkgdesc="AMD/ATI Catalyst drivers utilities and libraries."
arch=('i686' 'x86_64')
url="http://www.ati.amd.com"
......@@ -21,12 +21,16 @@ install=${pkgname}.install
source=(
http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run
switchlibglx
switchlibGL
catalyst.sh
radeon.conf
amdcccle.desktop
atieventsd.sh)
md5sums=('645e3b06f802e3edaa52244ff550c4f7'
md5sums=('acebb812d4c057766828df0bf572e8ae'
'c937c3e20eb04192d367d46b489bf733'
'10a7fdf84d93f73e9ad101fcb66f1f3a'
'bdafe749e046bfddee2d1c5e90eabd83'
'9ad03a78a863bc0b9f279b330669bd4c'
'4efa8414a8fe9eeb50da38b5522ef81d'
......@@ -119,8 +123,8 @@ package() {
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"
install -m755 ${srcdir}/switchlibGL "${pkgdir}/usr/lib/fglrx"
install -m755 ${srcdir}/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}"
......
#!/bin/sh
# A stupid script to switch GL libs on chakra/archlinux
USAGE=0
F_FGLRX="/usr/lib/fglrx/fglrx-libGL.so.1.2"
F_MESA="/usr/lib/libGL.so.1.2.mesa"
F_TARGETS="/usr/lib/libGL.so.1.2"
F32_FGLRX="/usr/lib32/fglrx/fglrx-libGL.so.1.2"
F32_MESA="/usr/lib32/libGL.so.1.2.mesa"
F32_TARGETS="/usr/lib32/libGL.so.1.2"
if [ -z $1 ]; then
USAGE=1
fi
if [ $USAGE -eq 1 ]; then
echo "Usage: $0 amd|intel|query"
exit 0
fi
function fix_links {
ln -sf ${F_MESA} ${F_TARGETS}
ln -sf ${F_TARGETS} /usr/lib/libGL.so.1
ln -sf ${F_TARGETS} /usr/lib/libGL.so
if [ -e $F32_FGLRX ]; then
ln -sf ${F32_MESA} ${F32_TARGETS}
ln -sf ${F32_TARGETS} /usr/lib32/libGL.so.1
ln -sf ${F32_TARGETS} /usr/lib32/libGL.so
fi
}
function switch_ati {
ln -sf ${F_FGLRX} ${F_TARGETS}
if [ -e $F32_FGLRX ]; then
ln -sf ${F_FGLRX} ${F_TARGETS}
fi
}
function switch_intel {
ln -sf ${F_MESA} ${F_TARGETS}
if [ -e $F32_FGLRX ]; then
ln -sf ${F_MESA} ${F_TARGETS}
fi
}
function print_current {
CURRENT_GL=`ls -l ${F_TARGETS}|awk '{print $11}'`
# echo $CURRENT_GL
if [ -z $CURRENT_GL ]; then
echo unknown
exit 1
fi
if [ "$CURRENT_GL" = ${F_FGLRX} ]; then
echo "amd"
fi
if [ "$CURRENT_GL" = ${F_MESA} ]; then
echo "intel"
fi
}
if [ "$1" = "amd" ]; then
fix_links
switch_ati
else
if [ "$1" = "intel" ];then
fix_links
switch_intel
else
if [ "$1" = "query" ]; then
print_current
fi
fi
fi
#!/bin/sh
# A stupid script to switch GL libs on chakra/archlinux
USAGE=0
F_FGLRX="/usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so"
F_MESA="/usr/lib/xorg/modules/extensions/libglx.xorg"
F_TARGETS="/usr/lib/xorg/modules/extensions/libglx.so"
F32_FGLRX="/usr/lib32/xorg/modules/extensions/fglrx/fglrx-libglx.so"
F32_MESA="/usr/lib32/xorg/modules/extensions/libglx.xorg"
F32_TARGETS="/usr/lib32/xorg/modules/extensions/libglx.so"
if [ -z $1 ]; then
USAGE=1
fi
if [ $USAGE -eq 1 ]; then
echo "Usage: $0 amd|intel|query"
exit 0
fi
function switch_ati {
ln -sf ${F_FGLRX} ${F_TARGETS}
if [ -e $F32_FGLRX ]; then
ln -sf ${F_FGLRX} ${F_TARGETS}
fi
}
function switch_intel {
ln -sf ${F_MESA} ${F_TARGETS}
if [ -e $F32_FGLRX ]; then
ln -sf ${F_MESA} ${F_TARGETS}
fi
}
function print_current {
CURRENT_GL=`ls -l ${F_TARGETS}|awk '{print $11}'`
# echo $CURRENT_GL
if [ -z $CURRENT_GL ]; then
echo unknown
exit 1
fi
if [ "$CURRENT_GL" = ${F_FGLRX} ]; then
echo "amd"
fi
if [ "$CURRENT_GL" = ${F_MESA} ]; then
echo "intel"
fi
}
if [ "$1" = "amd" ]; then
switch_ati
else
if [ "$1" = "intel" ];then
switch_intel
else
if [ "$1" = "query" ]; then
print_current
fi
fi
fi
......@@ -9,8 +9,8 @@
_kernver=`pacman -Q kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgname=catalyst
pkgver=11.6
pkgrel=3
pkgver=11.7
pkgrel=1
pkgdesc="AMD/ATI Catalyst drivers for kernel26. fglrx kernel module only"
arch=('i686' 'x86_64')
url="http://www.ati.amd.com"
......@@ -23,16 +23,12 @@ install=${pkgname}.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
2.6.39_bkl.patch)
)
md5sums=('645e3b06f802e3edaa52244ff550c4f7'
md5sums=('acebb812d4c057766828df0bf572e8ae'
'660396540b0ceaff71d6155c986734de'
'3e1b82bd69774ea808da69c983d6a43b'
'6a6b2133aa6ef3bcd377731b19c0553a'
'eb24250f8e537273bae9dbd79a022d61')
)
build() {
......@@ -63,14 +59,6 @@ build() {
## works only in combination with ati_make.sh script
patch -Np1 -i ../makefile_compat.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
cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod"
cp "${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a" . || 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