From 9933b96cc2db395780370219b805feef69c0774f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 5 Oct 2015 23:40:07 +0000 Subject: nvidia-340xx & nvidia-340xx-utils: update to 340.93 --- abs/core/nvidia-340xx-utils/PKGBUILD | 9 +++-- abs/core/nvidia-340xx/PKGBUILD | 52 +++++++++++++++++-------- abs/core/nvidia-340xx/nvidia-340xx-dkms.install | 30 ++++++++++++++ abs/core/nvidia-340xx/nvidia-340xx.install | 6 +-- 4 files changed, 73 insertions(+), 24 deletions(-) create mode 100644 abs/core/nvidia-340xx/nvidia-340xx-dkms.install diff --git a/abs/core/nvidia-340xx-utils/PKGBUILD b/abs/core/nvidia-340xx-utils/PKGBUILD index 5edb627..d9213a3 100644 --- a/abs/core/nvidia-340xx-utils/PKGBUILD +++ b/abs/core/nvidia-340xx-utils/PKGBUILD @@ -2,18 +2,19 @@ # Maintainer: Sven-Hendrik Haase # Maintainer: Thomas Baechler # Contributor: James Rayner + pkgbase=nvidia-340xx-utils pkgname=('nvidia-340xx-utils' 'nvidia-340xx-libgl' 'opencl-nvidia-340xx') -pkgver=340.76 -pkgrel=2 +pkgver=340.93 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" license=('custom') options=('!strip') source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -sha1sums=('1335af174324f5c752388110e65c3c51beea729b' - '2df59750d9fdeed613e84379108fb2bec67afd14') +sha1sums=('650564caa2937c8306cfdcfb6c97b1e206fdffb3' + '05ef4b8b01aa532d89cef309f268ae1c7beffdc0') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" diff --git a/abs/core/nvidia-340xx/PKGBUILD b/abs/core/nvidia-340xx/PKGBUILD index d20c718..d03db5c 100644 --- a/abs/core/nvidia-340xx/PKGBUILD +++ b/abs/core/nvidia-340xx/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $ -# Maintainer : Thomas Baechler +# $Id$ +# Maintainer: Felix Yan +# Contributor: Thomas Baechler -pkgname=nvidia-340xx -pkgver=340.76 +pkgbase=nvidia-340xx +pkgname=(nvidia-340xx nvidia-340xx-dkms) +pkgver=340.93 _extramodules=extramodules-3.18-ARCH -pkgrel=6 -pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" +pkgrel=3 arch=('i686' 'x86_64') url="http://www.nvidia.com/" -depends=('linux>=3.18' 'linux<3.19' "nvidia-340xx-libgl" "nvidia-340xx-utils=${pkgver}") -makedepends=('linux-headers>=3.18' 'linux-headers<3.19') +makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=3.18' 'linux-headers<3.19') conflicts=('nvidia') license=('custom') -install=${pkgname}.install options=(!strip) -source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" - "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" - nv-drm.patch) -md5sums=('8064c0a0998c3e7ee3c98ac1832b8194' - '440df290e213280d6e20d4d4be6f8b4c' - '79671a27131da619a33eb02ed0c2c031') +source=(nv-drm.patch) +source_i686+=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") +source_x86_64+=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +md5sums=('79671a27131da619a33eb02ed0c2c031') +md5sums_i686=('4a7edf6838a80c77a57fb6f6ec7f0437') +md5sums_x86_64=('cb80e3f1cb6f2fb6e6eab35fad0884e4') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -40,7 +39,12 @@ build() { make SYSSRC=/usr/lib/modules/"${_kernver}/build" module } -package() { +package_nvidia-340xx() { + pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" + depends=('linux>=3.18' 'linux<3.19' 'libgl' "nvidia-340xx-utils=${pkgver}") + conflict+=('nvidia-340xx-dkms') + install=nvidia-340xx.install + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \ @@ -49,3 +53,19 @@ package() { install -d -m755 "${pkgdir}/usr/lib/modprobe.d" echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" } + +package_nvidia-340xx-dkms() { + pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch" + depends=('dkms' "nvidia-340xx-utils=$pkgver") + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflicts+=('nvidia-340xx') + install=nvidia-340xx-dkms.install + + cd ${_pkg} + make -C kernel clean + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel "${pkgdir}"/usr/src/nvidia-${pkgver} + echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf + cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf +} diff --git a/abs/core/nvidia-340xx/nvidia-340xx-dkms.install b/abs/core/nvidia-340xx/nvidia-340xx-dkms.install new file mode 100644 index 0000000..3d9b74d --- /dev/null +++ b/abs/core/nvidia-340xx/nvidia-340xx-dkms.install @@ -0,0 +1,30 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + dkms add nvidia/${1%-*} + cat << EOF +==> To build and install your modules run: dkms install nvidia/${1%-*} +==> To do this automatically at startup run: systemctl enable dkms.service +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/abs/core/nvidia-340xx/nvidia-340xx.install b/abs/core/nvidia-340xx/nvidia-340xx.install index a83edad..6d90420 100644 --- a/abs/core/nvidia-340xx/nvidia-340xx.install +++ b/abs/core/nvidia-340xx/nvidia-340xx.install @@ -5,11 +5,9 @@ post_install() { } post_upgrade() { - EXTRAMODULES='extramodules-3.18-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + post_install } post_remove() { - EXTRAMODULES='extramodules-3.18-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + post_install } -- cgit v0.12