From 35743be687b481f8c119cf6c50d3f9abcb267853 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Thu, 16 Nov 2017 10:32:46 +0100 Subject: [PATCH] nvidia340: fix building with linux4.14 (#9228) renames drm_pci_init to drm_legacy_pci_init in the driver, the function has been deprecated and renamed in https://github.com/torvalds/linux/commit/10631d724deff712343d96dd3017cd323349f761 . Original patch written by MilhouseVH via https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0010-kernel-4.14.patch . --- srcpkgs/nvidia340/files/kernel-4.14.patch | 26 +++++++++++++++++++++++ srcpkgs/nvidia340/template | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/nvidia340/files/kernel-4.14.patch diff --git a/srcpkgs/nvidia340/files/kernel-4.14.patch b/srcpkgs/nvidia340/files/kernel-4.14.patch new file mode 100644 index 00000000000..a733817e83a --- /dev/null +++ b/srcpkgs/nvidia340/files/kernel-4.14.patch @@ -0,0 +1,26 @@ +--- kernel/nv-drm.c.orig 2017-11-15 21:28:26.896689841 +0100 ++++ kernel/nv-drm.c 2017-11-15 21:31:01.579707509 +0100 +@@ -173,7 +173,11 @@ + { + int ret = 0; + #if defined(NV_DRM_AVAILABLE) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) + ret = drm_pci_init(&nv_drm_driver, pci_driver); ++#else ++ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver); ++#endif + #endif + return ret; + } +@@ -183,7 +187,11 @@ + ) + { + #if defined(NV_DRM_AVAILABLE) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) + drm_pci_exit(&nv_drm_driver, pci_driver); ++#else ++ drm_legacy_pci_exit(&nv_drm_driver, pci_driver); ++#endif + #endif + } + diff --git a/srcpkgs/nvidia340/template b/srcpkgs/nvidia340/template index f62f5f753cd..65ac5a83571 100644 --- a/srcpkgs/nvidia340/template +++ b/srcpkgs/nvidia340/template @@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GeForce 8, 9, 9M, 100, 100M, 200, 300 series)" pkgname=nvidia340 version=340.104 -revision=2 +revision=3 maintainer="Juan RP " license="Proprietary NVIDIA license" homepage="http://www.nvidia.com" @@ -41,6 +41,7 @@ do_extract() { do_configure() { cd ${_pkg} patch -p0 < ${FILESDIR}/kernel-4.11.patch + patch -p0 < ${FILESDIR}/kernel-4.14.patch } do_install() {