diff options
Diffstat (limited to 'abs/core/nvidia-340xx')
| -rw-r--r-- | abs/core/nvidia-340xx/PKGBUILD | 16 | ||||
| -rw-r--r-- | abs/core/nvidia-340xx/kernel-4.14.patch | 29 |
2 files changed, 7 insertions, 38 deletions
diff --git a/abs/core/nvidia-340xx/PKGBUILD b/abs/core/nvidia-340xx/PKGBUILD index 4e5bcb4..9aa0933 100644 --- a/abs/core/nvidia-340xx/PKGBUILD +++ b/abs/core/nvidia-340xx/PKGBUILD @@ -4,9 +4,9 @@ pkgbase=nvidia-340xx pkgname=(nvidia-340xx nvidia-340xx-dkms) -pkgver=340.104 +pkgver=340.106 _extramodules=extramodules-4.9-ARCH -pkgrel=9 +pkgrel=10 pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" arch=('x86_64') url="http://www.nvidia.com/" @@ -15,10 +15,9 @@ conflicts=('nvidia') 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.11.patch' 'kernel-4.14.patch') -sha512sums=('e962494561728af5a911354bfb3560e414464f7858f30f9654eac5ca56175bc8498d1eee93a18248c63e9eee7d84807ef924fe9f53239644d7085b0f3502bf8c' - 'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2' - 'ccaa40e085d985ec4280003e36dd06e60958ed1408867379fd21a68a18d48aa4be311bf9ad1e804f7a7245c90be98e919d2ec30f45d290f1cdb19c866bdb8a8d') + 'kernel-4.11.patch') +sha512sums=('ea61d463148435b6c0d16203c06372e5dc93443607ece0709f789c5c08909a3ec51c1994df97b835bba58008cdc7fe588e403006eb00631482a2a9854a81ec0a' + 'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2') _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -28,7 +27,6 @@ prepare() { # patches here patch -Np0 < "${srcdir}/kernel-4.11.patch" - patch -Np1 < "${srcdir}/kernel-4.14.patch" cp -a kernel kernel-dkms } @@ -53,7 +51,7 @@ package_nvidia-340xx() { find "${pkgdir}" -name '*.ko' -exec gzip -n {} + echo "blacklist nouveau" | - install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" } package_nvidia-340xx-dkms() { @@ -70,5 +68,5 @@ package_nvidia-340xx-dkms() { cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf echo "blacklist nouveau" | - install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" } diff --git a/abs/core/nvidia-340xx/kernel-4.14.patch b/abs/core/nvidia-340xx/kernel-4.14.patch deleted file mode 100644 index a38adbd..0000000 --- a/abs/core/nvidia-340xx/kernel-4.14.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -u -r NVIDIA-Linux-x86_64-340.104-no-compat32/kernel/nv-drm.c NVIDIA-Linux-x86_64-340.104-no-compat32-kernel4.14/kernel/nv-drm.c ---- NVIDIA-Linux-x86_64-340.104-no-compat32/kernel/nv-drm.c 2017-09-15 01:16:51.000000000 +0200 -+++ NVIDIA-Linux-x86_64-340.104-no-compat32-kernel4.14/kernel/nv-drm.c 2017-11-19 00:51:45.006654148 +0100 -@@ -173,8 +173,12 @@ - { - int ret = 0; - #if defined(NV_DRM_AVAILABLE) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) -+ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver); -+#else - ret = drm_pci_init(&nv_drm_driver, pci_driver); - #endif -+#endif - return ret; - } - -@@ -183,8 +187,12 @@ - ) - { - #if defined(NV_DRM_AVAILABLE) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) -+ drm_legacy_pci_exit(&nv_drm_driver, pci_driver); -+#else - drm_pci_exit(&nv_drm_driver, pci_driver); - #endif -+#endif - } - - RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle( |