From 0f7794af2e418e80ec2a9752326c6d7d98abb0d6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 3 Jan 2015 02:20:14 +0000 Subject: nvidia-340xx: initial inclusion 340.65 --- abs/core/nvidia-340xx/PKGBUILD | 51 ++++++++++++++++++++++++++++++ abs/core/nvidia-340xx/nv-drm.patch | 27 ++++++++++++++++ abs/core/nvidia-340xx/nvidia-340xx.install | 15 +++++++++ 3 files changed, 93 insertions(+) create mode 100644 abs/core/nvidia-340xx/PKGBUILD create mode 100644 abs/core/nvidia-340xx/nv-drm.patch create mode 100644 abs/core/nvidia-340xx/nvidia-340xx.install diff --git a/abs/core/nvidia-340xx/PKGBUILD b/abs/core/nvidia-340xx/PKGBUILD new file mode 100644 index 0000000..31c4ccf --- /dev/null +++ b/abs/core/nvidia-340xx/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $ +# Maintainer : Thomas Baechler + +pkgname=nvidia-340xx +pkgver=340.65 +_extramodules=extramodules-3.18-ARCH +pkgrel=6 +pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=3.18' 'linux<3.19' "nvidia-340xx-libgl" "nvidia-340xx-utils=${pkgver}") +makedepends=('linux-headers>=3.18' 'linux-headers<3.19') +conflicts=('nvidia') +license=('custom') +install=${pkgname}.install +options=(!strip) +source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" + "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" + nv-drm.patch) +md5sums=('4aa6039b8543312b41a924bb87b0b2db' + '4558104f8601d27c7fd3e5cec7892345' + '79671a27131da619a33eb02ed0c2c031') + +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" + +prepare() { + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + # patches here + patch -p0 -i ../nv-drm.patch +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module + + cd uvm + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package() { + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \ + "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko + install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} diff --git a/abs/core/nvidia-340xx/nv-drm.patch b/abs/core/nvidia-340xx/nv-drm.patch new file mode 100644 index 0000000..4c6a393 --- /dev/null +++ b/abs/core/nvidia-340xx/nv-drm.patch @@ -0,0 +1,27 @@ +--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200 ++++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200 +@@ -18,6 +18,11 @@ + + #include + ++/* 3.18-rc0+ */ ++#ifndef drm_gem_object ++#include ++#endif ++ + extern nv_linux_state_t *nv_linux_devices; + + struct nv_gem_object { +diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c +index ecc982a..60d7aae 100644 +--- kernel/nv-drm.c~ ++++ kernel/nv-drm.c +@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = { + .gem_prime_vmap = nv_gem_prime_vmap, + .gem_prime_vunmap = nv_gem_prime_vunmap, + ++ .set_busid = drm_pci_set_busid, ++ + .name = "nvidia-drm", + .desc = "NVIDIA DRM driver", + .date = "20130102", diff --git a/abs/core/nvidia-340xx/nvidia-340xx.install b/abs/core/nvidia-340xx/nvidia-340xx.install new file mode 100644 index 0000000..a83edad --- /dev/null +++ b/abs/core/nvidia-340xx/nvidia-340xx.install @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-3.18-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.18-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.18-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} -- cgit v0.12