[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, February 27, 2019 @ 21:33:45
  Author: heftig
Revision: 346916

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 346915, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 346915, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 346915, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-27 21:33:45 UTC (rev 346916)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=65
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 346915, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2019-02-27 21:33:45 UTC (rev 346916)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, February 23, 2019 @ 17:29:45
  Author: heftig
Revision: 346734

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 346733, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 346733, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 346733, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-23 17:29:45 UTC (rev 346734)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=64
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 346733, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2019-02-23 17:29:45 UTC (rev 346734)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Friday, February 22, 2019 @ 15:51:11
  Author: heftig
Revision: 346663

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 346662, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 346662, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 346662, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-22 15:51:11 UTC (rev 346663)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=63
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 346662, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2019-02-22 15:51:11 UTC (rev 346663)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, February 20, 2019 @ 23:12:13
  Author: heftig
Revision: 346602

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 346600, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 346600, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 346600, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-20 23:12:13 UTC (rev 346602)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=62
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 346600, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2019-02-20 23:12:13 UTC (rev 346602)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Friday, February 15, 2019 @ 21:08:20
  Author: heftig
Revision: 346335

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 346334, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 346334, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 346334, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-15 21:08:20 UTC (rev 346335)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=61
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 346334, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2019-02-15 21:08:20 UTC (rev 346335)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, February 13, 2019 @ 05:56:31
  Author: heftig
Revision: 346206

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 346205, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 346205, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 346205, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-13 05:56:31 UTC (rev 346206)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=60
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 346205, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2019-02-13 05:56:31 UTC (rev 346206)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, February 7, 2019 @ 07:59:46
  Author: heftig
Revision: 345351

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 345350, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 345350, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 345350, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-07 07:59:46 UTC (rev 345351)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=59
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 345350, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2019-02-07 07:59:46 UTC (rev 345351)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, January 31, 2019 @ 12:04:36
  Author: heftig
Revision: 344956

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 344955, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 344955, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 344955, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-01-31 12:04:36 UTC (rev 344956)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=58
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 344955, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2019-01-31 12:04:36 UTC (rev 344956)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, January 26, 2019 @ 15:39:58
  Author: heftig
Revision: 344820

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 344819, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 344819, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 344819, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-01-26 15:39:58 UTC (rev 344820)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=57
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 344819, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2019-01-26 15:39:58 UTC (rev 344820)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, January 23, 2019 @ 08:56:08
  Author: heftig
Revision: 344609

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 344608, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 344608, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 344608, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-01-23 08:56:08 UTC (rev 344609)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=56
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 344608, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2019-01-23 08:56:08 UTC (rev 344609)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, January 17, 2019 @ 01:15:15
  Author: heftig
Revision: 344322

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 344321, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 344321, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 344321, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-01-17 01:15:15 UTC (rev 344322)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=55
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 344321, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2019-01-17 01:15:15 UTC (rev 344322)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Sunday, January 13, 2019 @ 21:44:26
  Author: heftig
Revision: 344035

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 344034, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 344034, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 344034, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-01-13 21:44:26 UTC (rev 344035)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=54
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 344034, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2019-01-13 21:44:26 UTC (rev 344035)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, January 10, 2019 @ 05:48:05
  Author: heftig
Revision: 343218

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 343217, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 343217, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 343217, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-01-10 05:48:05 UTC (rev 343218)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=53
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 343217, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2019-01-10 05:48:05 UTC (rev 343218)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Monday, December 24, 2018 @ 04:23:14
  Author: heftig
Revision: 342700

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 342699, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 342699, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 342699, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-24 04:23:14 UTC (rev 342700)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=52
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 342699, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-12-24 04:23:14 UTC (rev 342700)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, December 22, 2018 @ 05:32:25
  Author: heftig
Revision: 342658

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 342656, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 342656, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 342656, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-22 05:32:25 UTC (rev 342658)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=51
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 342656, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-12-22 05:32:25 UTC (rev 342658)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, December 20, 2018 @ 05:36:57
  Author: heftig
Revision: 342581

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 342579, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 342579, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 342579, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-20 05:36:57 UTC (rev 342581)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=50
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 342579, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-12-20 05:36:57 UTC (rev 342581)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Tuesday, December 18, 2018 @ 01:58:21
  Author: heftig
Revision: 342490

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 342489, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 342489, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 342489, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-18 01:58:21 UTC (rev 342490)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=49
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 342489, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-12-18 01:58:21 UTC (rev 342490)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Friday, December 14, 2018 @ 10:02:49
  Author: heftig
Revision: 342328

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 342326, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 342327, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 342326, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-14 10:02:49 UTC (rev 342328)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=48
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 342327, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-12-14 10:02:49 UTC (rev 342328)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, December 8, 2018 @ 16:43:09
  Author: heftig
Revision: 341280

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 341279, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 341279, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 341279, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-08 16:43:09 UTC (rev 341280)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=47
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 341279, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-12-08 16:43:09 UTC (rev 341280)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, December 5, 2018 @ 23:52:41
  Author: heftig
Revision: 341090

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 341088, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 341088, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 341088, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-05 23:52:41 UTC (rev 341090)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=46
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 341088, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-12-05 23:52:41 UTC (rev 341090)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, December 1, 2018 @ 21:20:53
  Author: heftig
Revision: 340937

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 340936, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 340936, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 340936, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-01 21:20:53 UTC (rev 340937)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=45
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 340936, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-12-01 21:20:53 UTC (rev 340937)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Tuesday, November 27, 2018 @ 22:54:27
  Author: heftig
Revision: 340518

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 340517, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 340517, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 340517, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-11-27 22:54:27 UTC (rev 340518)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=44
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 340517, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-11-27 22:54:27 UTC (rev 340518)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Friday, November 23, 2018 @ 15:08:46
  Author: heftig
Revision: 340340

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 340339, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 340339, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 340339, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-11-23 15:08:46 UTC (rev 340340)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=43
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 340339, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-11-23 15:08:46 UTC (rev 340340)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, November 22, 2018 @ 08:51:26
  Author: heftig
Revision: 340227

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 340226, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 340226, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 340226, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-11-22 08:51:26 UTC (rev 340227)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=41
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 340226, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-11-22 08:51:26 UTC (rev 340227)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, November 14, 2018 @ 05:04:51
  Author: heftig
Revision: 339667

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 339666, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 339666, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 339666, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-11-14 05:04:51 UTC (rev 339667)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=40
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 339666, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-11-14 05:04:51 UTC (rev 339667)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Sunday, November 4, 2018 @ 18:23:27
  Author: heftig
Revision: 337846

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 337845, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 337845, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 337845, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-11-04 18:23:27 UTC (rev 337846)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=39
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 337845, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-11-04 18:23:27 UTC (rev 337846)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Friday, October 26, 2018 @ 19:27:07
  Author: heftig
Revision: 337340

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 337339, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 337339, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 337339, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-26 19:27:07 UTC (rev 337340)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=38
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 337339, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-10-26 19:27:07 UTC (rev 337340)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, October 20, 2018 @ 23:23:06
  Author: heftig
Revision: 336931

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 336930, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 336930, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 336930, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-20 23:23:06 UTC (rev 336931)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=37
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 336930, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-10-20 23:23:06 UTC (rev 336931)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, October 18, 2018 @ 22:04:39
  Author: heftig
Revision: 336853

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 336852, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 336852, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 336852, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-18 22:04:39 UTC (rev 336853)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=36
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 336852, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-10-18 22:04:39 UTC (rev 336853)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, October 13, 2018 @ 20:22:10
  Author: heftig
Revision: 336537

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 336536, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 336536, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 336536, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-13 20:22:10 UTC (rev 336537)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=35
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 336536, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-10-13 20:22:10 UTC (rev 336537)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Friday, October 12, 2018 @ 07:12:39
  Author: heftig
Revision: 336412

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 336411, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 336411, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 336411, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-12 07:12:39 UTC (rev 336412)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=34
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 336411, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-10-12 07:12:39 UTC (rev 336412)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, October 4, 2018 @ 02:50:33
  Author: heftig
Revision: 335751

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 335750, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 335750, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 335750, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-04 02:50:33 UTC (rev 335751)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=33
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 335750, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-10-04 02:50:33 UTC (rev 335751)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, September 29, 2018 @ 22:52:46
  Author: heftig
Revision: 335572

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 335571, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 335571, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 335571, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-09-29 22:52:46 UTC (rev 335572)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=32
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 335571, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-09-29 22:52:46 UTC (rev 335572)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, September 26, 2018 @ 12:57:59
  Author: heftig
Revision: 335428

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 335427, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 335427, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 335427, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-09-26 12:57:59 UTC (rev 335428)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=31
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 335427, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-09-26 12:57:59 UTC (rev 335428)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, September 19, 2018 @ 23:00:48
  Author: heftig
Revision: 335041

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 335040, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 335040, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 335040, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-09-19 23:00:48 UTC (rev 335041)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=30
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 335040, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-09-19 23:00:48 UTC (rev 335041)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Sunday, September 16, 2018 @ 00:27:53
  Author: heftig
Revision: 334657

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 334656, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 334656, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 334656, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-09-16 00:27:53 UTC (rev 334657)
@@ -0,0 +1,72 @@
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=29
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 334656, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-09-16 00:27:53 UTC (rev 334657)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Sunday, September 9, 2018 @ 13:07:04
  Author: heftig
Revision: 334284

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 334283, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 334283, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 334283, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-09-09 13:07:04 UTC (rev 334284)
@@ -0,0 +1,73 @@
+# $Id: PKGBUILD 332975 2018-08-24 16:31:20Z heftig $
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=28
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 334283, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-09-09 13:07:04 UTC (rev 334284)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, September 5, 2018 @ 16:00:51
  Author: heftig
Revision: 333460

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 333459, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 333459, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 333459, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-09-05 16:00:51 UTC (rev 333460)
@@ -0,0 +1,73 @@
+# $Id: PKGBUILD 332975 2018-08-24 16:31:20Z heftig $
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=27
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 333459, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-09-05 16:00:51 UTC (rev 333460)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Friday, August 24, 2018 @ 16:40:20
  Author: heftig
Revision: 332978

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 332977, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 332977, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 332977, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-24 16:40:20 UTC (rev 332978)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=26
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 332977, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-08-24 16:40:20 UTC (rev 332978)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, August 22, 2018 @ 12:26:04
  Author: heftig
Revision: 332805

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 332804, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 332804, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 332804, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-22 12:26:04 UTC (rev 332805)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=25
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 332804, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-08-22 12:26:04 UTC (rev 332805)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+   

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, August 18, 2018 @ 12:52:46
  Author: heftig
Revision: 332263

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 332262, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 332262, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 332262, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-18 12:52:46 UTC (rev 332263)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=24
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 332262, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-08-18 12:52:46 UTC (rev 332263)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, August 18, 2018 @ 08:32:29
  Author: heftig
Revision: 332226

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 332225, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 332225, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 332225, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-18 08:32:29 UTC (rev 332226)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=23
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 332225, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-08-18 08:32:29 UTC (rev 332226)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, August 16, 2018 @ 10:26:32
  Author: heftig
Revision: 331581

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 331580, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 331580, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 331580, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-16 10:26:32 UTC (rev 331581)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=22
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 331580, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-08-16 10:26:32 UTC (rev 331581)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Monday, August 13, 2018 @ 14:16:43
  Author: heftig
Revision: 331455

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 331454, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 331454, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 331454, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-13 14:16:43 UTC (rev 331455)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=21
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 331454, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-08-13 14:16:43 UTC (rev 331455)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, August 9, 2018 @ 15:44:24
  Author: heftig
Revision: 331300

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 331299, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 331299, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 331299, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-09 15:44:24 UTC (rev 331300)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=20
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 331299, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-08-09 15:44:24 UTC (rev 331300)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Tuesday, August 7, 2018 @ 04:47:10
  Author: heftig
Revision: 331089

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 331088, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 331088, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 331088, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-07 04:47:10 UTC (rev 331089)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=19
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 331088, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-08-07 04:47:10 UTC (rev 331089)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Friday, August 3, 2018 @ 17:58:52
  Author: heftig
Revision: 330497

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 330496, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 330496, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 330496, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-03 17:58:52 UTC (rev 330497)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=18
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 330496, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-08-03 17:58:52 UTC (rev 330497)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+  

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, August 2, 2018 @ 05:31:26
  Author: heftig
Revision: 330449

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 330448, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 330448, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 330448, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-02 05:31:26 UTC (rev 330449)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-ARCH
+pkgrel=17
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 330448, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-08-02 05:31:26 UTC (rev 330449)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, August 1, 2018 @ 05:14:09
  Author: heftig
Revision: 329896

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 329895, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 329895, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 329895, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-01 05:14:09 UTC (rev 329896)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-4.17
+pkgrel=16
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 329895, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-08-01 05:14:09 UTC (rev 329896)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Sunday, July 29, 2018 @ 12:34:42
  Author: heftig
Revision: 329654

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 329653, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 329653, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 329653, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-07-29 12:34:42 UTC (rev 329654)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-4.17-arch
+pkgrel=15
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 329653, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-07-29 12:34:42 UTC (rev 329654)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, July 25, 2018 @ 21:09:57
  Author: heftig
Revision: 329549

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 329548, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 329548, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 329548, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-07-25 21:09:57 UTC (rev 329549)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-4.17-ARCH
+pkgrel=14
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 329548, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-07-25 21:09:57 UTC (rev 329549)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Monday, July 23, 2018 @ 00:37:38
  Author: heftig
Revision: 329373

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 329372, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 329372, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 329372, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-07-23 00:37:38 UTC (rev 329373)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-4.17-ARCH
+pkgrel=13
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 329372, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-07-23 00:37:38 UTC (rev 329373)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, July 18, 2018 @ 17:49:21
  Author: heftig
Revision: 328992

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 328991, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 328991, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 328991, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-07-18 17:49:21 UTC (rev 328992)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-4.17-ARCH
+pkgrel=12
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 328991, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-07-18 17:49:21 UTC (rev 328992)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Tuesday, July 17, 2018 @ 19:32:55
  Author: heftig
Revision: 328908

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 328907, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 328907, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 328907, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-07-17 19:32:55 UTC (rev 328908)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-4.17-ARCH
+pkgrel=11
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 328907, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-07-17 19:32:55 UTC (rev 328908)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, July 11, 2018 @ 22:17:25
  Author: heftig
Revision: 328288

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 328287, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 328287, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 328287, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-07-11 22:17:25 UTC (rev 328288)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-4.17-ARCH
+pkgrel=10
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 328287, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-07-11 22:17:25 UTC (rev 328288)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Sunday, July 8, 2018 @ 21:47:20
  Author: heftig
Revision: 328125

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 328124, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 328124, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 328124, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-07-08 21:47:20 UTC (rev 328125)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-4.17-ARCH
+pkgrel=9
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 328124, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-07-08 21:47:20 UTC (rev 328125)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Tuesday, July 3, 2018 @ 22:43:16
  Author: heftig
Revision: 327957

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 327956, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 327956, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 327956, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-07-03 22:43:16 UTC (rev 327957)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-4.17-ARCH
+pkgrel=8
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 327956, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-07-03 22:43:16 UTC (rev 327957)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Tuesday, June 26, 2018 @ 18:28:26
  Author: heftig
Revision: 327634

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 327633, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 327633, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 327633, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-06-26 18:28:26 UTC (rev 327634)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-4.17-ARCH
+pkgrel=7
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia-340xx=$pkgver")
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 327633, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-06-26 18:28:26 UTC (rev 327634)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, June 16, 2018 @ 15:17:54
  Author: heftig
Revision: 327055

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 327054, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 327054, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 327054, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-06-16 15:17:54 UTC (rev 327055)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-4.17-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17.1' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17.1' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 
'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 327054, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-06-16 15:17:54 UTC (rev 327055)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Tuesday, June 12, 2018 @ 22:56:36
  Author: heftig
Revision: 326869

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 326868, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 326868, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   72 
 kernel-4.11.patch |   38 +++
 2 files changed, 110 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 326868, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-06-12 22:56:36 UTC (rev 326869)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Giancarlo Razzolini 
+# Contributor: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.107
+_extramodules=extramodules-4.17-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('0de6f182d67bd322df7ae04e74c0cde6973c55bfea47a8f2503a29f8a899cd1b801ae4b52d066628df4a4f9c84e5e7547465bdc37d1b87df47af43fdab23466f'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 326868, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-06-12 22:56:36 UTC (rev 326869)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Tuesday, June 5, 2018 @ 20:37:41
  Author: heftig
Revision: 325951

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 325950, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 325950, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 325950, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-06-05 20:37:41 UTC (rev 325951)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.17-ARCH
+pkgrel=41
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.17' 
'linux-headers<4.18')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.17' 'linux<4.18' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 325950, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-06-05 20:37:41 UTC (rev 325951)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return VM_FAULT_SIGBUS;

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Sunday, June 3, 2018 @ 06:10:47
  Author: heftig
Revision: 325574

archrelease: copy trunk to testing-x86_64

Added:
  nvidia-340xx/repos/testing-x86_64/
  nvidia-340xx/repos/testing-x86_64/PKGBUILD
(from rev 325573, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-x86_64/kernel-4.11.patch
(from rev 325573, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/testing-x86_64/PKGBUILD (from rev 325573, 
nvidia-340xx/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-06-03 06:10:47 UTC (rev 325574)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=40
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/testing-x86_64/kernel-4.11.patch (from rev 325573, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- testing-x86_64/kernel-4.11.patch(rev 0)
+++ testing-x86_64/kernel-4.11.patch2018-06-03 06:10:47 UTC (rev 325574)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return VM_FAULT_SIGBUS;

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Friday, June 1, 2018 @ 01:36:42
  Author: heftig
Revision: 325471

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 325470, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 325470, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 325470, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-06-01 01:36:42 UTC (rev 325471)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=39
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 325470, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-06-01 01:36:42 UTC (rev 325471)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return VM_FAULT_SIGBUS;

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, May 26, 2018 @ 12:47:14
  Author: heftig
Revision: 325018

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 325017, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 325017, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 325017, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-05-26 12:47:14 UTC (rev 325018)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=38
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 325017, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-05-26 12:47:14 UTC (rev 325018)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Tuesday, May 22, 2018 @ 23:10:41
  Author: heftig
Revision: 324890

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 324889, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 324889, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 324889, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-05-22 23:10:41 UTC (rev 324890)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=37
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 324889, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-05-22 23:10:41 UTC (rev 324890)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Monday, May 21, 2018 @ 10:44:33
  Author: heftig
Revision: 324681

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 324680, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 324680, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 324680, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-05-21 10:44:33 UTC (rev 324681)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=36
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 324680, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-05-21 10:44:33 UTC (rev 324681)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, May 17, 2018 @ 07:33:35
  Author: heftig
Revision: 324428

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 324427, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 324427, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 324427, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-05-17 07:33:35 UTC (rev 324428)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=35
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 324427, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-05-17 07:33:35 UTC (rev 324428)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, May 9, 2018 @ 15:40:21
  Author: heftig
Revision: 323637

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 323636, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 323636, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 323636, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-05-09 15:40:21 UTC (rev 323637)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=34
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 323636, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-05-09 15:40:21 UTC (rev 323637)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, May 2, 2018 @ 22:47:39
  Author: heftig
Revision: 323325

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 323324, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 323324, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 323324, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-05-02 22:47:39 UTC (rev 323325)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=33
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 323324, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-05-02 22:47:39 UTC (rev 323325)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Monday, April 30, 2018 @ 13:55:23
  Author: heftig
Revision: 323186

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 323185, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 323185, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 323185, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-04-30 13:55:23 UTC (rev 323186)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=32
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 323185, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-04-30 13:55:23 UTC (rev 323186)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, April 26, 2018 @ 18:17:11
  Author: heftig
Revision: 323054

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 323053, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 323053, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 323053, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-04-26 18:17:11 UTC (rev 323054)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=31
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 323053, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-04-26 18:17:11 UTC (rev 323054)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+   

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, April 25, 2018 @ 04:16:39
  Author: heftig
Revision: 322974

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 322973, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 322973, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 322973, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-04-25 04:16:39 UTC (rev 322974)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=30
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 322973, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-04-25 04:16:39 UTC (rev 322974)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+  

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, April 19, 2018 @ 11:43:22
  Author: heftig
Revision: 30

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 322219, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 322219, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 322219, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-04-19 11:43:22 UTC (rev 30)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=29
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 322219, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-04-19 11:43:22 UTC (rev 30)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+   

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Tuesday, April 17, 2018 @ 21:05:28
  Author: heftig
Revision: 321940

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 321939, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 321939, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 321939, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-04-17 21:05:28 UTC (rev 321940)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=28
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 321939, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-04-17 21:05:28 UTC (rev 321940)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, April 12, 2018 @ 15:49:05
  Author: heftig
Revision: 321639

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 321638, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 321638, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 321638, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-04-12 15:49:05 UTC (rev 321639)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=27
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 321638, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-04-12 15:49:05 UTC (rev 321639)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+   

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, April 11, 2018 @ 21:08:41
  Author: heftig
Revision: 321601

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 321600, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 321600, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 321600, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-04-11 21:08:41 UTC (rev 321601)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=26
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 321600, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-04-11 21:08:41 UTC (rev 321601)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+  

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Tuesday, April 3, 2018 @ 01:48:01
  Author: heftig
Revision: 320877

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 320876, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 320876, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 320876, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-04-03 01:48:01 UTC (rev 320877)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.16-ARCH
+pkgrel=24
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.16' 
'linux-headers<4.17')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.16' 'linux<4.17' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 320876, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-04-03 01:48:01 UTC (rev 320877)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Sunday, April 1, 2018 @ 03:02:06
  Author: heftig
Revision: 320807

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 320806, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 320806, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 320806, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-04-01 03:02:06 UTC (rev 320807)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=23
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 320806, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-04-01 03:02:06 UTC (rev 320807)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, March 29, 2018 @ 05:28:29
  Author: heftig
Revision: 320587

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 320586, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 320586, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 320586, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-03-29 05:28:29 UTC (rev 320587)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=22
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 320586, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-03-29 05:28:29 UTC (rev 320587)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+   

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Sunday, March 25, 2018 @ 22:45:06
  Author: heftig
Revision: 320331

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 320330, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 320330, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 320330, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-03-25 22:45:06 UTC (rev 320331)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=21
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 320330, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-03-25 22:45:06 UTC (rev 320331)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, March 21, 2018 @ 18:54:02
  Author: heftig
Revision: 319774

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 319773, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 319773, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 319773, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-03-21 18:54:02 UTC (rev 319774)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=20
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 319773, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-03-21 18:54:02 UTC (rev 319774)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+  

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Tuesday, March 20, 2018 @ 19:50:01
  Author: heftig
Revision: 319702

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 319701, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 319701, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 319701, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-03-20 19:50:01 UTC (rev 319702)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=19
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 319701, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-03-20 19:50:01 UTC (rev 319702)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, March 15, 2018 @ 15:31:18
  Author: heftig
Revision: 319311

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 319310, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 319310, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 319310, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-03-15 15:31:18 UTC (rev 319311)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=18
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 319310, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-03-15 15:31:18 UTC (rev 319311)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+   

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Sunday, March 11, 2018 @ 19:29:46
  Author: heftig
Revision: 318623

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 318622, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 318622, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 318622, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-03-11 19:29:46 UTC (rev 318623)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=17
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 318622, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-03-11 19:29:46 UTC (rev 318623)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, March 10, 2018 @ 12:55:56
  Author: heftig
Revision: 318501

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 318500, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 318500, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 318500, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-03-10 12:55:56 UTC (rev 318501)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=16
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 318500, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-03-10 12:55:56 UTC (rev 318501)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+   

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, February 28, 2018 @ 20:26:42
  Author: heftig
Revision: 317636

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 317635, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 317635, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 317635, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-02-28 20:26:42 UTC (rev 317636)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=15
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 317635, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-02-28 20:26:42 UTC (rev 317636)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Sunday, February 25, 2018 @ 18:06:14
  Author: heftig
Revision: 317500

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 317499, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 317499, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 317499, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-02-25 18:06:14 UTC (rev 317500)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=14
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 317499, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-02-25 18:06:14 UTC (rev 317500)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+  

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, February 22, 2018 @ 23:36:54
  Author: heftig
Revision: 317413

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 317412, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 317412, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   77 
 kernel-4.11.patch |   38 +
 2 files changed, 115 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 317412, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-02-22 23:36:54 UTC (rev 317413)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=13
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" 
<> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" 
flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return VM_FAULT_SIGBUS;

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Saturday, February 17, 2018 @ 17:26:17
  Author: heftig
Revision: 317229

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 317228, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 317228, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   77 
 kernel-4.11.patch |   38 +
 2 files changed, 115 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 317228, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-02-17 17:26:17 UTC (rev 317229)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=12
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" 
<> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" 
flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return VM_FAULT_SIGBUS;

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, February 15, 2018 @ 01:55:51
  Author: heftig
Revision: 317083

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 317082, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 317082, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   77 
 kernel-4.11.patch |   38 +
 2 files changed, 115 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 317082, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-02-15 01:55:51 UTC (rev 317083)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=11
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" 
<> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" 
flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return VM_FAULT_SIGBUS;

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Bartłomiej Piotrowski via arch-commits]

Date: Monday, February 12, 2018 @ 23:41:39
  Author: bpiotrowski
Revision: 316745

archrelease: copy trunk to testing-x86_64

Added:
  nvidia-340xx/repos/testing-x86_64/
  nvidia-340xx/repos/testing-x86_64/PKGBUILD
(from rev 316744, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-x86_64/kernel-4.11.patch
(from rev 316744, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/testing-x86_64/PKGBUILD (from rev 316744, 
nvidia-340xx/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-02-12 23:41:39 UTC (rev 316745)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=10
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${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" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}

Copied: nvidia-340xx/repos/testing-x86_64/kernel-4.11.patch (from rev 316744, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- testing-x86_64/kernel-4.11.patch(rev 0)
+++ testing-x86_64/kernel-4.11.patch2018-02-12 23:41:39 UTC (rev 316745)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Thursday, February 8, 2018 @ 21:29:31
  Author: heftig
Revision: 316482

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 316481, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 316481, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 316481, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-02-08 21:29:31 UTC (rev 316482)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=9
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${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" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 316481, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-02-08 21:29:31 UTC (rev 316482)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, February 7, 2018 @ 23:42:28
  Author: heftig
Revision: 316175

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 316174, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 316174, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 316174, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-02-07 23:42:28 UTC (rev 316175)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=8
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${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" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 316174, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-02-07 23:42:28 UTC (rev 316175)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, February 7, 2018 @ 21:33:56
  Author: heftig
Revision: 316159

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 316158, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 316158, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 316158, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-02-07 21:33:56 UTC (rev 316159)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=7
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${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" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 316158, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-02-07 21:33:56 UTC (rev 316159)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Wednesday, February 7, 2018 @ 02:51:57
  Author: heftig
Revision: 316131

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 316130, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 316130, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 316130, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-02-07 02:51:57 UTC (rev 316131)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.15' 'linux<4.16' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${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" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 316130, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-02-07 02:51:57 UTC (rev 316131)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Giancarlo Razzolini via arch-commits]

Date: Monday, February 5, 2018 @ 11:51:46
  Author: grazzolini
Revision: 315893

archrelease: copy trunk to testing-x86_64

Added:
  nvidia-340xx/repos/testing-x86_64/
  nvidia-340xx/repos/testing-x86_64/PKGBUILD
(from rev 315892, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-x86_64/kernel-4.11.patch
(from rev 315892, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/testing-x86_64/PKGBUILD (from rev 315892, 
nvidia-340xx/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-02-05 11:51:46 UTC (rev 315893)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.15-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.15' 
'linux-headers<4.16')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.14' 'linux<4.15' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${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" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}

Copied: nvidia-340xx/repos/testing-x86_64/kernel-4.11.patch (from rev 315892, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- testing-x86_64/kernel-4.11.patch(rev 0)
+++ testing-x86_64/kernel-4.11.patch2018-02-05 11:51:46 UTC (rev 315893)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Tuesday, January 23, 2018 @ 23:05:11
  Author: heftig
Revision: 315342

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 315341, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 315341, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 315341, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-01-23 23:05:11 UTC (rev 315342)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.14-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.14' 
'linux-headers<4.15')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.14' 'linux<4.15' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${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" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 315341, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-01-23 23:05:11 UTC (rev 315342)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Jan Steffens via arch-commits]

Date: Friday, January 19, 2018 @ 21:01:25
  Author: heftig
Revision: 315166

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 315165, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 315165, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   71 
 kernel-4.11.patch |   38 +++
 2 files changed, 109 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 315165, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-01-19 21:01:25 UTC (rev 315166)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.14-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.14' 
'linux-headers<4.15')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.14' 'linux<4.15' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${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" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 315165, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-01-19 21:01:25 UTC (rev 315166)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else
++int _sigbus_fault(struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return 

[arch-commits] Commit in nvidia-340xx/repos (3 files)

[Sven-Hendrik Haase via arch-commits]

Date: Wednesday, January 17, 2018 @ 08:02:51
  Author: svenstaro
Revision: 314970

archrelease: copy trunk to staging-x86_64

Added:
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 314969, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch
(from rev 314969, nvidia-340xx/trunk/kernel-4.11.patch)

---+
 PKGBUILD  |   73 
 kernel-4.11.patch |   38 +++
 2 files changed, 111 insertions(+)

Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 314969, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-01-17 08:02:51 UTC (rev 314970)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.106
+_extramodules=extramodules-4.14-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.14' 
'linux-headers<4.15')
+conflicts=('nvidia')
+license=('custom')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run;
+'kernel-4.11.patch' 'kernel-4.14.patch')
+sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2'
+
'ccaa40e085d985ec4280003e36dd06e60958ed1408867379fd21a68a18d48aa4be311bf9ad1e804f7a7245c90be98e919d2ec30f45d290f1cdb19c866bdb8a8d')
+
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+# patches here
+
+patch -Np0 < "${srcdir}/kernel-4.11.patch"
+# patch -Np1 < "${srcdir}/kernel-4.14.patch"
+
+cp -a kernel kernel-dkms
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+cd uvm
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.14' 'linux<4.15' "nvidia-340xx-utils=${pkgver}" 'libgl')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${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" 'libgl')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+  install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+}

Copied: nvidia-340xx/repos/staging-x86_64/kernel-4.11.patch (from rev 314969, 
nvidia-340xx/trunk/kernel-4.11.patch)
===
--- staging-x86_64/kernel-4.11.patch(rev 0)
+++ staging-x86_64/kernel-4.11.patch2018-01-17 08:02:51 UTC (rev 314970)
@@ -0,0 +1,38 @@
+--- kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:50:46.334075042 +0200
 kernel/uvm/nvidia_uvm_lite.c   2017-09-27 13:56:06.358041280 +0200
+@@ -818,7 +818,11 @@
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#else 
++int _fault(struct vm_fault *vmf)  
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+ unsigned long vaddr = vmf->address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ retval = _fault_common(vma, vaddr, , vmf->flags);
++#else
++retval = _fault_common(NULL, vaddr, , vmf->flags);
++#endif
+ 
+ vmf->page = page;
+ 
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if