Date: Wednesday, June 8, 2016 @ 07:42:03 Author: tpowa Revision: 269103
db-move: moved nvidia from [testing] to [extra] (i686, x86_64) Added: nvidia/repos/extra-i686/PKGBUILD (from rev 269102, nvidia/repos/testing-i686/PKGBUILD) nvidia/repos/extra-i686/linux-4.6.patch (from rev 269102, nvidia/repos/testing-i686/linux-4.6.patch) nvidia/repos/extra-i686/nvidia.install (from rev 269102, nvidia/repos/testing-i686/nvidia.install) nvidia/repos/extra-x86_64/PKGBUILD (from rev 269102, nvidia/repos/testing-x86_64/PKGBUILD) nvidia/repos/extra-x86_64/linux-4.6.patch (from rev 269102, nvidia/repos/testing-x86_64/linux-4.6.patch) nvidia/repos/extra-x86_64/nvidia.install (from rev 269102, nvidia/repos/testing-x86_64/nvidia.install) Deleted: nvidia/repos/extra-i686/PKGBUILD nvidia/repos/extra-i686/nvidia.install nvidia/repos/extra-x86_64/PKGBUILD nvidia/repos/extra-x86_64/nvidia.install nvidia/repos/testing-i686/ nvidia/repos/testing-x86_64/ ------------------------------+ /PKGBUILD | 176 +++++++++++++++++++++++++++++++++++++++++ /nvidia.install | 26 ++++++ extra-i686/PKGBUILD | 85 ------------------- extra-i686/linux-4.6.patch | 50 +++++++++++ extra-i686/nvidia.install | 13 --- extra-x86_64/PKGBUILD | 85 ------------------- extra-x86_64/linux-4.6.patch | 50 +++++++++++ extra-x86_64/nvidia.install | 13 --- 8 files changed, 302 insertions(+), 196 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-06-08 05:42:00 UTC (rev 269102) +++ extra-i686/PKGBUILD 2016-06-08 05:42:03 UTC (rev 269103) @@ -1,85 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Thomas Baechler <tho...@archlinux.org> - -pkgbase=nvidia -pkgname=(nvidia nvidia-dkms) -pkgver=364.19 -_extramodules=extramodules-4.5-ARCH -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.5' '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=('8a4015213c4a8f1c80e9520d04a32a7b') -md5sums_x86_64=('ad7a0b1855b3913390fb75b4cc3a26dc') - -[[ "$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 - - cp -a kernel kernel-dkms - cd kernel-dkms - sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf - sed -i 's/__JOBS/`nproc`/' dkms.conf - sed -i 's/__DKMS_MODULES//' dkms.conf - sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\ -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"\ -BUILT_MODULE_NAME[3]="nvidia-drm"\ -DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf -} - -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${_pkg}"/kernel - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module -} - -package_nvidia() { - pkgdesc="NVIDIA drivers for linux" - depends=('linux>=4.5' 'linux<4.6' "nvidia-utils=${pkgver}" 'libgl') - install=nvidia.install - - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ - "${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" \ - "${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" -} - -package_nvidia-dkms() { - pkgdesc="NVIDIA driver sources for linux" - depends=('dkms' "nvidia-utils=$pkgver" 'libgl') - optdepends=('linux-headers: Build the module for Arch kernel' - 'linux-lts-headers: Build the module for LTS Arch kernel') - conflicts+=('nvidia') - - cd ${_pkg} - install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} - cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" - echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" -} Copied: nvidia/repos/extra-i686/PKGBUILD (from rev 269102, nvidia/repos/testing-i686/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-06-08 05:42:03 UTC (rev 269103) @@ -0,0 +1,88 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia +pkgname=(nvidia nvidia-dkms) +pkgver=364.19 +_extramodules=extramodules-4.6-ARCH +pkgrel=5 +pkgdesc="NVIDIA drivers for linux" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.6' 'linux-headers<4.7') +license=('custom') +options=('!strip') +source=('linux-4.6.patch') +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=('3064bd437b26adac246f301f54f2814c') +md5sums_i686=('8a4015213c4a8f1c80e9520d04a32a7b') +md5sums_x86_64=('ad7a0b1855b3913390fb75b4cc3a26dc') + +[[ "$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 + patch -p1 --no-backup-if-mismatch -i ../linux-4.6.patch + + cp -a kernel kernel-dkms + cd kernel-dkms + sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf + sed -i 's/__JOBS/`nproc`/' dkms.conf + sed -i 's/__DKMS_MODULES//' dkms.conf + sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\ +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"\ +BUILT_MODULE_NAME[3]="nvidia-drm"\ +DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package_nvidia() { + pkgdesc="NVIDIA drivers for linux" + depends=('linux>=4.6' 'linux<4.7' "nvidia-utils=${pkgver}" 'libgl') + install=nvidia.install + + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${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" \ + "${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" +} + +package_nvidia-dkms() { + pkgdesc="NVIDIA driver sources for linux" + depends=('dkms' "nvidia-utils=$pkgver" 'libgl') + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflicts+=('nvidia') + + cd ${_pkg} + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" + echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} Copied: nvidia/repos/extra-i686/linux-4.6.patch (from rev 269102, nvidia/repos/testing-i686/linux-4.6.patch) =================================================================== --- extra-i686/linux-4.6.patch (rev 0) +++ extra-i686/linux-4.6.patch 2016-06-08 05:42:03 UTC (rev 269103) @@ -0,0 +1,50 @@ +--- a/kernel/nvidia-drm/nvidia-drm-fb.c ++++ b/kernel/nvidia-drm/nvidia-drm-fb.c +@@ -77,7 +77,7 @@ + static struct drm_framebuffer *internal_framebuffer_create + ( + struct drm_device *dev, +- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd, ++ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd, + uint64_t nvkms_params_ptr, + uint64_t nvkms_params_size + ) +@@ -199,7 +199,7 @@ + struct drm_framebuffer *nvidia_drm_framebuffer_create + ( + struct drm_device *dev, +- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd ++ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd + ) + { + return internal_framebuffer_create(dev, file, cmd, 0, 0); +--- a/kernel/nvidia-drm/nvidia-drm-fb.h ++++ b/kernel/nvidia-drm/nvidia-drm-fb.h +@@ -45,7 +45,7 @@ + struct drm_framebuffer *nvidia_drm_framebuffer_create + ( + struct drm_device *dev, +- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd ++ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd + ); + + int nvidia_drm_add_nvkms_fb( +--- a/kernel/nvidia-drm/nvidia-drm-linux.c ++++ b/kernel/nvidia-drm/nvidia-drm-linux.c +@@ -31,6 +31,7 @@ + + #if defined(NV_DRM_AVAILABLE) + ++#include "nv-mm.h" + #include "nv-pgprot.h" + + MODULE_PARM_DESC( +@@ -121,8 +122,7 @@ + + down_read(&mm->mmap_sem); + +- pages_pinned = get_user_pages(current, mm, +- address, pages_count, write, force, ++ pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force, + user_pages, NULL); + up_read(&mm->mmap_sem); \ No newline at end of file Deleted: extra-i686/nvidia.install =================================================================== --- extra-i686/nvidia.install 2016-06-08 05:42:00 UTC (rev 269102) +++ extra-i686/nvidia.install 2016-06-08 05:42:03 UTC (rev 269103) @@ -1,13 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-4.5-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/extra-i686/nvidia.install (from rev 269102, nvidia/repos/testing-i686/nvidia.install) =================================================================== --- extra-i686/nvidia.install (rev 0) +++ extra-i686/nvidia.install 2016-06-08 05:42:03 UTC (rev 269103) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.6-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 +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-06-08 05:42:00 UTC (rev 269102) +++ extra-x86_64/PKGBUILD 2016-06-08 05:42:03 UTC (rev 269103) @@ -1,85 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Thomas Baechler <tho...@archlinux.org> - -pkgbase=nvidia -pkgname=(nvidia nvidia-dkms) -pkgver=364.19 -_extramodules=extramodules-4.5-ARCH -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.5' '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=('8a4015213c4a8f1c80e9520d04a32a7b') -md5sums_x86_64=('ad7a0b1855b3913390fb75b4cc3a26dc') - -[[ "$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 - - cp -a kernel kernel-dkms - cd kernel-dkms - sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf - sed -i 's/__JOBS/`nproc`/' dkms.conf - sed -i 's/__DKMS_MODULES//' dkms.conf - sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\ -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"\ -BUILT_MODULE_NAME[3]="nvidia-drm"\ -DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf -} - -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${_pkg}"/kernel - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module -} - -package_nvidia() { - pkgdesc="NVIDIA drivers for linux" - depends=('linux>=4.5' 'linux<4.6' "nvidia-utils=${pkgver}" 'libgl') - install=nvidia.install - - install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ - "${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" \ - "${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" -} - -package_nvidia-dkms() { - pkgdesc="NVIDIA driver sources for linux" - depends=('dkms' "nvidia-utils=$pkgver" 'libgl') - optdepends=('linux-headers: Build the module for Arch kernel' - 'linux-lts-headers: Build the module for LTS Arch kernel') - conflicts+=('nvidia') - - cd ${_pkg} - install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} - cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" - echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" -} Copied: nvidia/repos/extra-x86_64/PKGBUILD (from rev 269102, nvidia/repos/testing-x86_64/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-06-08 05:42:03 UTC (rev 269103) @@ -0,0 +1,88 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia +pkgname=(nvidia nvidia-dkms) +pkgver=364.19 +_extramodules=extramodules-4.6-ARCH +pkgrel=5 +pkgdesc="NVIDIA drivers for linux" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.6' 'linux-headers<4.7') +license=('custom') +options=('!strip') +source=('linux-4.6.patch') +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=('3064bd437b26adac246f301f54f2814c') +md5sums_i686=('8a4015213c4a8f1c80e9520d04a32a7b') +md5sums_x86_64=('ad7a0b1855b3913390fb75b4cc3a26dc') + +[[ "$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 + patch -p1 --no-backup-if-mismatch -i ../linux-4.6.patch + + cp -a kernel kernel-dkms + cd kernel-dkms + sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf + sed -i 's/__JOBS/`nproc`/' dkms.conf + sed -i 's/__DKMS_MODULES//' dkms.conf + sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\ +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"\ +BUILT_MODULE_NAME[3]="nvidia-drm"\ +DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package_nvidia() { + pkgdesc="NVIDIA drivers for linux" + depends=('linux>=4.6' 'linux<4.7' "nvidia-utils=${pkgver}" 'libgl') + install=nvidia.install + + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${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" \ + "${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" +} + +package_nvidia-dkms() { + pkgdesc="NVIDIA driver sources for linux" + depends=('dkms' "nvidia-utils=$pkgver" 'libgl') + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflicts+=('nvidia') + + cd ${_pkg} + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" + echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} Copied: nvidia/repos/extra-x86_64/linux-4.6.patch (from rev 269102, nvidia/repos/testing-x86_64/linux-4.6.patch) =================================================================== --- extra-x86_64/linux-4.6.patch (rev 0) +++ extra-x86_64/linux-4.6.patch 2016-06-08 05:42:03 UTC (rev 269103) @@ -0,0 +1,50 @@ +--- a/kernel/nvidia-drm/nvidia-drm-fb.c ++++ b/kernel/nvidia-drm/nvidia-drm-fb.c +@@ -77,7 +77,7 @@ + static struct drm_framebuffer *internal_framebuffer_create + ( + struct drm_device *dev, +- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd, ++ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd, + uint64_t nvkms_params_ptr, + uint64_t nvkms_params_size + ) +@@ -199,7 +199,7 @@ + struct drm_framebuffer *nvidia_drm_framebuffer_create + ( + struct drm_device *dev, +- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd ++ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd + ) + { + return internal_framebuffer_create(dev, file, cmd, 0, 0); +--- a/kernel/nvidia-drm/nvidia-drm-fb.h ++++ b/kernel/nvidia-drm/nvidia-drm-fb.h +@@ -45,7 +45,7 @@ + struct drm_framebuffer *nvidia_drm_framebuffer_create + ( + struct drm_device *dev, +- struct drm_file *file, struct drm_mode_fb_cmd2 *cmd ++ struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd + ); + + int nvidia_drm_add_nvkms_fb( +--- a/kernel/nvidia-drm/nvidia-drm-linux.c ++++ b/kernel/nvidia-drm/nvidia-drm-linux.c +@@ -31,6 +31,7 @@ + + #if defined(NV_DRM_AVAILABLE) + ++#include "nv-mm.h" + #include "nv-pgprot.h" + + MODULE_PARM_DESC( +@@ -121,8 +122,7 @@ + + down_read(&mm->mmap_sem); + +- pages_pinned = get_user_pages(current, mm, +- address, pages_count, write, force, ++ pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force, + user_pages, NULL); + up_read(&mm->mmap_sem); \ No newline at end of file Deleted: extra-x86_64/nvidia.install =================================================================== --- extra-x86_64/nvidia.install 2016-06-08 05:42:00 UTC (rev 269102) +++ extra-x86_64/nvidia.install 2016-06-08 05:42:03 UTC (rev 269103) @@ -1,13 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-4.5-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/extra-x86_64/nvidia.install (from rev 269102, nvidia/repos/testing-x86_64/nvidia.install) =================================================================== --- extra-x86_64/nvidia.install (rev 0) +++ extra-x86_64/nvidia.install 2016-06-08 05:42:03 UTC (rev 269103) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.6-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 +}