diff options
| -rw-r--r-- | abs/core/nvidia/PKGBUILD | 21 | ||||
| -rw-r--r-- | abs/core/nvidia/nv-drm-343.36.patch | 14 | ||||
| -rw-r--r-- | abs/core/nvidia/nvidia.install | 6 |
3 files changed, 28 insertions, 13 deletions
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index 30ce01e..e571ddc 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -2,22 +2,23 @@ # Maintainer : Thomas Baechler <thomas@archlinux.org> pkgname=nvidia -pkgver=337.12 -_extramodules=extramodules-3.13-ARCH -pkgrel=1 +pkgver=343.36 +_extramodules=extramodules-3.18-ARCH +pkgrel=5 pkgdesc="NVIDIA drivers for linux" arch=('i686' 'x86_64') url="http://www.nvidia.com/" -depends=('linux>=3.13' 'linux<3.14' "nvidia-libgl" "nvidia-utils=${pkgver}") -makedepends=('linux-headers>=3.13' 'linux-headers<3.14') -conflicts=('nvidia-96xx' 'nvidia-173xx') +depends=('linux>=3.18' 'linux<3.19' "nvidia-libgl" "nvidia-utils=${pkgver}") +makedepends=('linux-headers>=3.18' 'linux-headers<3.19') license=('custom') install=nvidia.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") -md5sums=('c610d5bff8f7f758dc25fdd51b1b65eb' - '4c2aaac75c1ff01a09ac8f4ff84084cd') + "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" + nv-drm-343.36.patch) +md5sums=('eae5d5407df0b371929a76f96aec4020' + 'dfdf53ee8787455fe92a760ffa6badcb' + 'ff8a5f979e4428f8c847423fb007042c') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -26,6 +27,7 @@ prepare() { sh "${_pkg}.run" --extract-only cd "${_pkg}" # patches here + patch -p1 -i ../nv-drm-343.36.patch } build() { @@ -45,5 +47,4 @@ package() { 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" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" } diff --git a/abs/core/nvidia/nv-drm-343.36.patch b/abs/core/nvidia/nv-drm-343.36.patch new file mode 100644 index 0000000..4f96201 --- /dev/null +++ b/abs/core/nvidia/nv-drm-343.36.patch @@ -0,0 +1,14 @@ +diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c +index c0b41a0..700c193 100644 +--- a/kernel/nv-drm.c ++++ b/kernel/nv-drm.c +@@ -128,6 +128,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/nvidia.install b/abs/core/nvidia/nvidia.install index 86803bc..df14799 100644 --- a/abs/core/nvidia/nvidia.install +++ b/abs/core/nvidia/nvidia.install @@ -1,11 +1,11 @@ post_install() { - EXTRAMODULES='extramodules-3.13-ARCH' + 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.13-ARCH' + EXTRAMODULES='extramodules-3.18-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx' @@ -13,6 +13,6 @@ post_upgrade() { } post_remove() { - EXTRAMODULES='extramodules-3.13-ARCH' + EXTRAMODULES='extramodules-3.18-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } |