Date: Friday, March 23, 2012 @ 04:04:24 Author: ibiru Revision: 154095
update to 295.33 Modified: nvidia/trunk/PKGBUILD nvidia/trunk/nvidia.install ----------------+ PKGBUILD | 20 +++++++------------- nvidia.install | 6 +++--- 2 files changed, 10 insertions(+), 16 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-03-23 08:02:19 UTC (rev 154094) +++ PKGBUILD 2012-03-23 08:04:24 UTC (rev 154095) @@ -2,15 +2,15 @@ # Maintainer : Thomas Baechler <tho...@archlinux.org> pkgname=nvidia -pkgver=295.20 -_extramodules=extramodules-3.3-ARCH +pkgver=295.33 +_extramodules=extramodules-3.2-ARCH _kernver="$(cat /lib/modules/${_extramodules}/version)" -pkgrel=5 +pkgrel=1 pkgdesc="NVIDIA drivers for linux." arch=('i686' 'x86_64') url="http://www.nvidia.com/" -depends=('linux>=3.3' 'linux<3.4' "nvidia-utils=${pkgver}") -makedepends=('linux-headers>=3.3' 'linux-headers<3.4') +depends=('linux>=3.2' 'linux<3.3' "nvidia-utils=${pkgver}") +makedepends=('linux-headers>=3.2' 'linux-headers<3.3') conflicts=('nvidia-96xx' 'nvidia-173xx') license=('custom') install=nvidia.install @@ -20,23 +20,18 @@ _arch='x86' _pkg="NVIDIA-Linux-${_arch}-${pkgver}" source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('a6f702271da49930a17e28b5928fe75a') + md5sums=('1634fb3115526caeae5eb8227282bf17') 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=('79b05cffa482234833ae1c4bb40664c3') + md5sums=('04e814843bcaf23efa0b4b3df4ea2700') fi build() { cd "${srcdir}" sh "${_pkg}.run" --extract-only cd "${_pkg}/kernel" - # fix for 3.3 kernel - sed -i \ - -e '/CFLAGS="$CFLAGS/s:-I$SOURCES/arch/x86/include:& -I$OUTPUT/arch/x86/include/generated:' \ - conftest.sh - make SYSSRC=/lib/modules/"${_kernver}/build" module } @@ -45,7 +40,6 @@ "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko" install -d -m755 "${pkgdir}/lib/modprobe.d" echo "blacklist nouveau" >> "${pkgdir}/lib/modprobe.d/nvidia.conf" - echo "blacklist nvidiafb" >> "${pkgdir}/lib/modprobe.d/nvidia.conf" sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko" } Modified: nvidia.install =================================================================== --- nvidia.install 2012-03-23 08:02:19 UTC (rev 154094) +++ nvidia.install 2012-03-23 08:04:24 UTC (rev 154095) @@ -1,15 +1,15 @@ post_install() { - EXTRAMODULES='extramodules-3.3-ARCH' + EXTRAMODULES='extramodules-3.2-ARCH' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.3-ARCH' + EXTRAMODULES='extramodules-3.2-ARCH' depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.3-ARCH' + EXTRAMODULES='extramodules-3.2-ARCH' depmod $(cat /lib/modules/$EXTRAMODULES/version) }