subject:"\[arch\-commits\] Commit in nvidia\/repos \(3 files\)"

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

2019-11-06 Thread Jan Steffens via arch-commits

Date: Wednesday, November 6, 2019 @ 14:46:38
  Author: heftig
Revision: 366865

archrelease: copy trunk to testing-x86_64

Added:
  nvidia/repos/testing-x86_64/
  nvidia/repos/testing-x86_64/PKGBUILD
(from rev 366862, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-x86_64/fs62142.patch
(from rev 366863, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   84 
 fs62142.patch |   13 
 2 files changed, 97 insertions(+)

Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 366862, 
nvidia/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2019-11-06 14:46:38 UTC (rev 366865)
@@ -0,0 +1,84 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+pkgrel=16
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="https://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/src/linux module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+_extradir="/usr/lib/modules/$(dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-10-29 Thread Jan Steffens via arch-commits

Date: Tuesday, October 29, 2019 @ 15:52:30
  Author: heftig
Revision: 366011

archrelease: copy trunk to testing-x86_64

Added:
  nvidia/repos/testing-x86_64/
  nvidia/repos/testing-x86_64/PKGBUILD
(from rev 366005, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-x86_64/fs62142.patch
(from rev 366005, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   84 
 fs62142.patch |   13 
 2 files changed, 97 insertions(+)

Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 366005, 
nvidia/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2019-10-29 15:52:30 UTC (rev 366011)
@@ -0,0 +1,84 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+pkgrel=15
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="https://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/src/linux module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+_extradir="/usr/lib/modules/$(dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-10-25 Thread Jan Steffens via arch-commits

Date: Friday, October 25, 2019 @ 13:37:22
  Author: heftig
Revision: 365531

archrelease: copy trunk to testing-x86_64

Added:
  nvidia/repos/testing-x86_64/
  nvidia/repos/testing-x86_64/PKGBUILD
(from rev 365529, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-x86_64/fs62142.patch
(from rev 365529, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   84 
 fs62142.patch |   13 
 2 files changed, 97 insertions(+)

Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 365529, 
nvidia/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2019-10-25 13:37:22 UTC (rev 365531)
@@ -0,0 +1,84 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+pkgrel=14
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="https://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/src/linux module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+_extradir="/usr/lib/modules/$(dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-10-17 Thread Jan Steffens via arch-commits

Date: Friday, October 18, 2019 @ 01:04:16
  Author: heftig
Revision: 365121

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 365119, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 365119, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   84 
 fs62142.patch |   13 
 2 files changed, 97 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 365119, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-10-18 01:04:16 UTC (rev 365121)
@@ -0,0 +1,84 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+pkgrel=13
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="https://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/src/linux module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+_extradir="/usr/lib/modules/$(dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-10-11 Thread Jan Steffens via arch-commits

Date: Friday, October 11, 2019 @ 19:27:10
  Author: heftig
Revision: 364650

archrelease: copy trunk to testing-x86_64

Added:
  nvidia/repos/testing-x86_64/
  nvidia/repos/testing-x86_64/PKGBUILD
(from rev 364649, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-x86_64/fs62142.patch
(from rev 364649, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   84 
 fs62142.patch |   13 
 2 files changed, 97 insertions(+)

Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 364649, 
nvidia/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2019-10-11 19:27:10 UTC (rev 364650)
@@ -0,0 +1,84 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+pkgrel=12
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/src/linux module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+_extradir="/usr/lib/modules/$(dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-10-07 Thread Jan Steffens via arch-commits

Date: Monday, October 7, 2019 @ 21:09:24
  Author: heftig
Revision: 364087

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 364086, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 364086, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 364086, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-10-07 21:09:24 UTC (rev 364087)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+_extramodules=extramodules-ARCH
+pkgrel=11
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 364086, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-10-07 21:09:24 UTC (rev 364087)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-10-05 Thread Jan Steffens via arch-commits

Date: Saturday, October 5, 2019 @ 14:34:26
  Author: heftig
Revision: 363844

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 363843, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 363843, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 363843, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-10-05 14:34:26 UTC (rev 363844)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+_extramodules=extramodules-ARCH
+pkgrel=10
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 363843, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-10-05 14:34:26 UTC (rev 363844)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-10-03 Thread Jan Steffens via arch-commits

Date: Friday, October 4, 2019 @ 00:38:28
  Author: heftig
Revision: 363740

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 363739, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 363739, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 363739, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-10-04 00:38:28 UTC (rev 363740)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+_extramodules=extramodules-ARCH
+pkgrel=9
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 363739, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-10-04 00:38:28 UTC (rev 363740)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-10-01 Thread Jan Steffens via arch-commits

Date: Tuesday, October 1, 2019 @ 08:53:43
  Author: heftig
Revision: 363604

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 363603, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 363603, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 363603, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-10-01 08:53:43 UTC (rev 363604)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+_extramodules=extramodules-ARCH
+pkgrel=8
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 363603, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-10-01 08:53:43 UTC (rev 363604)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-09-22 Thread Jan Steffens via arch-commits

Date: Sunday, September 22, 2019 @ 11:51:19
  Author: heftig
Revision: 363236

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 363235, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 363235, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 363235, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-09-22 11:51:19 UTC (rev 363236)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+_extramodules=extramodules-ARCH
+pkgrel=7
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 363235, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-09-22 11:51:19 UTC (rev 363236)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-09-21 Thread Jan Steffens via arch-commits

Date: Saturday, September 21, 2019 @ 12:17:20
  Author: heftig
Revision: 363203

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 363201, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 363201, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 363201, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-09-21 12:17:20 UTC (rev 363203)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+_extramodules=extramodules-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 363201, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-09-21 12:17:20 UTC (rev 363203)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-09-15 Thread Jan Steffens via arch-commits

Date: Monday, September 16, 2019 @ 04:52:43
  Author: heftig
Revision: 362938

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 362936, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 362936, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 362936, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-09-16 04:52:43 UTC (rev 362938)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+_extramodules=extramodules-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 362936, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-09-16 04:52:43 UTC (rev 362938)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-09-12 Thread Jan Steffens via arch-commits

Date: Thursday, September 12, 2019 @ 13:07:20
  Author: heftig
Revision: 362297

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 362296, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 362296, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 362296, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-09-12 13:07:20 UTC (rev 362297)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 362296, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-09-12 13:07:20 UTC (rev 362297)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-09-10 Thread Jan Steffens via arch-commits

Date: Tuesday, September 10, 2019 @ 19:19:34
  Author: heftig
Revision: 362147

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 362146, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 362146, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 362146, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-09-10 19:19:34 UTC (rev 362147)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 362146, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-09-10 19:19:34 UTC (rev 362147)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-09-06 Thread Jan Steffens via arch-commits

Date: Saturday, September 7, 2019 @ 04:44:48
  Author: heftig
Revision: 362000

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 361999, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 361999, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 361999, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-09-07 04:44:48 UTC (rev 362000)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=435.21
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 361999, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-09-07 04:44:48 UTC (rev 362000)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-08-29 Thread Jan Steffens via arch-commits

Date: Thursday, August 29, 2019 @ 22:26:50
  Author: heftig
Revision: 361392

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 361391, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 361391, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 361391, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-08-29 22:26:50 UTC (rev 361392)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.40
+_extramodules=extramodules-ARCH
+pkgrel=7
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('68e6187fe74b43e92de6159589463db5f74eba09652b0f55d5fcc790c315405df6cd27129185f4dbe18790abdbb61e79b52977d47c6407e74d3372b5511a4e1b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 361391, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-08-29 22:26:50 UTC (rev 361392)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-08-25 Thread Jan Steffens via arch-commits

Date: Sunday, August 25, 2019 @ 19:01:43
  Author: heftig
Revision: 361168

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 361167, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 361167, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 361167, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-08-25 19:01:43 UTC (rev 361168)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.40
+_extramodules=extramodules-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('68e6187fe74b43e92de6159589463db5f74eba09652b0f55d5fcc790c315405df6cd27129185f4dbe18790abdbb61e79b52977d47c6407e74d3372b5511a4e1b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 361167, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-08-25 19:01:43 UTC (rev 361168)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-08-16 Thread Jan Steffens via arch-commits

Date: Friday, August 16, 2019 @ 13:24:25
  Author: heftig
Revision: 359904

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 359903, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 359903, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 359903, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-08-16 13:24:25 UTC (rev 359904)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.40
+_extramodules=extramodules-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('68e6187fe74b43e92de6159589463db5f74eba09652b0f55d5fcc790c315405df6cd27129185f4dbe18790abdbb61e79b52977d47c6407e74d3372b5511a4e1b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 359903, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-08-16 13:24:25 UTC (rev 359904)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-08-09 Thread Jan Steffens via arch-commits

Date: Friday, August 9, 2019 @ 22:24:52
  Author: heftig
Revision: 359395

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 359393, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 359393, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 359393, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-08-09 22:24:52 UTC (rev 359395)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.40
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('68e6187fe74b43e92de6159589463db5f74eba09652b0f55d5fcc790c315405df6cd27129185f4dbe18790abdbb61e79b52977d47c6407e74d3372b5511a4e1b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 359393, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-08-09 22:24:52 UTC (rev 359395)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-08-07 Thread Jan Steffens via arch-commits

Date: Wednesday, August 7, 2019 @ 22:02:28
  Author: heftig
Revision: 359304

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 359303, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 359303, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 359303, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-08-07 22:02:28 UTC (rev 359304)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.40
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('68e6187fe74b43e92de6159589463db5f74eba09652b0f55d5fcc790c315405df6cd27129185f4dbe18790abdbb61e79b52977d47c6407e74d3372b5511a4e1b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 359303, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-08-07 22:02:28 UTC (rev 359304)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-08-04 Thread Jan Steffens via arch-commits

Date: Sunday, August 4, 2019 @ 21:54:09
  Author: heftig
Revision: 359148

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 359147, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 359147, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 359147, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-08-04 21:54:09 UTC (rev 359148)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.40
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('68e6187fe74b43e92de6159589463db5f74eba09652b0f55d5fcc790c315405df6cd27129185f4dbe18790abdbb61e79b52977d47c6407e74d3372b5511a4e1b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 359147, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-08-04 21:54:09 UTC (rev 359148)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-07-31 Thread Sven-Hendrik Haase via arch-commits

Date: Wednesday, July 31, 2019 @ 18:33:35
  Author: svenstaro
Revision: 358838

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 358837, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 358837, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 358837, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-07-31 18:33:35 UTC (rev 358838)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.40
+_extramodules=extramodules-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('68e6187fe74b43e92de6159589463db5f74eba09652b0f55d5fcc790c315405df6cd27129185f4dbe18790abdbb61e79b52977d47c6407e74d3372b5511a4e1b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 358837, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-07-31 18:33:35 UTC (rev 358838)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-07-31 Thread Jan Steffens via arch-commits

Date: Wednesday, July 31, 2019 @ 09:49:57
  Author: heftig
Revision: 358822

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 358821, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 358821, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 358821, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-07-31 09:49:57 UTC (rev 358822)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.34
+_extramodules=extramodules-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('a1548dce6e092e61fdc3e54bba7568087ec61b179bbd4572377a21cf7552e73c04a85da819f33f3f0c4f4ca0f49ef11400aef3f1d8dedf2aaf4a7f67097f871e'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 358821, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-07-31 09:49:57 UTC (rev 358822)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-07-28 Thread Jan Steffens via arch-commits

Date: Sunday, July 28, 2019 @ 13:17:55
  Author: heftig
Revision: 358681

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 358680, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 358680, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 358680, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-07-28 13:17:55 UTC (rev 358681)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.34
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('a1548dce6e092e61fdc3e54bba7568087ec61b179bbd4572377a21cf7552e73c04a85da819f33f3f0c4f4ca0f49ef11400aef3f1d8dedf2aaf4a7f67097f871e'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 358680, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-07-28 13:17:55 UTC (rev 358681)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-07-26 Thread Jan Steffens via arch-commits

Date: Friday, July 26, 2019 @ 09:10:27
  Author: heftig
Revision: 358602

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 358601, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 358601, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 358601, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-07-26 09:10:27 UTC (rev 358602)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.34
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('a1548dce6e092e61fdc3e54bba7568087ec61b179bbd4572377a21cf7552e73c04a85da819f33f3f0c4f4ca0f49ef11400aef3f1d8dedf2aaf4a7f67097f871e'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 358601, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-07-26 09:10:27 UTC (rev 358602)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-07-21 Thread Jan Steffens via arch-commits

Date: Sunday, July 21, 2019 @ 20:58:25
  Author: heftig
Revision: 358478

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 358477, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 358477, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 358477, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-07-21 20:58:25 UTC (rev 358478)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.34
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('a1548dce6e092e61fdc3e54bba7568087ec61b179bbd4572377a21cf7552e73c04a85da819f33f3f0c4f4ca0f49ef11400aef3f1d8dedf2aaf4a7f67097f871e'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 358477, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-07-21 20:58:25 UTC (rev 358478)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-07-16 Thread Sven-Hendrik Haase via arch-commits

Date: Wednesday, July 17, 2019 @ 05:33:49
  Author: svenstaro
Revision: 358072

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 358071, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 358071, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 358071, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-07-17 05:33:49 UTC (rev 358072)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.34
+_extramodules=extramodules-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('a1548dce6e092e61fdc3e54bba7568087ec61b179bbd4572377a21cf7552e73c04a85da819f33f3f0c4f4ca0f49ef11400aef3f1d8dedf2aaf4a7f67097f871e'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 358071, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-07-17 05:33:49 UTC (rev 358072)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-07-14 Thread Jan Steffens via arch-commits

Date: Sunday, July 14, 2019 @ 22:16:01
  Author: heftig
Revision: 357986

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 357985, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 357985, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 357985, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-07-14 22:16:01 UTC (rev 357986)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.26
+_extramodules=extramodules-ARCH
+pkgrel=10
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('34ff46659e1d68874dd7ac933fcc6a5dbdbd240e433e5c76c4cb74242001f427848406148fc12035a60d35395c19c81a758ec1ea810d239b15dd72e2d15f884b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 357985, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-07-14 22:16:01 UTC (rev 357986)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-07-08 Thread Jan Steffens via arch-commits

Date: Tuesday, July 9, 2019 @ 04:37:40
  Author: heftig
Revision: 357416

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 357415, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 357415, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 357415, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-07-09 04:37:40 UTC (rev 357416)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.26
+_extramodules=extramodules-ARCH
+pkgrel=9
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('34ff46659e1d68874dd7ac933fcc6a5dbdbd240e433e5c76c4cb74242001f427848406148fc12035a60d35395c19c81a758ec1ea810d239b15dd72e2d15f884b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 357415, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-07-09 04:37:40 UTC (rev 357416)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-07-03 Thread Jan Steffens via arch-commits

Date: Wednesday, July 3, 2019 @ 21:33:27
  Author: heftig
Revision: 357288

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 357287, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 357287, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 357287, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-07-03 21:33:27 UTC (rev 357288)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.26
+_extramodules=extramodules-ARCH
+pkgrel=8
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('34ff46659e1d68874dd7ac933fcc6a5dbdbd240e433e5c76c4cb74242001f427848406148fc12035a60d35395c19c81a758ec1ea810d239b15dd72e2d15f884b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 357287, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-07-03 21:33:27 UTC (rev 357288)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-06-25 Thread Jan Steffens via arch-commits

Date: Tuesday, June 25, 2019 @ 08:01:26
  Author: heftig
Revision: 356859

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 356857, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 356857, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 356857, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-06-25 08:01:26 UTC (rev 356859)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.26
+_extramodules=extramodules-ARCH
+pkgrel=7
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('34ff46659e1d68874dd7ac933fcc6a5dbdbd240e433e5c76c4cb74242001f427848406148fc12035a60d35395c19c81a758ec1ea810d239b15dd72e2d15f884b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 356857, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-06-25 08:01:26 UTC (rev 356859)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-06-22 Thread Jan Steffens via arch-commits

Date: Saturday, June 22, 2019 @ 21:17:39
  Author: heftig
Revision: 356791

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 356790, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 356790, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 356790, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-06-22 21:17:39 UTC (rev 356791)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.26
+_extramodules=extramodules-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('34ff46659e1d68874dd7ac933fcc6a5dbdbd240e433e5c76c4cb74242001f427848406148fc12035a60d35395c19c81a758ec1ea810d239b15dd72e2d15f884b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 356790, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-06-22 21:17:39 UTC (rev 356791)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-06-19 Thread Jan Steffens via arch-commits

Date: Wednesday, June 19, 2019 @ 12:48:21
  Author: heftig
Revision: 356554

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 356552, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 356552, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 356552, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-06-19 12:48:21 UTC (rev 356554)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.26
+_extramodules=extramodules-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('34ff46659e1d68874dd7ac933fcc6a5dbdbd240e433e5c76c4cb74242001f427848406148fc12035a60d35395c19c81a758ec1ea810d239b15dd72e2d15f884b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 356552, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-06-19 12:48:21 UTC (rev 356554)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-06-17 Thread Jan Steffens via arch-commits

Date: Tuesday, June 18, 2019 @ 04:25:41
  Author: heftig
Revision: 356340

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 356338, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 356338, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 356338, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-06-18 04:25:41 UTC (rev 356340)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.26
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('34ff46659e1d68874dd7ac933fcc6a5dbdbd240e433e5c76c4cb74242001f427848406148fc12035a60d35395c19c81a758ec1ea810d239b15dd72e2d15f884b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 356338, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-06-18 04:25:41 UTC (rev 356340)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-06-15 Thread Jan Steffens via arch-commits

Date: Sunday, June 16, 2019 @ 00:51:15
  Author: heftig
Revision: 356186

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 356184, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 356184, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 356184, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-06-16 00:51:15 UTC (rev 356186)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.26
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('34ff46659e1d68874dd7ac933fcc6a5dbdbd240e433e5c76c4cb74242001f427848406148fc12035a60d35395c19c81a758ec1ea810d239b15dd72e2d15f884b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 356184, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-06-16 00:51:15 UTC (rev 356186)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-06-11 Thread Jan Steffens via arch-commits

Date: Tuesday, June 11, 2019 @ 21:08:32
  Author: heftig
Revision: 355893

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 355891, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 355891, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 355891, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-06-11 21:08:32 UTC (rev 355893)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.26
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('34ff46659e1d68874dd7ac933fcc6a5dbdbd240e433e5c76c4cb74242001f427848406148fc12035a60d35395c19c81a758ec1ea810d239b15dd72e2d15f884b'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 355891, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-06-11 21:08:32 UTC (rev 355893)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-06-09 Thread Jan Steffens via arch-commits

Date: Sunday, June 9, 2019 @ 21:58:38
  Author: heftig
Revision: 355526

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 355524, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 355524, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 355524, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-06-09 21:58:38 UTC (rev 355526)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.14
+_extramodules=extramodules-ARCH
+pkgrel=9
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('9d99d4292cf4943378c225eb95ad3a43fa73f2b0d23e35648d77903045d1fc9223a8753cef93022764c18e823f3fc682d23f0d9a64745457d2e2c8ff20e474be'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 355524, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-06-09 21:58:38 UTC (rev 355526)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-06-04 Thread Jan Steffens via arch-commits

Date: Tuesday, June 4, 2019 @ 18:24:01
  Author: heftig
Revision: 354836

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 354833, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 354833, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 354833, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-06-04 18:24:01 UTC (rev 354836)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.14
+_extramodules=extramodules-ARCH
+pkgrel=8
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('9d99d4292cf4943378c225eb95ad3a43fa73f2b0d23e35648d77903045d1fc9223a8753cef93022764c18e823f3fc682d23f0d9a64745457d2e2c8ff20e474be'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 354833, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-06-04 18:24:01 UTC (rev 354836)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-05-31 Thread Jan Steffens via arch-commits

Date: Saturday, June 1, 2019 @ 03:54:06
  Author: heftig
Revision: 354585

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 354582, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 354582, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 354582, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-06-01 03:54:06 UTC (rev 354585)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.14
+_extramodules=extramodules-ARCH
+pkgrel=7
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('9d99d4292cf4943378c225eb95ad3a43fa73f2b0d23e35648d77903045d1fc9223a8753cef93022764c18e823f3fc682d23f0d9a64745457d2e2c8ff20e474be'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 354582, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-06-01 03:54:06 UTC (rev 354585)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-05-26 Thread Jan Steffens via arch-commits

Date: Monday, May 27, 2019 @ 05:05:55
  Author: heftig
Revision: 354374

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 354372, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 354372, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 354372, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-05-27 05:05:55 UTC (rev 354374)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.14
+_extramodules=extramodules-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('9d99d4292cf4943378c225eb95ad3a43fa73f2b0d23e35648d77903045d1fc9223a8753cef93022764c18e823f3fc682d23f0d9a64745457d2e2c8ff20e474be'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 354372, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-05-27 05:05:55 UTC (rev 354374)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-05-25 Thread Jan Steffens via arch-commits

Date: Saturday, May 25, 2019 @ 22:00:13
  Author: heftig
Revision: 354308

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 354305, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 354305, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 354305, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-05-25 22:00:13 UTC (rev 354308)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.14
+_extramodules=extramodules-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('9d99d4292cf4943378c225eb95ad3a43fa73f2b0d23e35648d77903045d1fc9223a8753cef93022764c18e823f3fc682d23f0d9a64745457d2e2c8ff20e474be'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 354305, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-05-25 22:00:13 UTC (rev 354308)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-05-22 Thread Jan Steffens via arch-commits

Date: Wednesday, May 22, 2019 @ 14:36:45
  Author: heftig
Revision: 353830

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 353828, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 353828, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 353828, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-05-22 14:36:45 UTC (rev 353830)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.14
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('9d99d4292cf4943378c225eb95ad3a43fa73f2b0d23e35648d77903045d1fc9223a8753cef93022764c18e823f3fc682d23f0d9a64745457d2e2c8ff20e474be'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 353828, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-05-22 14:36:45 UTC (rev 353830)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-05-21 Thread Jan Steffens via arch-commits

Date: Wednesday, May 22, 2019 @ 01:04:34
  Author: heftig
Revision: 353788

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 353786, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 353786, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 353786, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-05-22 01:04:34 UTC (rev 353788)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.14
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('9d99d4292cf4943378c225eb95ad3a43fa73f2b0d23e35648d77903045d1fc9223a8753cef93022764c18e823f3fc682d23f0d9a64745457d2e2c8ff20e474be'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 353786, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-05-22 01:04:34 UTC (rev 353788)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-05-17 Thread Jan Steffens via arch-commits

Date: Friday, May 17, 2019 @ 07:34:09
  Author: heftig
Revision: 353527

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 353525, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/fs62142.patch
(from rev 353525, nvidia/trunk/fs62142.patch)

---+
 PKGBUILD  |   85 
 fs62142.patch |   13 
 2 files changed, 98 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 353525, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-05-17 07:34:09 UTC (rev 353527)
@@ -0,0 +1,85 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=430.14
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+fs62142.patch)
+sha512sums=('9d99d4292cf4943378c225eb95ad3a43fa73f2b0d23e35648d77903045d1fc9223a8753cef93022764c18e823f3fc682d23f0d9a64745457d2e2c8ff20e474be'
+
'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Fix https://bugs.archlinux.org/task/62142
+patch -Np1 -i ../fs62142.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/fs62142.patch (from rev 353525, 
nvidia/trunk/fs62142.patch)
===
--- staging-x86_64/fs62142.patch(rev 0)
+++ staging-x86_64/fs62142.patch2019-05-17 07:34:09 UTC (rev 353527)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
 b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(>dev->dev);
+ 
+-return (ops->map_resource != NULL);
++return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif

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

2019-03-28 Thread Jan Steffens via arch-commits

Date: Thursday, March 28, 2019 @ 06:43:31
  Author: heftig
Revision: 349317

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 349314, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 349315, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 349314, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-03-28 06:43:31 UTC (rev 349317)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=418.56
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('859b9a27b75416f269037f4ae2af16b4807c704edc63d70be4b2ea96661ef29efde8e4793c015a25ce56a55ee55a707273e9ec55c9d6e3a0caaf8442ccb43910'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 349315, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-03-28 06:43:31 UTC (rev 349317)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the

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

2019-03-23 Thread Jan Steffens via arch-commits

Date: Saturday, March 23, 2019 @ 22:45:32
  Author: heftig
Revision: 349126

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 349124, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 349124, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 349124, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-03-23 22:45:32 UTC (rev 349126)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=418.56
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('859b9a27b75416f269037f4ae2af16b4807c704edc63d70be4b2ea96661ef29efde8e4793c015a25ce56a55ee55a707273e9ec55c9d6e3a0caaf8442ccb43910'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 349124, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-03-23 22:45:32 UTC (rev 349126)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the

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

2019-03-19 Thread Jan Steffens via arch-commits

Date: Tuesday, March 19, 2019 @ 15:37:17
  Author: heftig
Revision: 348701

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 348699, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 348699, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 348699, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-03-19 15:37:17 UTC (rev 348701)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=418.43
+_extramodules=extramodules-ARCH
+pkgrel=8
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('bfd43bec59de7523e879354224f2a678b6bcce53136f10d139882d9ea5d100c034fce2a15100607cb4622a3d158dbbfb41aacc528b04307c989c915b78298045'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 348699, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-03-19 15:37:17 UTC (rev 348701)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the

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

2019-03-14 Thread Jan Steffens via arch-commits

Date: Thursday, March 14, 2019 @ 20:23:24
  Author: heftig
Revision: 348087

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 348084, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 348084, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 348084, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-03-14 20:23:24 UTC (rev 348087)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=418.43
+_extramodules=extramodules-ARCH
+pkgrel=7
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('bfd43bec59de7523e879354224f2a678b6bcce53136f10d139882d9ea5d100c034fce2a15100607cb4622a3d158dbbfb41aacc528b04307c989c915b78298045'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 348084, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-03-14 20:23:24 UTC (rev 348087)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the

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

2019-03-10 Thread Jan Steffens via arch-commits

Date: Sunday, March 10, 2019 @ 12:35:30
  Author: heftig
Revision: 347584

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 347581, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 347581, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 347581, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-03-10 12:35:30 UTC (rev 347584)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=418.43
+_extramodules=extramodules-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('bfd43bec59de7523e879354224f2a678b6bcce53136f10d139882d9ea5d100c034fce2a15100607cb4622a3d158dbbfb41aacc528b04307c989c915b78298045'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 347581, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-03-10 12:35:30 UTC (rev 347584)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the

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

2019-03-04 Thread Jan Steffens via arch-commits

Date: Monday, March 4, 2019 @ 21:11:29
  Author: heftig
Revision: 347062

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 347061, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 347061, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 347061, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-03-04 21:11:29 UTC (rev 347062)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=418.43
+_extramodules=extramodules-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('bfd43bec59de7523e879354224f2a678b6bcce53136f10d139882d9ea5d100c034fce2a15100607cb4622a3d158dbbfb41aacc528b04307c989c915b78298045'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 347061, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-03-04 21:11:29 UTC (rev 347062)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the

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

2019-02-27 Thread Jan Steffens via arch-commits

Date: Wednesday, February 27, 2019 @ 21:34:16
  Author: heftig
Revision: 346917

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 346916, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 346916, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 346916, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-27 21:34:16 UTC (rev 346917)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=418.43
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('bfd43bec59de7523e879354224f2a678b6bcce53136f10d139882d9ea5d100c034fce2a15100607cb4622a3d158dbbfb41aacc528b04307c989c915b78298045'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 346916, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-02-27 21:34:16 UTC (rev 346917)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12

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

2019-02-23 Thread Jan Steffens via arch-commits

Date: Saturday, February 23, 2019 @ 17:30:00
  Author: heftig
Revision: 346735

archrelease: copy trunk to staging-x86_64

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

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 346733, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-23 17:30:00 UTC (rev 346735)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=418.43
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('bfd43bec59de7523e879354224f2a678b6bcce53136f10d139882d9ea5d100c034fce2a15100607cb4622a3d158dbbfb41aacc528b04307c989c915b78298045'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 346733, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-02-23 17:30:00 UTC (rev 346735)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2019-02-22 Thread Jan Steffens via arch-commits

Date: Friday, February 22, 2019 @ 15:51:19
  Author: heftig
Revision: 346664

archrelease: copy trunk to staging-x86_64

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

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 346662, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-22 15:51:19 UTC (rev 346664)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.27
+_extramodules=extramodules-ARCH
+pkgrel=9
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 346662, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-02-22 15:51:19 UTC (rev 346664)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2019-02-20 Thread Jan Steffens via arch-commits

Date: Wednesday, February 20, 2019 @ 23:12:22
  Author: heftig
Revision: 346603

archrelease: copy trunk to staging-x86_64

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

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 346600, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-20 23:12:22 UTC (rev 346603)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.27
+_extramodules=extramodules-ARCH
+pkgrel=8
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 346600, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-02-20 23:12:22 UTC (rev 346603)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12

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

2019-02-15 Thread Jan Steffens via arch-commits

Date: Friday, February 15, 2019 @ 21:08:26
  Author: heftig
Revision: 346336

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 346335, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 346335, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 346335, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-15 21:08:26 UTC (rev 346336)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.27
+_extramodules=extramodules-ARCH
+pkgrel=7
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 346335, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-02-15 21:08:26 UTC (rev 346336)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2019-02-12 Thread Jan Steffens via arch-commits

Date: Wednesday, February 13, 2019 @ 05:56:33
  Author: heftig
Revision: 346207

archrelease: copy trunk to staging-x86_64

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

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 346205, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-13 05:56:33 UTC (rev 346207)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.27
+_extramodules=extramodules-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 346205, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-02-13 05:56:33 UTC (rev 346207)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12

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

2019-02-07 Thread Jan Steffens via arch-commits

Date: Thursday, February 7, 2019 @ 07:59:58
  Author: heftig
Revision: 345353

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 345351, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 345351, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 345351, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-02-07 07:59:58 UTC (rev 345353)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.27
+_extramodules=extramodules-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 345351, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-02-07 07:59:58 UTC (rev 345353)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2019-01-31 Thread Jan Steffens via arch-commits

Date: Thursday, January 31, 2019 @ 12:04:38
  Author: heftig
Revision: 344957

archrelease: copy trunk to staging-x86_64

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

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 344955, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-01-31 12:04:38 UTC (rev 344957)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.27
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 344955, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-01-31 12:04:38 UTC (rev 344957)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2019-01-26 Thread Jan Steffens via arch-commits

Date: Saturday, January 26, 2019 @ 15:40:13
  Author: heftig
Revision: 344821

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 344820, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 344820, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 344820, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-01-26 15:40:13 UTC (rev 344821)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.27
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 344820, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-01-26 15:40:13 UTC (rev 344821)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2019-01-23 Thread Jan Steffens via arch-commits

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

archrelease: copy trunk to staging-x86_64

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

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 344608, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-01-23 08:56:12 UTC (rev 344611)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.27
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 344608, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-01-23 08:56:12 UTC (rev 344611)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2019-01-16 Thread Jan Steffens via arch-commits

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

archrelease: copy trunk to staging-x86_64

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

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 344321, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-01-17 01:15:21 UTC (rev 344324)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.25
+_extramodules=extramodules-ARCH
+pkgrel=8
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('d289a37344916f5d17425f17d0530a7838b264c49866a0148665c9b87dcb7c23e868abae866a2568abac425701149d9075da540dd0f45f3d18f67b57102c0857'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 344321, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-01-17 01:15:21 UTC (rev 344324)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2019-01-13 Thread Jan Steffens via arch-commits

Date: Sunday, January 13, 2019 @ 21:44:29
  Author: heftig
Revision: 344036

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 344034, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 344035, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 344034, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-01-13 21:44:29 UTC (rev 344036)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.25
+_extramodules=extramodules-ARCH
+pkgrel=7
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('d289a37344916f5d17425f17d0530a7838b264c49866a0148665c9b87dcb7c23e868abae866a2568abac425701149d9075da540dd0f45f3d18f67b57102c0857'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 344035, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-01-13 21:44:29 UTC (rev 344036)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2019-01-09 Thread Jan Steffens via arch-commits

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

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 343218, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 343218, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 343218, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-01-10 05:48:10 UTC (rev 343219)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.25
+_extramodules=extramodules-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('d289a37344916f5d17425f17d0530a7838b264c49866a0148665c9b87dcb7c23e868abae866a2568abac425701149d9075da540dd0f45f3d18f67b57102c0857'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 343218, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2019-01-10 05:48:10 UTC (rev 343219)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-12-23 Thread Jan Steffens via arch-commits

Date: Monday, December 24, 2018 @ 04:23:16
  Author: heftig
Revision: 342701

archrelease: copy trunk to staging-x86_64

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

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 342699, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-24 04:23:16 UTC (rev 342701)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.25
+_extramodules=extramodules-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 
'linux-headers<4.21')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('d289a37344916f5d17425f17d0530a7838b264c49866a0148665c9b87dcb7c23e868abae866a2568abac425701149d9075da540dd0f45f3d18f67b57102c0857'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.20' 'linux<4.21' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 342699, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-12-24 04:23:16 UTC (rev 342701)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-12-21 Thread Jan Steffens via arch-commits

Date: Saturday, December 22, 2018 @ 05:32:27
  Author: heftig
Revision: 342659

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 342656, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 342657, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 342656, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-22 05:32:27 UTC (rev 342659)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.25
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('d289a37344916f5d17425f17d0530a7838b264c49866a0148665c9b87dcb7c23e868abae866a2568abac425701149d9075da540dd0f45f3d18f67b57102c0857'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 342657, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-12-22 05:32:27 UTC (rev 342659)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-12-19 Thread Jan Steffens via arch-commits

Date: Thursday, December 20, 2018 @ 05:36:54
  Author: heftig
Revision: 342580

archrelease: copy trunk to staging-x86_64

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

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 342579, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-20 05:36:54 UTC (rev 342580)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.25
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('d289a37344916f5d17425f17d0530a7838b264c49866a0148665c9b87dcb7c23e868abae866a2568abac425701149d9075da540dd0f45f3d18f67b57102c0857'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 342579, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-12-20 05:36:54 UTC (rev 342580)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-12-17 Thread Jan Steffens via arch-commits

Date: Tuesday, December 18, 2018 @ 01:58:28
  Author: heftig
Revision: 342492

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 342490, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 342490, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 342490, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-18 01:58:28 UTC (rev 342492)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.23
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('3bdd8c7b3758353f98686361babd14b91dced283c9a27e1c828d87fc4eff66488707345195e27de107c72a408b6ae147ae9c86cfa31bd8468bfa70d56bb68739'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 342490, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-12-18 01:58:28 UTC (rev 342492)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-12-14 Thread Jan Steffens via arch-commits

Date: Friday, December 14, 2018 @ 10:02:40
  Author: heftig
Revision: 342326

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 342325, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 342325, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 342325, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-14 10:02:40 UTC (rev 342326)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.22
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('07e49fb7f82f5a2122994ca72f04354b0875845af8676bdd38b65e62291dff7eddbdf48f1428281a6c44ae2c2ba14368ba27682515bea5b87606be8db422f411'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 342325, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-12-14 10:02:40 UTC (rev 342326)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-12-08 Thread Jan Steffens via arch-commits

Date: Saturday, December 8, 2018 @ 16:43:00
  Author: heftig
Revision: 341279

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 341278, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 341278, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 341278, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-08 16:43:00 UTC (rev 341279)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.22
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('07e49fb7f82f5a2122994ca72f04354b0875845af8676bdd38b65e62291dff7eddbdf48f1428281a6c44ae2c2ba14368ba27682515bea5b87606be8db422f411'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 341278, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-12-08 16:43:00 UTC (rev 341279)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-12-05 Thread Jan Steffens via arch-commits

Date: Wednesday, December 5, 2018 @ 23:52:43
  Author: heftig
Revision: 341091

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 341089, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 341089, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 341089, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-05 23:52:43 UTC (rev 341091)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.18
+_extramodules=extramodules-ARCH
+pkgrel=7
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('8e56b5a62f47b4bbe2b0c59e05e2b1a4beb204252aa2000e6dfc257a16f06d00862232d2a3f404192e47b73c3af9f6d6c92e3d530b977a6ecbe3f2d944a12f7e'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 341089, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-12-05 23:52:43 UTC (rev 341091)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-12-01 Thread Jan Steffens via arch-commits

Date: Saturday, December 1, 2018 @ 21:21:01
  Author: heftig
Revision: 340939

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 340937, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 340937, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 340937, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-12-01 21:21:01 UTC (rev 340939)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.18
+_extramodules=extramodules-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('8e56b5a62f47b4bbe2b0c59e05e2b1a4beb204252aa2000e6dfc257a16f06d00862232d2a3f404192e47b73c3af9f6d6c92e3d530b977a6ecbe3f2d944a12f7e'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 340937, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-12-01 21:21:01 UTC (rev 340939)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-11-27 Thread Jan Steffens via arch-commits

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

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 340517, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 340518, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 340517, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-11-27 22:54:29 UTC (rev 340519)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.18
+_extramodules=extramodules-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('8e56b5a62f47b4bbe2b0c59e05e2b1a4beb204252aa2000e6dfc257a16f06d00862232d2a3f404192e47b73c3af9f6d6c92e3d530b977a6ecbe3f2d944a12f7e'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 340518, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-11-27 22:54:29 UTC (rev 340519)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-11-23 Thread Jan Steffens via arch-commits

Date: Friday, November 23, 2018 @ 15:08:40
  Author: heftig
Revision: 340339

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 340338, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 340338, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 340338, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-11-23 15:08:40 UTC (rev 340339)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.18
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('8e56b5a62f47b4bbe2b0c59e05e2b1a4beb204252aa2000e6dfc257a16f06d00862232d2a3f404192e47b73c3af9f6d6c92e3d530b977a6ecbe3f2d944a12f7e'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 340338, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-11-23 15:08:40 UTC (rev 340339)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-11-22 Thread Jan Steffens via arch-commits

Date: Thursday, November 22, 2018 @ 08:51:29
  Author: heftig
Revision: 340228

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 340226, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 340227, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 340226, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-11-22 08:51:29 UTC (rev 340228)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.18
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('8e56b5a62f47b4bbe2b0c59e05e2b1a4beb204252aa2000e6dfc257a16f06d00862232d2a3f404192e47b73c3af9f6d6c92e3d530b977a6ecbe3f2d944a12f7e'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 340227, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-11-22 08:51:29 UTC (rev 340228)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-11-20 Thread Felix Yan via arch-commits

Date: Tuesday, November 20, 2018 @ 20:55:43
  Author: felixonmars
Revision: 340174

archrelease: copy trunk to testing-x86_64

Added:
  nvidia/repos/testing-x86_64/
  nvidia/repos/testing-x86_64/PKGBUILD
(from rev 340173, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-x86_64/kernel-4.16.patch
(from rev 340173, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 340173, 
nvidia/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-11-20 20:55:43 UTC (rev 340174)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=415.18
+_extramodules=extramodules-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('8e56b5a62f47b4bbe2b0c59e05e2b1a4beb204252aa2000e6dfc257a16f06d00862232d2a3f404192e47b73c3af9f6d6c92e3d530b977a6ecbe3f2d944a12f7e'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/testing-x86_64/kernel-4.16.patch (from rev 340173, 
nvidia/trunk/kernel-4.16.patch)
===
--- testing-x86_64/kernel-4.16.patch(rev 0)
+++ testing-x86_64/kernel-4.16.patch2018-11-20 20:55:43 UTC (rev 340174)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7

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

2018-11-19 Thread Felix Yan via arch-commits

Date: Monday, November 19, 2018 @ 17:33:09
  Author: felixonmars
Revision: 340138

archrelease: copy trunk to testing-x86_64

Added:
  nvidia/repos/testing-x86_64/
  nvidia/repos/testing-x86_64/PKGBUILD
(from rev 340137, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-x86_64/kernel-4.16.patch
(from rev 340137, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 340137, 
nvidia/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-11-19 17:33:09 UTC (rev 340138)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=410.78
+_extramodules=extramodules-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('0bd7ed61dcfd4d7634ba450b106d7648fc274c256e7e4c4e51e544bd7779d68ffa08cba709ace5333679eeea1dbe4afa0c267361887eaa784d6f1369b717677d'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/testing-x86_64/kernel-4.16.patch (from rev 340137, 
nvidia/trunk/kernel-4.16.patch)
===
--- testing-x86_64/kernel-4.16.patch(rev 0)
+++ testing-x86_64/kernel-4.16.patch2018-11-19 17:33:09 UTC (rev 340138)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12

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

2018-11-13 Thread Jan Steffens via arch-commits

Date: Wednesday, November 14, 2018 @ 05:04:47
  Author: heftig
Revision: 339666

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 339665, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 339665, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 339665, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-11-14 05:04:47 UTC (rev 339666)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=410.73
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('2dca98babb4b2ce319089b179619444e1ef9b4b94c0d1981982c35a234f9e6934febe3ec3ca39cf1b3672a126b4290b1bc54469a0617b7fdebb4871cc4c75bac'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 339665, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-11-14 05:04:47 UTC (rev 339666)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12

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

2018-11-04 Thread Jan Steffens via arch-commits

Date: Sunday, November 4, 2018 @ 18:23:28
  Author: heftig
Revision: 337847

archrelease: copy trunk to staging-x86_64

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

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 337845, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-11-04 18:23:28 UTC (rev 337847)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=410.73
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('2dca98babb4b2ce319089b179619444e1ef9b4b94c0d1981982c35a234f9e6934febe3ec3ca39cf1b3672a126b4290b1bc54469a0617b7fdebb4871cc4c75bac'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 337845, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-11-04 18:23:28 UTC (rev 337847)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-10-26 Thread Jan Steffens via arch-commits

Date: Friday, October 26, 2018 @ 19:26:58
  Author: heftig
Revision: 337339

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 337338, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 337338, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 337338, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-26 19:26:58 UTC (rev 337339)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=410.66
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 
'linux-headers<4.20')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('1773ea5150822735cf02808df68cd2f9ff8b502633632a7748b4bff387daec44527f1bfb0508938c9eee7fb12ac070b99b3f5a903e592bf6d9c6461f4f7a7e9e'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.19' 'linux<4.20' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 337338, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-10-26 19:26:58 UTC (rev 337339)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-10-20 Thread Jan Steffens via arch-commits

Date: Saturday, October 20, 2018 @ 23:22:59
  Author: heftig
Revision: 336930

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 336929, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 336929, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 336929, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-20 23:22:59 UTC (rev 336930)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=410.66
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('1773ea5150822735cf02808df68cd2f9ff8b502633632a7748b4bff387daec44527f1bfb0508938c9eee7fb12ac070b99b3f5a903e592bf6d9c6461f4f7a7e9e'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 336929, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-10-20 23:22:59 UTC (rev 336930)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-10-18 Thread Jan Steffens via arch-commits

Date: Thursday, October 18, 2018 @ 22:04:31
  Author: heftig
Revision: 336852

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 336851, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 336851, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 336851, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-18 22:04:31 UTC (rev 336852)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=410.66
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('1773ea5150822735cf02808df68cd2f9ff8b502633632a7748b4bff387daec44527f1bfb0508938c9eee7fb12ac070b99b3f5a903e592bf6d9c6461f4f7a7e9e'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 336851, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-10-18 22:04:31 UTC (rev 336852)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@

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

2018-10-16 Thread Felix Yan via arch-commits

Date: Wednesday, October 17, 2018 @ 05:27:24
  Author: felixonmars
Revision: 336788

archrelease: copy trunk to testing-x86_64

Added:
  nvidia/repos/testing-x86_64/
  nvidia/repos/testing-x86_64/PKGBUILD
(from rev 336787, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-x86_64/kernel-4.16.patch
(from rev 336787, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 336787, 
nvidia/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-10-17 05:27:24 UTC (rev 336788)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=410.66
+_extramodules=extramodules-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha512sums=('1773ea5150822735cf02808df68cd2f9ff8b502633632a7748b4bff387daec44527f1bfb0508938c9eee7fb12ac070b99b3f5a903e592bf6d9c6461f4f7a7e9e'
+
'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/testing-x86_64/kernel-4.16.patch (from rev 336787, 
nvidia/trunk/kernel-4.16.patch)
===
--- testing-x86_64/kernel-4.16.patch(rev 0)
+++ testing-x86_64/kernel-4.16.patch2018-10-17 05:27:24 UTC (rev 336788)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7

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

2018-10-13 Thread Jan Steffens via arch-commits

Date: Saturday, October 13, 2018 @ 20:22:04
  Author: heftig
Revision: 336536

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 336535, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 336535, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 336535, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-13 20:22:04 UTC (rev 336536)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=410.57
+_extramodules=extramodules-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('5c3c2e1fef0615c0002946c586c815a77676f4683304cc17d5bf323e7626a320'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 336535, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-10-13 20:22:04 UTC (rev 336536)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++

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

2018-10-12 Thread Jan Steffens via arch-commits

Date: Friday, October 12, 2018 @ 07:12:33
  Author: heftig
Revision: 336411

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 336410, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 336410, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 336410, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-12 07:12:33 UTC (rev 336411)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=410.57
+_extramodules=extramodules-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('5c3c2e1fef0615c0002946c586c815a77676f4683304cc17d5bf323e7626a320'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 336410, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-10-12 07:12:33 UTC (rev 336411)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++

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

2018-10-03 Thread Jan Steffens via arch-commits

Date: Thursday, October 4, 2018 @ 02:50:26
  Author: heftig
Revision: 335750

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 335749, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 335749, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 335749, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-04 02:50:26 UTC (rev 335750)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=410.57
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('5c3c2e1fef0615c0002946c586c815a77676f4683304cc17d5bf323e7626a320'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 335749, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-10-04 02:50:26 UTC (rev 335750)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++

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

2018-09-29 Thread Jan Steffens via arch-commits

Date: Saturday, September 29, 2018 @ 22:52:39
  Author: heftig
Revision: 335571

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 335570, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 335570, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 335570, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-09-29 22:52:39 UTC (rev 335571)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=410.57
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('5c3c2e1fef0615c0002946c586c815a77676f4683304cc17d5bf323e7626a320'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 335570, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-09-29 22:52:39 UTC (rev 335571)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++

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

2018-09-26 Thread Jan Steffens via arch-commits

Date: Wednesday, September 26, 2018 @ 12:57:51
  Author: heftig
Revision: 335427

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 335426, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 335426, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 335426, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-09-26 12:57:51 UTC (rev 335427)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=410.57
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('5c3c2e1fef0615c0002946c586c815a77676f4683304cc17d5bf323e7626a320'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 335426, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-09-26 12:57:51 UTC (rev 335427)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++

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

2018-09-23 Thread Sven-Hendrik Haase via arch-commits

Date: Monday, September 24, 2018 @ 04:02:59
  Author: svenstaro
Revision: 335283

archrelease: copy trunk to testing-x86_64

Added:
  nvidia/repos/testing-x86_64/
  nvidia/repos/testing-x86_64/PKGBUILD
(from rev 335282, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-x86_64/kernel-4.16.patch
(from rev 335282, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 335282, 
nvidia/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-09-24 04:02:59 UTC (rev 335283)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=410.57
+_extramodules=extramodules-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('5c3c2e1fef0615c0002946c586c815a77676f4683304cc17d5bf323e7626a320'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/testing-x86_64/kernel-4.16.patch (from rev 335282, 
nvidia/trunk/kernel-4.16.patch)
===
--- testing-x86_64/kernel-4.16.patch(rev 0)
+++ testing-x86_64/kernel-4.16.patch2018-09-24 04:02:59 UTC (rev 335283)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++

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

2018-09-19 Thread Jan Steffens via arch-commits

Date: Wednesday, September 19, 2018 @ 23:00:39
  Author: heftig
Revision: 335040

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 335039, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 335039, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 335039, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-09-19 23:00:39 UTC (rev 335040)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=396.54
+_extramodules=extramodules-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('7c3e3c9ca6aea31ad2613ef9cb6a4510d95d61b698f084e55adcc0611ee9eec3'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 335039, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-09-19 23:00:39 UTC (rev 335040)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++

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

2018-09-15 Thread Jan Steffens via arch-commits

Date: Sunday, September 16, 2018 @ 00:27:45
  Author: heftig
Revision: 334656

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 334655, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 334655, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   86 
 kernel-4.16.patch |   33 +++
 2 files changed, 119 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 334655, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-09-16 00:27:45 UTC (rev 334656)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=396.54
+_extramodules=extramodules-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('7c3e3c9ca6aea31ad2613ef9cb6a4510d95d61b698f084e55adcc0611ee9eec3'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 334655, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-09-16 00:27:45 UTC (rev 334656)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++

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

2018-09-09 Thread Jan Steffens via arch-commits

Date: Sunday, September 9, 2018 @ 13:06:55
  Author: heftig
Revision: 334283

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 334282, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 334282, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   87 
 kernel-4.16.patch |   33 +++
 2 files changed, 120 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 334282, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-09-09 13:06:55 UTC (rev 334283)
@@ -0,0 +1,87 @@
+# $Id: PKGBUILD 332974 2018-08-24 16:31:16Z heftig $
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=396.54
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('7c3e3c9ca6aea31ad2613ef9cb6a4510d95d61b698f084e55adcc0611ee9eec3'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 334282, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-09-09 13:06:55 UTC (rev 334283)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is

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

2018-09-05 Thread Jan Steffens via arch-commits

Date: Wednesday, September 5, 2018 @ 16:00:24
  Author: heftig
Revision: 333459

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 333458, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 333458, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   87 
 kernel-4.16.patch |   33 +++
 2 files changed, 120 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 333458, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-09-05 16:00:24 UTC (rev 333459)
@@ -0,0 +1,87 @@
+# $Id: PKGBUILD 332974 2018-08-24 16:31:16Z heftig $
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=396.54
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('7c3e3c9ca6aea31ad2613ef9cb6a4510d95d61b698f084e55adcc0611ee9eec3'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 333458, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-09-05 16:00:24 UTC (rev 333459)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is

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

2018-08-24 Thread Jan Steffens via arch-commits

Date: Friday, August 24, 2018 @ 16:40:03
  Author: heftig
Revision: 332977

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 332976, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 332976, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   87 
 kernel-4.16.patch |   33 +++
 2 files changed, 120 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 332976, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-24 16:40:03 UTC (rev 332977)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=396.54
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('7c3e3c9ca6aea31ad2613ef9cb6a4510d95d61b698f084e55adcc0611ee9eec3'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 332976, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-08-24 16:40:03 UTC (rev 332977)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++

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

2018-08-23 Thread Sven-Hendrik Haase via arch-commits

Date: Thursday, August 23, 2018 @ 21:10:45
  Author: svenstaro
Revision: 332875

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 332874, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 332874, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   87 
 kernel-4.16.patch |   33 +++
 2 files changed, 120 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 332874, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-23 21:10:45 UTC (rev 332875)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=396.54
+_extramodules=extramodules-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('7c3e3c9ca6aea31ad2613ef9cb6a4510d95d61b698f084e55adcc0611ee9eec3'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 332874, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-08-23 21:10:45 UTC (rev 332875)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="

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

2018-08-22 Thread Jan Steffens via arch-commits

Date: Wednesday, August 22, 2018 @ 12:25:47
  Author: heftig
Revision: 332804

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 332803, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 332803, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   87 
 kernel-4.16.patch |   33 +++
 2 files changed, 120 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 332803, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-22 12:25:47 UTC (rev 332804)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=396.51
+_extramodules=extramodules-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('6add8c3782bdf276b4a5a5bcea102ceff8e90cf3fc2439dde9d5e60d557ac0d6'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 332803, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-08-22 12:25:47 UTC (rev 332804)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="

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

2018-08-18 Thread Jan Steffens via arch-commits

Date: Saturday, August 18, 2018 @ 12:52:28
  Author: heftig
Revision: 332262

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 332261, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 332261, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   87 
 kernel-4.16.patch |   33 +++
 2 files changed, 120 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 332261, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-18 12:52:28 UTC (rev 332262)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=396.51
+_extramodules=extramodules-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('6add8c3782bdf276b4a5a5bcea102ceff8e90cf3fc2439dde9d5e60d557ac0d6'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 332261, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-08-18 12:52:28 UTC (rev 332262)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++

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

2018-08-18 Thread Jan Steffens via arch-commits

Date: Saturday, August 18, 2018 @ 08:32:12
  Author: heftig
Revision: 332225

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 332224, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 332224, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   87 
 kernel-4.16.patch |   33 +++
 2 files changed, 120 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 332224, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-18 08:32:12 UTC (rev 332225)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=396.51
+_extramodules=extramodules-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('6add8c3782bdf276b4a5a5bcea102ceff8e90cf3fc2439dde9d5e60d557ac0d6'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 332224, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-08-18 08:32:12 UTC (rev 332225)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++

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

2018-08-16 Thread Jan Steffens via arch-commits

Date: Thursday, August 16, 2018 @ 10:26:15
  Author: heftig
Revision: 331580

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 331579, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 331579, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   87 
 kernel-4.16.patch |   33 +++
 2 files changed, 120 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 331579, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-16 10:26:15 UTC (rev 331580)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=396.51
+_extramodules=extramodules-ARCH
+pkgrel=3
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('6add8c3782bdf276b4a5a5bcea102ceff8e90cf3fc2439dde9d5e60d557ac0d6'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 331579, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-08-16 10:26:15 UTC (rev 331580)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++

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

2018-08-13 Thread Jan Steffens via arch-commits

Date: Monday, August 13, 2018 @ 14:16:25
  Author: heftig
Revision: 331454

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 331453, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 331453, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   87 
 kernel-4.16.patch |   33 +++
 2 files changed, 120 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 331453, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-13 14:16:25 UTC (rev 331454)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=396.51
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.18' 
'linux-headers<4.19')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('6add8c3782bdf276b4a5a5bcea102ceff8e90cf3fc2439dde9d5e60d557ac0d6'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.18' 'linux<4.19' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 331453, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-08-13 14:16:25 UTC (rev 331454)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="
++

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

2018-08-12 Thread Sven-Hendrik Haase via arch-commits

Date: Sunday, August 12, 2018 @ 18:38:29
  Author: svenstaro
Revision: 331427

archrelease: copy trunk to staging-x86_64

Added:
  nvidia/repos/staging-x86_64/
  nvidia/repos/staging-x86_64/PKGBUILD
(from rev 331426, nvidia/trunk/PKGBUILD)
  nvidia/repos/staging-x86_64/kernel-4.16.patch
(from rev 331426, nvidia/trunk/kernel-4.16.patch)

---+
 PKGBUILD  |   87 
 kernel-4.16.patch |   33 +++
 2 files changed, 120 insertions(+)

Copied: nvidia/repos/staging-x86_64/PKGBUILD (from rev 331426, 
nvidia/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-12 18:38:29 UTC (rev 331427)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia
+pkgname=(nvidia nvidia-dkms)
+pkgver=396.51
+_extramodules=extramodules-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('x86_64')
+url="http://www.nvidia.com/;
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.17' 
'linux-headers<4.18')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run;
+kernel-4.16.patch)
+sha256sums=('6add8c3782bdf276b4a5a5bcea102ceff8e90cf3fc2439dde9d5e60d557ac0d6'
+'622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+
+prepare() {
+sh "${_pkg}.run" --extract-only
+cd "${_pkg}"
+
+# Restore phys_to_dma support (still needed for 396.18)
+# https://bugs.archlinux.org/task/58074
+patch -Np1 -i ../kernel-4.16.patch
+
+cp -a kernel kernel-dkms
+cd kernel-dkms
+sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+sed -i 's/__JOBS/`nproc`/' dkms.conf
+sed -i 's/__DKMS_MODULES//' dkms.conf
+sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+# Gift for linux-rt guys
+sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 
NV_EXCLUDE_BUILD_MODULES/' dkms.conf
+}
+
+build() {
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+cd "${_pkg}"/kernel
+make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia() {
+pkgdesc="NVIDIA drivers for linux"
+depends=('linux>=4.17' 'linux<4.18' "nvidia-utils=${pkgver}" 'libglvnd')
+
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+  "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}
+
+package_nvidia-dkms() {
+pkgdesc="NVIDIA driver sources for linux"
+depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd')
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+provides=("nvidia=$pkgver")
+conflicts+=('nvidia')
+
+cd ${_pkg}
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}/usr/src/nvidia-${pkgver}"
+
+echo "blacklist nouveau" |
+install -Dm644 /dev/stdin 
"${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+
+install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 
"${srcdir}/${_pkg}/LICENSE"
+}

Copied: nvidia/repos/staging-x86_64/kernel-4.16.patch (from rev 331426, 
nvidia/trunk/kernel-4.16.patch)
===
--- staging-x86_64/kernel-4.16.patch(rev 0)
+++ staging-x86_64/kernel-4.16.patch2018-08-12 18:38:29 UTC (rev 331427)
@@ -0,0 +1,33 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index 10fc418..22ef968 100644
+--- a/kernel/common/inc/nv-linux.h
 b/kernel/common/inc/nv-linux.h
+@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
+ 
+ #if defined(NV_VM_INSERT_PAGE_PRESENT)
+ #include 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+ #include 
++#else
++#include 
++#endif
+ #endif
+ 
+ #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b23dbb4..42dc576 100755
+--- a/kernel/conftest.sh
 b/kernel/conftest.sh
+@@ -1906,7 +1906,12 @@ compile_test() {
+ # Determine if the phys_to_dma function is present.
+ #
+ CODE="

1 2 >

1 - 100 of 159 matches

Mail list logo