Sync with repo-driver

3 files changed, 29 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 706013f7b624..9aa842719080 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nvidia-340xx-lqx
 	pkgdesc = NVIDIA 340xx drivers for linux-lqx.
 	pkgver = 340.102
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.nvidia.com/
 	install = nvidia-340xx-lqx.install
 	arch = i686
@@ -16,10 +16,12 @@ pkgbase = nvidia-340xx-lqx
 	conflicts = nvidia-lqx
 	conflicts = nvidia-304xx-lqx
 	options = !strip
+	source = fs52243.patch
+	sha512sums = de4f697d64f8e73c4aadec1a407884a6bc459c0020d4bfd19740fe4177a60bb801fe8a74ef6f7fa2e89c6cd648ea4daf152799ae344a145c06480a6eef0c5bca
 	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/340.102/NVIDIA-Linux-x86-340.102.run
-	md5sums_i686 = 61aad6a98238bc61466e6a9e392cfd08
+	sha512sums_i686 = bea700c925a6044fcded40324bb389c5fa1aadc40831f685a76e7b0ded11161f492960950c201467e564d157dcbe0c330d13a2014f51d0073002c5a262a6f0ca
 	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/340.102/NVIDIA-Linux-x86_64-340.102-no-compat32.run
-	md5sums_x86_64 = 81e720487caa2823586b32659da9acc1
+	sha512sums_x86_64 = 2a29e6418244ea384e4237d74057bd8e56247b1c503cf623dea34a3b1065d8783879aa7e6a802dd31f0a10cf81cfcab2a1b1a8269b97996f15fa1838c0a3a44b
 
 pkgname = nvidia-340xx-lqx
 
diff --git a/PKGBUILD b/PKGBUILD
index 2834e0fa9f28..0f3cc09893b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=nvidia-340xx-lqx
 pkgver=340.102
 _extramodules=extramodules-4.9-lqx
-pkgrel=1
+pkgrel=2
 _pkgdesc="NVIDIA 340xx drivers for linux-lqx."
 pkgdesc="$_pkgdesc"
 arch=('i686' 'x86_64')
@@ -16,11 +16,12 @@ conflicts=('nvidia-lqx' 'nvidia-304xx-lqx')
 license=('custom')
 install=nvidia-340xx-lqx.install
 options=(!strip)
+source=('fs52243.patch')
 source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
 source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums_i686=('61aad6a98238bc61466e6a9e392cfd08')
-md5sums_x86_64=('81e720487caa2823586b32659da9acc1')
-
+sha512sums=('de4f697d64f8e73c4aadec1a407884a6bc459c0020d4bfd19740fe4177a60bb801fe8a74ef6f7fa2e89c6cd648ea4daf152799ae344a145c06480a6eef0c5bca')
+sha512sums_i686=('bea700c925a6044fcded40324bb389c5fa1aadc40831f685a76e7b0ded11161f492960950c201467e564d157dcbe0c330d13a2014f51d0073002c5a262a6f0ca')
+sha512sums_x86_64=('2a29e6418244ea384e4237d74057bd8e56247b1c503cf623dea34a3b1065d8783879aa7e6a802dd31f0a10cf81cfcab2a1b1a8269b97996f15fa1838c0a3a44b')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -28,8 +29,11 @@ md5sums_x86_64=('81e720487caa2823586b32659da9acc1')
 prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
-		
-		cp -a kernel kernel-dkms
+    # patches here
+
+    patch -Np0 < "${srcdir}"/fs52243.patch
+
+    cp -a kernel kernel-dkms
 }
 
 
diff --git a/fs52243.patch b/fs52243.patch
new file mode 100644
index 000000000000..b6dc35a2e7ff
--- /dev/null
+++ b/fs52243.patch
@@ -0,0 +1,14 @@
+--- kernel/nv-drm.c	2016-12-15 12:41:26.000000000 +0100
++++ kernel/nv-drm.c	2016-12-15 12:58:48.000000000 +0100
+@@ -115,7 +115,11 @@
+ };
+ 
+ static struct drm_driver nv_drm_driver = {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++    .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,
++#else
+     .driver_features = DRIVER_GEM | DRIVER_PRIME,
++#endif
+     .load = nv_drm_load,
+     .unload = nv_drm_unload,
+     .fops = &nv_drm_fops,