Date: Wednesday, June 17, 2015 @ 16:53:31 Author: svenstaro Revision: 240978
archrelease: copy trunk to staging-i686, staging-x86_64 Added: nvidia/repos/staging-i686/ nvidia/repos/staging-i686/PKGBUILD (from rev 240977, nvidia/trunk/PKGBUILD) nvidia/repos/staging-i686/nv-drm-343.36.patch (from rev 240977, nvidia/trunk/nv-drm-343.36.patch) nvidia/repos/staging-i686/nvidia.install (from rev 240977, nvidia/trunk/nvidia.install) nvidia/repos/staging-x86_64/ nvidia/repos/staging-x86_64/PKGBUILD (from rev 240977, nvidia/trunk/PKGBUILD) nvidia/repos/staging-x86_64/nv-drm-343.36.patch (from rev 240977, nvidia/trunk/nv-drm-343.36.patch) nvidia/repos/staging-x86_64/nvidia.install (from rev 240977, nvidia/trunk/nvidia.install) ------------------------------------+ staging-i686/PKGBUILD | 55 +++++++++++++++++++++++++++++++++++ staging-i686/nv-drm-343.36.patch | 14 ++++++++ staging-i686/nvidia.install | 13 ++++++++ staging-x86_64/PKGBUILD | 55 +++++++++++++++++++++++++++++++++++ staging-x86_64/nv-drm-343.36.patch | 14 ++++++++ staging-x86_64/nvidia.install | 13 ++++++++ 6 files changed, 164 insertions(+) Copied: nvidia/repos/staging-i686/PKGBUILD (from rev 240977, nvidia/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2015-06-17 14:53:31 UTC (rev 240978) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Maintainer: Thomas Baechler <tho...@archlinux.org> + +pkgname=nvidia +pkgver=352.21 +_extramodules=extramodules-4.0-ARCH +pkgrel=1 +pkgdesc="NVIDIA drivers for linux" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=4.0' 'linux<4.1' "nvidia-utils=${pkgver}" 'libgl') +makedepends=('linux-headers>=4.0' 'linux-headers<4.1') +license=('custom') +install=nvidia.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") +md5sums=('c91760a04f658845722380f6c7fd4709' + '4eea308a1b04553f720f82fd2fac79d3') + +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" + +prepare() { + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + # patches here +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module + + if [[ "$CARCH" = "x86_64" ]]; then + cd uvm + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module + fi +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + + if [[ "$CARCH" = "x86_64" ]]; then + install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" + fi + + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} Copied: nvidia/repos/staging-i686/nv-drm-343.36.patch (from rev 240977, nvidia/trunk/nv-drm-343.36.patch) =================================================================== --- staging-i686/nv-drm-343.36.patch (rev 0) +++ staging-i686/nv-drm-343.36.patch 2015-06-17 14:53:31 UTC (rev 240978) @@ -0,0 +1,14 @@ +diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c +index c0b41a0..700c193 100644 +--- a/kernel/nv-drm.c ++++ b/kernel/nv-drm.c +@@ -128,6 +128,8 @@ static struct drm_driver nv_drm_driver = { + .gem_prime_vmap = nv_gem_prime_vmap, + .gem_prime_vunmap = nv_gem_prime_vunmap, + ++ .set_busid = drm_pci_set_busid, ++ + .name = "nvidia-drm", + .desc = "NVIDIA DRM driver", + .date = "20130102", + Copied: nvidia/repos/staging-i686/nvidia.install (from rev 240977, nvidia/trunk/nvidia.install) =================================================================== --- staging-i686/nvidia.install (rev 0) +++ staging-i686/nvidia.install 2015-06-17 14:53:31 UTC (rev 240978) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.0-ARCH' + depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 240977, nvidia/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2015-06-17 14:53:31 UTC (rev 240978) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Maintainer: Thomas Baechler <tho...@archlinux.org> + +pkgname=nvidia +pkgver=352.21 +_extramodules=extramodules-4.0-ARCH +pkgrel=1 +pkgdesc="NVIDIA drivers for linux" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=4.0' 'linux<4.1' "nvidia-utils=${pkgver}" 'libgl') +makedepends=('linux-headers>=4.0' 'linux-headers<4.1') +license=('custom') +install=nvidia.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") +md5sums=('c91760a04f658845722380f6c7fd4709' + '4eea308a1b04553f720f82fd2fac79d3') + +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" + +prepare() { + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + # patches here +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module + + if [[ "$CARCH" = "x86_64" ]]; then + cd uvm + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module + fi +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + + if [[ "$CARCH" = "x86_64" ]]; then + install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" + fi + + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} Copied: nvidia/repos/staging-x86_64/nv-drm-343.36.patch (from rev 240977, nvidia/trunk/nv-drm-343.36.patch) =================================================================== --- staging-x86_64/nv-drm-343.36.patch (rev 0) +++ staging-x86_64/nv-drm-343.36.patch 2015-06-17 14:53:31 UTC (rev 240978) @@ -0,0 +1,14 @@ +diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c +index c0b41a0..700c193 100644 +--- a/kernel/nv-drm.c ++++ b/kernel/nv-drm.c +@@ -128,6 +128,8 @@ static struct drm_driver nv_drm_driver = { + .gem_prime_vmap = nv_gem_prime_vmap, + .gem_prime_vunmap = nv_gem_prime_vunmap, + ++ .set_busid = drm_pci_set_busid, ++ + .name = "nvidia-drm", + .desc = "NVIDIA DRM driver", + .date = "20130102", + Copied: nvidia/repos/staging-x86_64/nvidia.install (from rev 240977, nvidia/trunk/nvidia.install) =================================================================== --- staging-x86_64/nvidia.install (rev 0) +++ staging-x86_64/nvidia.install 2015-06-17 14:53:31 UTC (rev 240978) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.0-ARCH' + depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}