Date: Monday, March 19, 2012 @ 07:14:51 Author: tpowa Revision: 153749
archrelease: copy trunk to testing-i686, testing-x86_64 Added: nvidia/repos/testing-i686/ nvidia/repos/testing-i686/PKGBUILD (from rev 153748, nvidia/trunk/PKGBUILD) nvidia/repos/testing-i686/nvidia.install (from rev 153748, nvidia/trunk/nvidia.install) nvidia/repos/testing-x86_64/ nvidia/repos/testing-x86_64/PKGBUILD (from rev 153748, nvidia/trunk/PKGBUILD) nvidia/repos/testing-x86_64/nvidia.install (from rev 153748, nvidia/trunk/nvidia.install) -------------------------------+ testing-i686/PKGBUILD | 50 ++++++++++++++++++++++++++++++++++++++++ testing-i686/nvidia.install | 15 ++++++++++++ testing-x86_64/PKGBUILD | 50 ++++++++++++++++++++++++++++++++++++++++ testing-x86_64/nvidia.install | 15 ++++++++++++ 4 files changed, 130 insertions(+) Copied: nvidia/repos/testing-i686/PKGBUILD (from rev 153748, nvidia/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2012-03-19 11:14:51 UTC (rev 153749) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer : Thomas Baechler <tho...@archlinux.org> + +pkgname=nvidia +pkgver=295.20 +_extramodules=extramodules-3.3-ARCH +_kernver="$(cat /lib/modules/${_extramodules}/version)" +pkgrel=4 +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') +conflicts=('nvidia-96xx' 'nvidia-173xx') +license=('custom') +install=nvidia.install +options=(!strip) + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('a6f702271da49930a17e28b5928fe75a') +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') +fi + +build() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only + cd "${_pkg}/kernel" + # fix for 3.3 kernel + sed 's/CFLAGS="$CFLAGS -I$SOURCES\/arch\/x86\/include"/CFLAGS="$CFLAGS \ + -I$SOURCES\/arch\/x86\/include \ + -I$SOURCES\/arch\/x86\/include\/generated"/' -i conftest.sh + make SYSSRC=/lib/modules/"${_kernver}/build" module +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${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" +} Copied: nvidia/repos/testing-i686/nvidia.install (from rev 153748, nvidia/trunk/nvidia.install) =================================================================== --- testing-i686/nvidia.install (rev 0) +++ testing-i686/nvidia.install 2012-03-19 11:14:51 UTC (rev 153749) @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-3.3-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.3-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.3-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 153748, nvidia/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2012-03-19 11:14:51 UTC (rev 153749) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer : Thomas Baechler <tho...@archlinux.org> + +pkgname=nvidia +pkgver=295.20 +_extramodules=extramodules-3.3-ARCH +_kernver="$(cat /lib/modules/${_extramodules}/version)" +pkgrel=4 +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') +conflicts=('nvidia-96xx' 'nvidia-173xx') +license=('custom') +install=nvidia.install +options=(!strip) + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('a6f702271da49930a17e28b5928fe75a') +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') +fi + +build() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only + cd "${_pkg}/kernel" + # fix for 3.3 kernel + sed 's/CFLAGS="$CFLAGS -I$SOURCES\/arch\/x86\/include"/CFLAGS="$CFLAGS \ + -I$SOURCES\/arch\/x86\/include \ + -I$SOURCES\/arch\/x86\/include\/generated"/' -i conftest.sh + make SYSSRC=/lib/modules/"${_kernver}/build" module +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${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" +} Copied: nvidia/repos/testing-x86_64/nvidia.install (from rev 153748, nvidia/trunk/nvidia.install) =================================================================== --- testing-x86_64/nvidia.install (rev 0) +++ testing-x86_64/nvidia.install 2012-03-19 11:14:51 UTC (rev 153749) @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-3.3-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.3-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.3-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +}