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

[Jan Steffens]

    Date: Sunday, November 10, 2019 @ 15:11:24
  Author: heftig
Revision: 367683

archrelease: copy trunk to testing-x86_64

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

---------------+
 PKGBUILD      |   87 ++++++++++++++++++++++++++------------------------------
 fs62142.patch |   13 --------
 2 files changed, 41 insertions(+), 59 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-10 15:11:23 UTC (rev 367682)
+++ PKGBUILD	2019-11-10 15:11:24 UTC (rev 367683)
@@ -1,46 +0,0 @@
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=nvidia-lts
-pkgver=435.21
-pkgrel=9
-epoch=1
-pkgdesc="NVIDIA drivers for linux-lts"
-arch=('x86_64')
-url="https://www.nvidia.com/"
-makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux-lts-headers')
-provides=('nvidia')
-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
-}
-
-build() {
-    cd "${_pkg}"/kernel
-    make SYSSRC=/usr/src/linux-lts module
-}
-
-package() {
-    depends=('linux-lts' "nvidia-utils=${pkgver}" 'libglvnd')
-
-    _extradir="/usr/lib/modules/$(</usr/src/linux-lts/version)/extramodules"
-    install -Dt "${pkgdir}${_extradir}" -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"
-}

Copied: nvidia-lts/repos/testing-x86_64/PKGBUILD (from rev 367681, nvidia-lts/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-11-10 15:11:24 UTC (rev 367683)
@@ -0,0 +1,41 @@
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=nvidia-lts
+pkgver=435.21
+pkgrel=10
+epoch=1
+pkgdesc="NVIDIA drivers for linux-lts"
+arch=('x86_64')
+url="https://www.nvidia.com/"
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux-lts-headers')
+provides=('nvidia')
+license=('custom')
+options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}"
+source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run")
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270')
+
+prepare() {
+    sh "${_pkg}.run" --extract-only
+    cd "${_pkg}"
+}
+
+build() {
+    cd "${_pkg}"/kernel
+    make SYSSRC=/usr/src/linux-lts module
+}
+
+package() {
+    depends=('linux-lts' "nvidia-utils=${pkgver}" 'libglvnd')
+
+    _extradir="/usr/lib/modules/$(</usr/src/linux-lts/version)/extramodules"
+    install -Dt "${pkgdir}${_extradir}" -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"
+}

Deleted: fs62142.patch
===================================================================
--- fs62142.patch	2019-11-10 15:11:23 UTC (rev 367682)
+++ fs62142.patch	2019-11-10 15:11:24 UTC (rev 367683)
@@ -1,13 +0,0 @@
-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(&nvl->dev->dev);
- 
--    return (ops->map_resource != NULL);
-+    return (ops && ops->map_resource);
- #else
-     return NV_FALSE;
- #endif