[arch-commits] Commit in nvidia-390xx-lts/trunk (PKGBUILD kernel-4.19.patch)

[Sven-Hendrik Haase]

    Date: Saturday, February 23, 2019 @ 17:51:06
  Author: svenstaro
Revision: 346743

upgpkg: nvidia-390xx-lts 1:390.116-1

Modified:
  nvidia-390xx-lts/trunk/PKGBUILD
Deleted:
  nvidia-390xx-lts/trunk/kernel-4.19.patch

-------------------+
 PKGBUILD          |   15 ++++--------
 kernel-4.19.patch |   63 ----------------------------------------------------
 2 files changed, 5 insertions(+), 73 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-23 17:47:50 UTC (rev 346742)
+++ PKGBUILD	2019-02-23 17:51:06 UTC (rev 346743)
@@ -1,9 +1,9 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=nvidia-390xx-lts
-pkgver=390.87
+pkgver=390.116
 _extramodules=extramodules-4.19-lts
-pkgrel=10
+pkgrel=1
 epoch=1
 arch=('x86_64')
 url="http://www.nvidia.com/"
@@ -13,11 +13,9 @@
 license=('custom')
 options=('!strip')
 source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
-        kernel-4.16.patch
-        kernel-4.19.patch)
-sha512sums=('91f8639718b8511f56e8c01caafc5a061a3ae1e84202ad261fae94bf83b2c9db8eb5910a9a2b35f668bb3c82dfb3978ca037930a71e396d105c4b4b25c269ed8'
-            'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af'
-            '8521f9d7ef27e1d53a12c6d4bda5cecc8025052175c410d35a267922d8dbb3874be55d034349b32f2c054ae5ffedcb5e135558bc1b6baecd5e0006ea5881930d')
+        kernel-4.16.patch)
+sha512sums=('842e57b479d833a40fe1e8ecf72217c43d71a07e91cb4b6d14bd3b6326a0ef035e6423c15849ccc23ff82d2740ae8c21a9742502b958bd748736abac5e7d9f1e'
+            'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
 
 _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 
@@ -27,9 +25,6 @@
     # Restore phys_to_dma support (still needed for 396.18)
     # https://bugs.archlinux.org/task/58074
     patch -Np1 -i ../kernel-4.16.patch
-
-    # Ad-hoc patch
-    patch -Np1 -i ../kernel-4.19.patch
 }
 
 build() {

Deleted: kernel-4.19.patch
===================================================================
--- kernel-4.19.patch	2019-02-23 17:47:50 UTC (rev 346742)
+++ kernel-4.19.patch	2019-02-23 17:51:06 UTC (rev 346743)
@@ -1,63 +0,0 @@
-diff -u -r a/kernel/conftest.sh b/kernel/conftest.sh
---- a/kernel/conftest.sh	2018-11-01 11:00:14.429126159 +0000
-+++ b/kernel/conftest.sh	2018-11-01 11:03:08.199579458 +0000
-@@ -2372,8 +2372,13 @@
-             #
-             CODE="
-             #include <drm/drmP.h>
-+            #include <linux/version.h>
-             void conftest_drm_mode_connector_list_update_has_merge_type_bits_arg(void) {
-+            #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
-                 drm_mode_connector_list_update(
-+            #else
-+                drm_connector_list_update(
-+            #endif
-                     NULL,  /* struct drm_connector *connector */
-                     true); /* bool merge_type_bits */
-             }"
-diff -u -r a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
---- a/kernel/nvidia-drm/nvidia-drm-connector.c	2018-08-22 00:55:29.000000000 +0000
-+++ b/kernel/nvidia-drm/nvidia-drm-connector.c	2018-11-01 11:08:14.643715031 +0000
-@@ -34,6 +34,7 @@
- 
- #include <drm/drm_atomic.h>
- #include <drm/drm_atomic_helper.h>
-+#include <linux/version.h>
- 
- static void nv_drm_connector_destroy(struct drm_connector *connector)
- {
-@@ -226,7 +227,11 @@
- 
- 
-     if (nv_connector->edid != NULL) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
-         drm_mode_connector_update_edid_property(
-+#else
-+        drm_connector_update_edid_property(
-+#endif
-             connector, nv_connector->edid);
-     }
- 
-diff -u -r a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c
---- a/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-08-22 00:55:29.000000000 +0000
-+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-11-01 11:08:32.210427737 +0000
-@@ -34,6 +34,7 @@
- 
- #include <drm/drm_atomic.h>
- #include <drm/drm_atomic_helper.h>
-+#include <linux/version.h>
- 
- static void nv_drm_encoder_destroy(struct drm_encoder *encoder)
- {
-@@ -216,7 +217,11 @@
- 
-     /* Attach encoder and connector */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
-     ret = drm_mode_connector_attach_encoder(connector, encoder);
-+#else
-+    ret = drm_connector_attach_encoder(connector, encoder);
-+#endif
- 
-     if (ret != 0) {
-         NV_DRM_DEV_LOG_ERR(