From dce2143f7df5ebc0f3f7a577a5bf161afd4271b1 Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Wed, 4 Apr 2007 02:46:26 +0200 Subject: [PATCH] ati: Updated missed files from the previous commit. --- ati/.footprint | 5 +---- ati/.md5sum | 5 +++-- ati/Pkgfile | 30 ++++++++++++++++++++---------- ati/README | 22 ++++++++++++++++++++++ 4 files changed, 46 insertions(+), 16 deletions(-) diff --git a/ati/.footprint b/ati/.footprint index eb548b16f..bd9b091ea 100644 --- a/ati/.footprint +++ b/ati/.footprint @@ -16,6 +16,7 @@ drwxr-xr-x root/root lib/modules//kernel/drivers/char/drm/ -rw-r--r-- root/root lib/modules//kernel/drivers/char/drm/fglrx.ko drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/amdcccle -rwxr-xr-x root/root usr/bin/aticonfig -rwxr-xr-x root/root usr/bin/fgl_glxgears -rwxr-xr-x root/root usr/bin/fglrx_xgamma @@ -31,7 +32,6 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/dri/ -rwxr-xr-x root/root usr/lib/dri/fglrx_dri.so -rwxrwxr-x root/root usr/lib/libGL_so_1_2_ati --rwxrwxr-x root/root usr/lib/libatixutil.a -rwxrwxr-x root/root usr/lib/libfglrx_dm.a -rwxrwxr-x root/root usr/lib/libfglrx_dm.so.1.0 -rwxrwxr-x root/root usr/lib/libfglrx_gamma.a @@ -54,6 +54,3 @@ drwxr-xr-x root/root usr/man/man8/ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/atieventsd -rwxr-xr-x root/root usr/sbin/atigetsysteminfo.sh -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/icons/ --rw-r--r-- root/root usr/share/icons/ati.xpm diff --git a/ati/.md5sum b/ati/.md5sum index b0cf27668..65f94ec5b 100644 --- a/ati/.md5sum +++ b/ati/.md5sum @@ -1,3 +1,4 @@ -44eda48613542b955a63bd6af2ccc6ce ati-driver-installer-8.34.8-x86.x86_64.run +5c4e56501fc8a698cdfce8a475eb51ae ati-2.6.20.patch +0df9894e970fee8be2bfba4352bf0806 ati-8.35.5-2.6.20.patch +c580c83cbf99007a4256fd40368cb2d9 ati-driver-installer-8.35.5-x86.x86_64.run e4d8a8b28ae298b673c492c34799d515 atieventsd.sh -70aebbb4d8e139ec6c65c88f20276f32 kernel-2.6.20.patch diff --git a/ati/Pkgfile b/ati/Pkgfile index 4248eb3f9..34e164c9c 100644 --- a/ati/Pkgfile +++ b/ati/Pkgfile @@ -5,26 +5,36 @@ # Depends on: mesa3d, gl-select name=ati -version=8.34.8 +version=8.35.5 release=1 source=(http://www2.ati.com/drivers/linux/$name-driver-installer-$version-x86.x86_64.run \ - kernel-2.6.20.patch \ + ati-2.6.20.patch \ + ati-$version-2.6.20.patch \ atieventsd.sh) build() { march=x86 - xversion=x710 - chmod +x $name-driver-installer-$version-x86.x86_64.run + # xorg-server 1.1 and its prereleases correspond to xorg 7.1 + if [ `pkg-config --modversion xorg-server | cut -d'.' -f2` -gt 0 ]; then + xversion=x710 + else + xversion=x690 + fi + + chmod +x $name-driver-installer-$version-x86.x86_64.run ./$name-driver-installer-$version-x86.x86_64.run --extract $SRC/tmp # patch - cd $SRC/tmp - patch -Np0 -i $SRC/kernel-2.6.20.patch + if [ "`uname -r | cut -d'.' -f1,2,3`" == "2.6.20" ]; then + cd $SRC/tmp + patch -Np0 -i $SRC/ati-2.6.20.patch + patch `find $SRC -type f -name 'firegl_public.c'` \ + $SRC/ati-$version-2.6.20.patch + fi # make cd $SRC/tmp/common/lib/modules/fglrx/build_mod - ln -s $SRC/tmp/arch/$march/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC* . - sed -i 's|/usr/X11R6|/usr|g' make.sh + ln -s $SRC/tmp/arch/$march/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 . chmod +x make.sh ./make.sh @@ -54,8 +64,8 @@ build() { ln -sf /usr/lib/libfglrx_pp.so.1.0 $PKG/usr/lib/libfglrx_pp.so.1 ln -sf /usr/lib/libfglrx_gamma.so.1.0 $PKG/usr/lib/libfglrx_gamma.so.1 install -D -m 0755 $SRC/atieventsd.sh $PKG/etc/rc.d/atieventsd - install -D -m 0644 $SRC/tmp/common/usr/share/icons/ati.xpm \ - $PKG/usr/share/icons/ati.xpm + #install -D -m 0644 $SRC/tmp/common/usr/share/icons/ati.xpm \ + # $PKG/usr/share/icons/ati.xpm # required for use xorg-gl-select mv -v $PKG/usr/lib/libGL.so.1.2 $PKG/usr/lib/libGL_so_1_2_ati } diff --git a/ati/README b/ati/README index 3a058d39a..101beb85d 100644 --- a/ati/README +++ b/ati/README @@ -2,6 +2,28 @@ README for ati 8.34.8 +*** NOTE for kernel *** + +Check you have the next config: + +Loadable Module Support ---> + [*] Enable loadable module support + [*] Module unloading + +Processor type and features ---> + [*] MTRR (Memory Type Range Register) support + +Device Drivers ---> + Character Devices ---> + /dev/agpgart (AGP Support) + Your_AGP_Chipset_Here + < > Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) + Graphics support ---> + < > Support for framebuffer devices + +Kernel Hacking ---> + [ ] Kernel debugging + *** NOTE for ati with udev ***