From 56f39a2fbee1111b44cec4f9c34c6cfa084980e1 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 3 Jan 2015 02:33:21 +0000 Subject: nvidia-304xx: initial inclusion 304.125 --- abs/core/nvidia-304xx/PKGBUILD | 57 ++++++++++++++++++++++++++++++++++++ abs/core/nvidia-304xx/nv-drm.patch | 27 +++++++++++++++++ abs/core/nvidia-304xx/nvidia.install | 15 ++++++++++ 3 files changed, 99 insertions(+) create mode 100644 abs/core/nvidia-304xx/PKGBUILD create mode 100644 abs/core/nvidia-304xx/nv-drm.patch create mode 100644 abs/core/nvidia-304xx/nvidia.install diff --git a/abs/core/nvidia-304xx/PKGBUILD b/abs/core/nvidia-304xx/PKGBUILD new file mode 100644 index 0000000..0bc32cc --- /dev/null +++ b/abs/core/nvidia-304xx/PKGBUILD @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Felix Yan +# Contributor: Thomas Baechler + +pkgname=nvidia-304xx +pkgver=304.125 +_extramodules=extramodules-3.18-ARCH +pkgrel=5 +pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=3.18' 'linux<3.19' 'nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}") +makedepends=('linux-headers>=3.18' 'linux-headers<3.19') +conflicts=('nvidia') +license=('custom') +install=nvidia.install +options=(!strip) + +if [ "$CARCH" = "i686" ]; then + _arch='x86' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('bc3b0ac291fa998d5109a6f7e94fb2d4') +elif [ "$CARCH" = "x86_64" ]; then + _arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") + md5sums=('291d41ccdbcc08f752a38f9e0a7eeea0') +fi + +source+=('nv-drm.patch') +md5sums+=('79671a27131da619a33eb02ed0c2c031') + +prepare() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + # patches here + patch -p0 -i "$srcdir/nv-drm.patch" +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}/kernel" + 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 -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" + + # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time. +} diff --git a/abs/core/nvidia-304xx/nv-drm.patch b/abs/core/nvidia-304xx/nv-drm.patch new file mode 100644 index 0000000..4c6a393 --- /dev/null +++ b/abs/core/nvidia-304xx/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-304xx/nvidia.install b/abs/core/nvidia-304xx/nvidia.install new file mode 100644 index 0000000..a83edad --- /dev/null +++ b/abs/core/nvidia-304xx/nvidia.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