rm patch

4 files changed, 4 insertions, 144 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e6edfe5faf5..e6b05878d3b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,10 +9,8 @@ pkgbase = nvidia-full-beta
 	options = !strip
 	source = 10-nvidia-drm-outputclass.conf
 	source = 20-nvidia.conf
-	source = linux-4.11.patch
 	md5sums = 4f5562ee8f3171769e4638b35396c55d
 	md5sums = 2640eac092c220073f0668a7aaff61f7
-	md5sums = cc8941b6898d9daa0fb67371f57a56b6
 	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/384.59/NVIDIA-Linux-x86-384.59.run
 	md5sums_i686 = 8d2a2049d0509875c5dc0d9a0275aee4
 	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/384.59/NVIDIA-Linux-x86_64-384.59-no-compat32.run
diff --git a/.SRCINFOb b/.SRCINFOb
deleted file mode 100644
index 2f4ed2fde850..000000000000
--- a/.SRCINFOb
+++ /dev/null
@@ -1,114 +0,0 @@
-# Generated by mksrcinfo v8
-# Mon May  1 07:43:49 UTC 2017
-pkgbase = nvidia-full-beta
-	pkgver = 381.22
-	pkgrel = 1
-	url = http://www.nvidia.com/
-	arch = i686
-	arch = x86_64
-	license = custom:NVIDIA
-	makedepends = linux-headers
-	options = !strip
-	source = 10-nvidia-drm-outputclass.conf
-	source = 20-nvidia.conf
-	source = linux-4.11.patch
-	md5sums = 4f5562ee8f3171769e4638b35396c55d
-	md5sums = 2640eac092c220073f0668a7aaff61f7
-	md5sums = 897d9775dc484ab37934e7b102c5b325
-	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/381.22/NVIDIA-Linux-x86-381.09.run
-	md5sums_i686 = 8825cec1640739521689bd80121d1425
-	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/381.22/NVIDIA-Linux-x86_64-381.09-no-compat32.run
-	md5sums_x86_64 = 0e9590d48703c8baa034b6f0f8bbf1e5
-
-pkgname = nvidia-full-beta
-	pkgdesc = Full NVIDIA driver package for Arch's official 'linux' package (driver, utilities, and libraries) (beta version)
-	install = nvidia-full-beta.install
-	depends = linux
-	depends = nvidia-utils-full-beta>=381.22
-	depends = libgl
-	provides = nvidia=381.22
-	conflicts = nvidia-96xx
-	conflicts = nvidia-173xx
-	conflicts = nvidia
-
-pkgname = nvidia-utils-full-beta
-	pkgdesc = NVIDIA driver utilities and libraries for 'nvidia-full-beta'
-	install = nvidia-utils-full-beta.install
-	depends = xorg-server
-	depends = mesa>=17.0.2-2
-	optdepends = gtk2: nvidia-settings (GTK+ v2)
-	optdepends = gtk3: nvidia-settings (GTK+ v3)
-	optdepends = opencl-nvidia-full-beta: OpenCL support
-	optdepends = xorg-server-devel: nvidia-xconfig
-	optdepends = egl-wayland-git: for alternative, more advanced Wayland library (libnvidia-egl-wayland.so.1.0.1)
-	provides = nvidia-utils=381.22
-	provides = nvidia-settings=381.22
-	provides = libglvnd
-	provides = vulkan-driver
-	conflicts = nvidia-utils
-	conflicts = nvidia-settings
-	conflicts = libglvnd
-	backup = etc/X11/xorg.conf.d/20-nvidia.conf
-
-pkgname = nvidia-egl-wayland-full-beta
-	pkgdesc = NVIDIA EGL Wayland library (libnvidia-egl-wayland.so.1.0.1) for 'nvidia-utils-full-beta'
-	depends = nvidia-utils-full-beta
-	provides = egl-wayland
-	conflicts = egl-wayland
-
-pkgname = nvidia-libgl-full-beta
-	pkgdesc = NVIDIA driver library symlinks for 'nvidia-utils-full-beta'
-	depends = nvidia-utils-full-beta
-	provides = nvidia-libgl=381.22
-	provides = libgl
-	provides = libegl
-	provides = libgles
-	conflicts = nvidia-libgl
-	conflicts = libgl
-	conflicts = libegl
-	conflicts = libgles
-
-pkgname = opencl-nvidia-full-beta
-	pkgdesc = NVIDIA's OpenCL implemention for 'nvidia-utils-full-beta'
-	depends = zlib
-	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = opencl-nvidia=381.22
-	provides = opencl-driver
-	conflicts = opencl-nvidia
-
-pkgname = lib32-nvidia-utils-full-beta
-	pkgdesc = NVIDIA driver utilities and libraries for 'nvidia-full-beta' (32-bit)
-	depends = lib32-zlib
-	depends = lib32-gcc-libs
-	depends = nvidia-utils-full-beta
-	depends = lib32-mesa>=17.0.2-1
-	optdepends = lib32-opencl-nvidia-full-beta: OpenCL support
-	provides = lib32-nvidia-utils=381.22
-	provides = lib32-libglvnd
-	provides = lib32-vulkan-driver
-	conflicts = lib32-nvidia-utils
-	conflicts = lib32-libglvnd
-
-pkgname = lib32-nvidia-libgl-full-beta
-	pkgdesc = NVIDIA driver library symlinks for 'lib32-nvidia-utils-full-beta'
-	depends = lib32-nvidia-utils-full-beta
-	depends = nvidia-libgl-full-beta
-	provides = lib32-nvidia-libgl=381.22
-	provides = lib32-libgl
-	provides = lib32-libegl
-	provides = lib32-libgles
-	conflicts = lib32-nvidia-libgl
-	conflicts = lib32-libgl
-	conflicts = lib32-libegl
-	conflicts = lib32-libgles
-	replaces = lib32-nvidia-utils<=313.26-1
-
-pkgname = lib32-opencl-nvidia-full-beta
-	pkgdesc = NVIDIA's OpenCL implemention for 'lib32-nvidia-utils-full-beta'
-	depends = lib32-zlib
-	depends = lib32-gcc-libs
-	optdepends = opencl-headers: headers necessary for OpenCL development
-	provides = lib32-opencl-nvidia=381.22
-	provides = lib32-opencl-driver
-	conflicts = lib32-opencl-nvidia
-
diff --git a/PKGBUILD b/PKGBUILD
index 37c2cd4de3ae..833ebefad06e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,13 +27,13 @@ fi
 
 # Source
 source=('10-nvidia-drm-outputclass.conf'
-        '20-nvidia.conf'
-        'linux-4.11.patch')
+        '20-nvidia.conf')
+#        'linux-4.11.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/$_pkg.run")
 md5sums=('4f5562ee8f3171769e4638b35396c55d'
-         '2640eac092c220073f0668a7aaff61f7'
-         'cc8941b6898d9daa0fb67371f57a56b6')
+         '2640eac092c220073f0668a7aaff61f7')
+#         'cc8941b6898d9daa0fb67371f57a56b6')
 md5sums_i686=('8d2a2049d0509875c5dc0d9a0275aee4')
 md5sums_x86_64=('778318b0fd2d5d511474a8987cc7dbe5')
 [[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('0f42f6706da80d32574371c8a0894e60')
diff --git a/linux-4.11.patch b/linux-4.11.patch
deleted file mode 100644
index dd6e508cfea2..000000000000
--- a/linux-4.11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/kernel/nvidia-drm/nvidia-drm-linux.c
-+++ b/kernel/nvidia-drm/nvidia-drm-linux.c
-@@ -20,6 +20,8 @@
-  * DEALINGS IN THE SOFTWARE.
-  */
- 
-+#include <linux/version.h>
-+
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/err.h>
-@@ -196,7 +198,11 @@
- module_exit(nv_linux_drm_exit);
- 
- #if defined(MODULE_LICENSE)
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 10, 0)
-+  MODULE_LICENSE("Dual MIT/GPL");
-+#else
-   MODULE_LICENSE("MIT");
-+#endif
- #endif
- #if defined(MODULE_INFO)
-   MODULE_INFO(supported, "external");
-