From 12ed2e7ae7d26199031734c766c76c34d4b05e7c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Apr 2016 21:30:17 +0000 Subject: nvidia & nvidia-utils: update to 364.16 --- abs/core/nvidia-utils/PKGBUILD | 22 +++++++++++++++------- abs/core/nvidia/PKGBUILD | 27 +++++++++++++++++---------- abs/core/nvidia/nvidia-dkms.install | 30 ------------------------------ 3 files changed, 32 insertions(+), 47 deletions(-) delete mode 100644 abs/core/nvidia/nvidia-dkms.install diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD index 3fe0805..db332fc 100644 --- a/abs/core/nvidia-utils/PKGBUILD +++ b/abs/core/nvidia-utils/PKGBUILD @@ -5,19 +5,24 @@ pkgbase=nvidia-utils pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia') -pkgver=361.28 -pkgrel=5 +pkgver=364.16 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.nvidia.com/" license=('custom') options=('!strip') -source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") -source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums_i686=('d4fc7fcf1204a46f15733d7cc2711ad2') -md5sums_x86_64=('8799b9a29ea1ef72feb739f1d8290728') +# source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") +# source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +# Change this back to the above when this driver goes into the main FTP. I know this is non-reproducible but +# we'll keep this one in testing anyway. +source_i686=("NVIDIA-Linux-x86-${pkgver}.run::https://developer.nvidia.com/linux32bit") +source_x86_64=("NVIDIA-Linux-x86_64-${pkgver}.run::https://developer.nvidia.com/linux64bit") +md5sums_i686=('c25de6f7e328c6eab5305be0cd0b02d5') +md5sums_x86_64=('5d954bfb0be8532779a4ca1741851493') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" -[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}" +# [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" create_links() { # create soname links @@ -116,6 +121,9 @@ package_nvidia-utils() { install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}" install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}" + # Vulkan ICD + install -D -m644 "nvidia_icd.json" "${pkgdir}/usr/share/vulkan/icd.d/nvidia_icd.json" + # VDPAU install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}" diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index 43cc280..c5f65b7 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -5,22 +5,26 @@ pkgbase=nvidia pkgname=(nvidia nvidia-dkms) -pkgver=361.28 +pkgver=364.16 _extramodules=extramodules-4.4-ARCH -pkgrel=2 +pkgrel=3 pkgdesc="NVIDIA drivers for linux" arch=('i686' 'x86_64') url="http://www.nvidia.com/" -makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.4' 'linux-headers<4.5') +makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.4' 'linux-headers<4.6') license=('custom') options=('!strip') -source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") -source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums_i686=('d4fc7fcf1204a46f15733d7cc2711ad2') -md5sums_x86_64=('8799b9a29ea1ef72feb739f1d8290728') +# See nvidia-utils +# source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") +# source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}.run") +source_i686=("NVIDIA-Linux-x86-${pkgver}.run::https://developer.nvidia.com/linux32bit") +source_x86_64=("NVIDIA-Linux-x86_64-${pkgver}.run::https://developer.nvidia.com/linux64bit") +md5sums_i686=('c25de6f7e328c6eab5305be0cd0b02d5') +md5sums_x86_64=('5d954bfb0be8532779a4ca1741851493') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" -[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}" +# [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" prepare() { sh "${_pkg}.run" --extract-only @@ -37,7 +41,9 @@ DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\ BUILT_MODULE_NAME[1]="nvidia-uvm"\ DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\ BUILT_MODULE_NAME[2]="nvidia-modeset"\ -DEST_MODULE_LOCATION[2]="/kernel/drivers/video"' dkms.conf +DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[3]="nvidia-drm"\ +DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf } build() { @@ -55,6 +61,8 @@ package_nvidia() { "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" \ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko" + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-drm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-drm.ko" if [[ "$CARCH" = "x86_64" ]]; then install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \ @@ -73,7 +81,6 @@ package_nvidia-dkms() { optdepends=('linux-headers: Build the module for Arch kernel' 'linux-lts-headers: Build the module for LTS Arch kernel') conflicts+=('nvidia') - install=nvidia-dkms.install cd ${_pkg} install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} diff --git a/abs/core/nvidia/nvidia-dkms.install b/abs/core/nvidia/nvidia-dkms.install deleted file mode 100644 index f43e9a0..0000000 --- a/abs/core/nvidia/nvidia-dkms.install +++ /dev/null @@ -1,30 +0,0 @@ -#/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: \ No newline at end of file -- cgit v0.12