Commit bda24132 authored by philm's avatar philm

update proprietary drivers

parent 297e73d3
--- cat11.1/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-01-17 15:59:26.000000000 +0100
+++ cat11.1/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-02-01 18:39:08.902218444 +0100
@@ -848,7 +848,12 @@
* happen much less frequent then without this workaround.
*/
if (state == PM_EVENT_SUSPEND)
- acquire_console_sem();
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ console_lock();
+#else
+ acquire_console_sem();
+#endif
if (firegl_cail_powerdown(privdev, state))
ret = -EIO;
@@ -870,8 +875,13 @@
}
if (state == PM_EVENT_SUSPEND)
- release_console_sem();
-
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ console_unlock();
+#else
+ release_console_sem();
+#endif
+
KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, ret, NULL);
return ret;
@@ -894,7 +904,12 @@
if (PMSG_EVENT(pdev->dev.power.power_state) == 0) return 0;
if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
- acquire_console_sem();
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ console_lock();
+#else
+ acquire_console_sem();
+#endif
#ifdef FIREGL_USWC_SUPPORT
// Restore the PAT after resuming from S3 or S4.
@@ -919,7 +934,12 @@
firegl_cail_powerup(privdev);
if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
- release_console_sem();
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ console_unlock();
+#else
+ release_console_sem();
+#endif
PMSG_EVENT(pdev->dev.power.power_state) = 0;
KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, 0, NULL);
diff -uNr cat11.3/common/lib/modules/fglrx/build_mod/drmP.h build_mod2/drmP.h
--- cat11.3/common/lib/modules/fglrx/build_mod/drmP.h 2011-03-24 17:00:28.000000000 +0100
+++ cat11.3/common/lib/modules/fglrx/build_mod2/drmP.h 2011-03-30 04:23:15.000000000 +0200
@@ -57,7 +57,6 @@
#include <linux/pci.h>
#include <linux/version.h>
#include <linux/sched.h>
-#include <linux/smp_lock.h> /* For (un)lock_kernel */
#include <linux/mm.h>
#include <linux/pagemap.h>
#if defined(__alpha__) || defined(__powerpc__)
diff -uNr cat11.3/common/lib/modules/fglrx/build_mod/firegl_public.c build_mod2/firegl_public.c
--- cat11.3/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-03-24 17:00:28.000000000 +0100
+++ cat11.3/common/lib/modules/fglrx/build_mod2/firegl_public.c 2011-03-30 04:32:59.773179890 +0200
@@ -114,7 +114,6 @@
#include <linux/pci.h>
#include <linux/wait.h>
#include <linux/miscdevice.h>
-#include <linux/smp_lock.h>
// newer SuSE kernels need this
#include <linux/highmem.h>
@@ -1042,9 +1041,6 @@
dev->pubdev.signature = FGL_DEVICE_SIGNATURE;
- for (i = 0; i < __KE_MAX_SPINLOCKS; i++)
- dev->spinlock[i] = SPIN_LOCK_UNLOCKED;
-
for (i=0; i < __KE_MAX_SEMAPHORES; i++)
sema_init(&dev->struct_sem[i], 1);
......@@ -4,17 +4,18 @@
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# use ../fakeuname -r 2.6.35-CHAKRA-LTS ../makepkg
_kernver=`uname -r`
# use ../makepkg -d
_kernver="2.6.35-CHAKRA-LTS"
pkgname=catalyst-lts
pkgver=11.3
pkgver=11.4
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-lts>=2.6.35' 'kernel26-lts<2.6.36' "catalyst-utils=${pkgver}")
depends=('kernel26>=2.6.29' 'kernel26<2.6.36' "catalyst-utils=${pkgver}")
makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'kernel26-headers')
conflicts=('catalyst-test' 'nvidia' 'xf86-video-ati' 'xf86-video-radeonhd' 'ati-dri')
install=catalyst.install
......@@ -22,14 +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
2.6.38_console.patch
no_bkl.patch)
no_bkl.patch
2.6.39_bkl.patch)
md5sums=('22d00ea687851f2be410f0776946f679'
md5sums=('b50dc05ef3428a9ee632b09eebeb4586'
'660396540b0ceaff71d6155c986734de'
'3e1b82bd69774ea808da69c983d6a43b'
'dde819cfc936032f98aa04a5d404b3ad'
'6a6b2133aa6ef3bcd377731b19c0553a')
'6a6b2133aa6ef3bcd377731b19c0553a'
'eb24250f8e537273bae9dbd79a022d61')
......@@ -62,14 +63,14 @@ build() {
## works only in combination with ati_make.sh script
patch -Np1 -i ../makefile_compat.patch || return 1
## 2.6.38 patch made for 2.6.38rc3
patch -Np1 -i ../2.6.38_console.patch || return 1
## patch used when kernel's # CONFIG_BKL is not set
if [ `cat /lib/modules/${_kernver}/build/.config | grep -c CONFIG_BKL=y` = 0 ]; then
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
......@@ -97,4 +98,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
}
......@@ -3,8 +3,6 @@ KERNEL_VERSION=2.6.35-CHAKRA-LTS
whisperer(){
echo "----------------------------------------------------------------"
echo "Don't forget to add fglrx into MODULES array of /etc/rc.conf"
echo "----------------------------------------------------------------"
echo "For more info and more troubleshooting visit:"
echo "http://wiki.archlinux.org/index.php/ATI_Catalyst"
......@@ -25,9 +23,9 @@ whisperer(){
remove_hook(){
##removing hook's entries
# remove hook fglrx
sed '/^HOOKS/s/ *fglrx//' -i /etc/mkinitcpio.conf
sed '/^HOOKS/s/ *fglrx//' -i etc/mkinitcpio.conf
# remove heads
sed '/^SyncFirst/s/ *kernel26-headers//' -i /etc/pacman.conf
sed '/^SyncFirst/s/ *kernel26-headers//' -i etc/pacman.conf
}
post_install() {
......
......@@ -5,13 +5,13 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=catalyst-utils
pkgver=11.3
pkgver=11.4
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.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')
......@@ -25,7 +25,7 @@ source=(
amdcccle.desktop
atieventsd.sh)
md5sums=('22d00ea687851f2be410f0776946f679'
md5sums=('b50dc05ef3428a9ee632b09eebeb4586'
'bdafe749e046bfddee2d1c5e90eabd83'
'4efa8414a8fe9eeb50da38b5522ef81d'
'f729bf913613f49b0b9759c246058a87')
......@@ -47,8 +47,10 @@ package() {
install -m755 -d "${pkgdir}/usr/lib/xorg/modules/dri"
install -m755 -d "${pkgdir}/usr/lib/xorg/modules/drivers"
install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx" # since 11.4
install -m755 -d "${pkgdir}/usr/lib/xorg/modules/linux"
install -m755 -d "${pkgdir}/usr/lib/dri"
install -m755 -d "${pkgdir}/usr/lib/fglrx" # since 11.4
install -m755 -d "${pkgdir}/usr/bin"
install -m755 -d "${pkgdir}/usr/sbin"
......@@ -74,7 +76,11 @@ package() {
install -m755 *.so "${pkgdir}/usr/lib/xorg/modules/" || return 1
install -m755 drivers/*.so "${pkgdir}/usr/lib/xorg/modules/drivers/" || return 1
install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/" || return 1
install -m755 extensions/libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/" || return 1
#install -m755 extensions/libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/" || return 1 #before 11.4
install -m755 extensions/libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so" || return 1 # since 11.4
ln -sf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/libglx.so" # since 11.4
ln -sf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx-libglx.so" # since 11.4
ln -sf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" # since 11.4
#install -m755 extensions/libdri.so "${pkgdir}/usr/lib/xorg/modules/extensions/libdri.ati" || return 1
# Controlcenter / libraries
......@@ -88,7 +94,17 @@ package() {
install -m755 X11R6/bin/* "${pkgdir}/usr/bin/" || return 1
install -m755 sbin/* "${pkgdir}/usr/sbin/" || return 1
install -m755 X11R6/${_lib}/*.so* "${pkgdir}/usr/lib/" || return 1
#install -m755 X11R6/${_lib}/*.so* "${pkgdir}/usr/lib/" || return #before 11.4
install -m755 X11R6/${_lib}/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/fglrx" || return 1 # since 11.4
ln -sf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/fglrx/libGL.so.1.2" # since 11.4
ln -sf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/fglrx-libGL.so.1.2" # since 11.4
ln -sf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1.2" # since 11.4
ln -sf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1" # since 11.4
ln -sf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so" # since 11.4
install -m755 X11R6/${_lib}/libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/" || return 1 # since 11.4
install -m755 X11R6/${_lib}/libatiadlxx.so "${pkgdir}/usr/lib/" || return 1 # since 11.4
install -m755 X11R6/${_lib}/libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/" || return 1 # since 11.4
install -m755 X11R6/${_lib}/libXvBAW.so.1.0 "${pkgdir}/usr/lib/" || return 1 # since 11.4
install -m644 X11R6/${_lib}/*.a "${pkgdir}/usr/lib/" || return 1 # really needed?
install -m644 X11R6/${_lib}/*.cap "${pkgdir}/usr/lib/" || return 1
install -m755 X11R6/${_lib}/modules/dri/*.so "${pkgdir}/usr/lib/xorg/modules/dri/" || return 1
......@@ -103,9 +119,9 @@ package() {
ln -sf libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so"
#ln -sf libfglrx_pp.so.1.0 "${pkgdir}/usr/lib/libfglrx_pp.so.1"
#ln -sf libfglrx_tvout.so.1.0 "${pkgdir}/usr/lib/libfglrx_tvout.so.1"
ln -sf libfglrx_gamma.so.1.0 "${pkgdir}/usr/lib/libfglrx_gamma.so.1"
ln -sf libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1"
ln -sf libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so"
#ln -sf libfglrx_gamma.so.1.0 "${pkgdir}/usr/lib/libfglrx_gamma.so.1"
#ln -sf libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1" #before 11.4
#ln -sf libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so" #before 11.4
ln -sf libatiuki.so.1.0 "${pkgdir}/usr/lib/libatiuki.so.1"
ln -sf libatiuki.so.1.0 "${pkgdir}/usr/lib/libatiuki.so"
......@@ -140,4 +156,4 @@ package() {
# License
install -m644 "${srcdir}/archive_files/ATI_LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
}
\ No newline at end of file
}
......@@ -13,8 +13,7 @@ whisperer(){
echo "packages"
echo "----------------------------------------------------------------"
echo "You can use the tool 'aticonfig' to generate an xorg.conf file."
echo "Remember to add fglrx to the MODULES list in /etc/rc.conf."
echo "--------------- ^^^^^ ------ ^^^^^^^ ---------------------------"
echo "--------------------- ^^^^^^^^^ --------------------------------"
echo "Add nomodeset to your kernel line in /boot/grub/menu.lst , ie.:"
echo "kernel /boot/vmlinuz26 root=/dev/sda1 ro nomodeset"
echo "----------------------------------------------------------------"
......@@ -28,8 +27,8 @@ whisperer(){
}
check_libdri_so(){
if [ ! -e /usr/lib/xorg/modules/extensions/libdri.so ]; then
ln -sf /usr/lib/xorg/modules/extensions/libdri.xorg /usr/lib/xorg/modules/extensions/libdri.so
if [ ! -e usr/lib/xorg/modules/extensions/libdri.so ]; then
ln -sf usr/lib/xorg/modules/extensions/libdri.xorg usr/lib/xorg/modules/extensions/libdri.so
fi
}
......
--- cat11.1/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-01-17 15:59:26.000000000 +0100
+++ cat11.1/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-02-01 18:39:08.902218444 +0100
@@ -848,7 +848,12 @@
* happen much less frequent then without this workaround.
*/
if (state == PM_EVENT_SUSPEND)
- acquire_console_sem();
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ console_lock();
+#else
+ acquire_console_sem();
+#endif
if (firegl_cail_powerdown(privdev, state))
ret = -EIO;
@@ -870,8 +875,13 @@
}
if (state == PM_EVENT_SUSPEND)
- release_console_sem();
-
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ console_unlock();
+#else
+ release_console_sem();
+#endif
+
KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, ret, NULL);
return ret;
@@ -894,7 +904,12 @@
if (PMSG_EVENT(pdev->dev.power.power_state) == 0) return 0;
if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
- acquire_console_sem();
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ console_lock();
+#else
+ acquire_console_sem();
+#endif
#ifdef FIREGL_USWC_SUPPORT
// Restore the PAT after resuming from S3 or S4.
@@ -919,7 +934,12 @@
firegl_cail_powerup(privdev);
if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
- release_console_sem();
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+ console_unlock();
+#else
+ release_console_sem();
+#endif
PMSG_EVENT(pdev->dev.power.power_state) = 0;
KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, 0, NULL);
diff -uNr cat11.3/common/lib/modules/fglrx/build_mod/drmP.h build_mod2/drmP.h
--- cat11.3/common/lib/modules/fglrx/build_mod/drmP.h 2011-03-24 17:00:28.000000000 +0100
+++ cat11.3/common/lib/modules/fglrx/build_mod2/drmP.h 2011-03-30 04:23:15.000000000 +0200
@@ -57,7 +57,6 @@
#include <linux/pci.h>
#include <linux/version.h>
#include <linux/sched.h>
-#include <linux/smp_lock.h> /* For (un)lock_kernel */
#include <linux/mm.h>
#include <linux/pagemap.h>
#if defined(__alpha__) || defined(__powerpc__)
diff -uNr cat11.3/common/lib/modules/fglrx/build_mod/firegl_public.c build_mod2/firegl_public.c
--- cat11.3/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-03-24 17:00:28.000000000 +0100
+++ cat11.3/common/lib/modules/fglrx/build_mod2/firegl_public.c 2011-03-30 04:32:59.773179890 +0200
@@ -114,7 +114,6 @@
#include <linux/pci.h>
#include <linux/wait.h>
#include <linux/miscdevice.h>
-#include <linux/smp_lock.h>
// newer SuSE kernels need this
#include <linux/highmem.h>
@@ -1042,9 +1041,6 @@
dev->pubdev.signature = FGL_DEVICE_SIGNATURE;
- for (i = 0; i < __KE_MAX_SPINLOCKS; i++)
- dev->spinlock[i] = SPIN_LOCK_UNLOCKED;
-
for (i=0; i < __KE_MAX_SEMAPHORES; i++)
sema_init(&dev->struct_sem[i], 1);
......@@ -4,17 +4,18 @@
# 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=11.3
pkgver=11.4
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.38' 'kernel26<2.6.39' "catalyst-utils=${pkgver}")
depends=('kernel26>=2.6.29' 'kernel26<2.6.40' "catalyst-utils=${pkgver}")
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
......@@ -22,14 +23,14 @@ install=${pkgname}.install
source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run
ati_make.sh
makefile_compat.patch
2.6.38_console.patch
no_bkl.patch)
no_bkl.patch
2.6.39_bkl.patch)
md5sums=('22d00ea687851f2be410f0776946f679'
md5sums=('b50dc05ef3428a9ee632b09eebeb4586'
'660396540b0ceaff71d6155c986734de'
'3e1b82bd69774ea808da69c983d6a43b'
'dde819cfc936032f98aa04a5d404b3ad'
'6a6b2133aa6ef3bcd377731b19c0553a')
'6a6b2133aa6ef3bcd377731b19c0553a'
'eb24250f8e537273bae9dbd79a022d61')
......@@ -62,14 +63,14 @@ build() {
## works only in combination with ati_make.sh script
patch -Np1 -i ../makefile_compat.patch || return 1
## 2.6.38 patch made for 2.6.38rc3
patch -Np1 -i ../2.6.38_console.patch || return 1
## patch used when kernel's # CONFIG_BKL is not set
if [ `cat /lib/modules/${_kernver}/build/.config | grep -c CONFIG_BKL=y` = 0 ]; then
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
......@@ -97,4 +98,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
}
......@@ -3,8 +3,6 @@ KERNEL_VERSION=2.6.38-CHAKRA
whisperer(){
echo "----------------------------------------------------------------"
echo "Don't forget to add fglrx into MODULES array of /etc/rc.conf"
echo "----------------------------------------------------------------"
echo "For more info and more troubleshooting visit:"
echo "http://wiki.archlinux.org/index.php/ATI_Catalyst"
......@@ -25,9 +23,9 @@ whisperer(){
remove_hook(){
##removing hook's entries
# remove hook fglrx
sed '/^HOOKS/s/ *fglrx//' -i /etc/mkinitcpio.conf
sed '/^HOOKS/s/ *fglrx//' -i etc/mkinitcpio.conf
# remove heads
sed '/^SyncFirst/s/ *kernel26-headers//' -i /etc/pacman.conf
sed '/^SyncFirst/s/ *kernel26-headers//' -i etc/pacman.conf
}
post_install() {
......
......@@ -4,28 +4,25 @@
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
# use ../makepkg -d
_kernver="2.6.35-CHAKRA-LTS"
pkgname=nvidia-173xx-lts
pkgver=173.14.28
pkgver=173.14.30
pkgrel=1
pkgdesc="NVIDIA drivers for kernel26, 173xx branch."
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86
[ "$CARCH" = "x86_64" ] && ARCH=x86_64
url="http://www.nvidia.com/"
depends=('kernel26-lts>=2.6.35' 'kernel26-lts<2.6.36' 'nvidia-173xx-utils')
makedepends=('kernel26-lts-headers>=2.6.35' 'kernel26-lts-headers<2.6.36')
conflicts=('nvidia-96xx-lts' 'nvidia-lts')
depends=('kernel26' 'nvidia-173xx-utils')
makedepends=('kernel26-headers')
conflicts=('nvidia-96xx' 'nvidia' 'nvidia-173xx')
license=('custom')
install=nvidia.install
source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run")
md5sums=('3b2085ffc2047e701a01b3163129f763')
[ "$CARCH" = "x86_64" ] && md5sums=('8f48430f2b759d4efbf022cb415ecc5d')
md5sums=('665f9f730c18ab24a997e0e14b863262')
[ "$CARCH" = "x86_64" ] && md5sums=('8c47463ae14a2f742d0fa00160456745')
build() {
cd $srcdir
......
......@@ -8,7 +8,7 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=nvidia-173xx-utils
pkgver=173.14.28
pkgver=173.14.30
pkgrel=1
pkgdesc="NVIDIA drivers utilities and libraries, 173xx branch."
arch=('i686' 'x86_64')
......@@ -23,8 +23,8 @@ license=('custom')
install=nvidia.install
options=(!strip)
source=("http://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run")
md5sums=('3b2085ffc2047e701a01b3163129f763')
[ "$CARCH" = "x86_64" ] && md5sums=('8f48430f2b759d4efbf022cb415ecc5d')
md5sums=('665f9f730c18ab24a997e0e14b863262')
[ "$CARCH" = "x86_64" ] && md5sums=('8c47463ae14a2f742d0fa00160456745')
source[1]='20-nvidia.conf'
md5sums[1]='37e417b2c69e46de1346a653e07027fa'
......
......@@ -8,8 +8,8 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=nvidia-173xx
pkgver=173.14.28
pkgrel=4
pkgver=173.14.30
pkgrel=1
# Find the kernel name inside the chroot
_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgdesc="NVIDIA drivers for kernel26, 173xx branch."
......@@ -23,8 +23,8 @@ conflicts=('nvidia-96xx' 'nvidia' 'nvidia-173xx')
license=('custom')
install=nvidia.install
source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run")
md5sums=('3b2085ffc2047e701a01b3163129f763')
[ "$CARCH" = "x86_64" ] && md5sums=('8f48430f2b759d4efbf022cb415ecc5d')
md5sums=('665f9f730c18ab24a997e0e14b863262')
[ "$CARCH" = "x86_64" ] && md5sums=('8c47463ae14a2f742d0fa00160456745')
build() {
cd $srcdir
......
......@@ -8,7 +8,7 @@
_kernver="2.6.35-CHAKRA-LTS"
pkgname=nvidia-lts
pkgver=270.30
pkgver=270.41.06
pkgrel=1
pkgdesc="NVIDIA drivers for kernel26."
arch=('i686' 'x86_64')
......@@ -20,15 +20,15 @@ license=('custom')
install=nvidia.install
if [ "$CARCH" = "i686" ]; then
ARCH='x86'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}"
source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('ff319212b9ac52d645df31027c31ee45')
ARCH='x86'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}"
source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('702868c77b13bba46f0fce26ed7a1fb7')
elif [ "$CARCH" = "x86_64" ]; then
ARCH='x86_64'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32"
source=("http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('780ba735bda572fc10a3515a15c49404')
ARCH='x86_64'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32"
source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('d62243b91d0dc8f2c4b2ab646b72ca65')
fi
build() {
......
......@@ -5,7 +5,7 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=nvidia-utils
pkgver=260.19.44
pkgver=270.41.06
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=('c99b0710a43db3aafb4f27408194e910')
md5sums=('702868c77b13bba46f0fce26ed7a1fb7')
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=('3dfce350616ad70d626b531a15c8604f')
md5sums=('d62243b91d0dc8f2c4b2ab646b72ca65')
fi
source[1]='20-nvidia.conf'
......
......@@ -8,8 +8,8 @@
_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgname=nvidia
pkgver=260.19.44
pkgrel=2
pkgver=270.41.06
pkgrel=1
pkgdesc="NVIDIA drivers for kernel26."
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
......@@ -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=('c99b0710a43db3aafb4f27408194e910')
md5sums=('702868c77b13bba46f0fce26ed7a1fb7')
elif [ "$CARCH" = "x86_64" ]; then