[arch-commits] Commit in nvidia/trunk (PKGBUILD kernel-4.16.patch)

[Felix Yan]

    Date: Thursday, May 16, 2019 @ 19:45:35
  Author: felixonmars
Revision: 353493

upgpkg: nvidia 430.14-1

Modified:
  nvidia/trunk/PKGBUILD
Deleted:
  nvidia/trunk/kernel-4.16.patch

-------------------+
 PKGBUILD          |   12 +++---------
 kernel-4.16.patch |   33 ---------------------------------
 2 files changed, 3 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-16 19:43:42 UTC (rev 353492)
+++ PKGBUILD	2019-05-16 19:45:35 UTC (rev 353493)
@@ -4,9 +4,9 @@
 
 pkgbase=nvidia
 pkgname=(nvidia nvidia-dkms)
-pkgver=418.74
+pkgver=430.14
 _extramodules=extramodules-ARCH
-pkgrel=4
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux"
 arch=('x86_64')
 url="http://www.nvidia.com/"
@@ -15,10 +15,8 @@
 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
         fs62142.patch)
-sha512sums=('485d94f0a328c117f86c7b2d8e14885aa1e498755bcc7285aaba1cf5e8f4672feaece7c87a7d0f835c55ff4022d0be6b023ffee262f0a3073ccf88ca1f39201f'
-            'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af'
+sha512sums=('9d99d4292cf4943378c225eb95ad3a43fa73f2b0d23e35648d77903045d1fc9223a8753cef93022764c18e823f3fc682d23f0d9a64745457d2e2c8ff20e474be'
             'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
 
 prepare() {
@@ -25,10 +23,6 @@
     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
-
     # Fix https://bugs.archlinux.org/task/62142
     patch -Np1 -i ../fs62142.patch
 

Deleted: kernel-4.16.patch
===================================================================
--- kernel-4.16.patch	2019-05-16 19:43:42 UTC (rev 353492)
+++ kernel-4.16.patch	2019-05-16 19:45:35 UTC (rev 353493)
@@ -1,33 +0,0 @@
-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 <linux/pagemap.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
- #include <linux/dma-mapping.h>
-+#else
-+#include <linux/dma-direct.h>
-+#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="
-+            #include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
-             #include <linux/dma-mapping.h>
-+#else
-+            #include <linux/dma-direct.h>
-+#endif
-             void conftest_phys_to_dma(void) {
-                 phys_to_dma();
-             }"