Date: Wednesday, April 29, 2015 @ 15:23:17 Author: tpowa Revision: 238255
db-move: moved nvidia-304xx from [testing] to [extra] (i686, x86_64) Added: nvidia-304xx/repos/extra-i686/PKGBUILD (from rev 238254, nvidia-304xx/repos/testing-i686/PKGBUILD) nvidia-304xx/repos/extra-i686/nv-drm.patch (from rev 238254, nvidia-304xx/repos/testing-i686/nv-drm.patch) nvidia-304xx/repos/extra-i686/nvidia-3.19.patch (from rev 238254, nvidia-304xx/repos/testing-i686/nvidia-3.19.patch) nvidia-304xx/repos/extra-i686/nvidia-4.0.patch (from rev 238254, nvidia-304xx/repos/testing-i686/nvidia-4.0.patch) nvidia-304xx/repos/extra-i686/nvidia.install (from rev 238254, nvidia-304xx/repos/testing-i686/nvidia.install) nvidia-304xx/repos/extra-x86_64/PKGBUILD (from rev 238254, nvidia-304xx/repos/testing-x86_64/PKGBUILD) nvidia-304xx/repos/extra-x86_64/nv-drm.patch (from rev 238254, nvidia-304xx/repos/testing-x86_64/nv-drm.patch) nvidia-304xx/repos/extra-x86_64/nvidia-3.19.patch (from rev 238254, nvidia-304xx/repos/testing-x86_64/nvidia-3.19.patch) nvidia-304xx/repos/extra-x86_64/nvidia-4.0.patch (from rev 238254, nvidia-304xx/repos/testing-x86_64/nvidia-4.0.patch) nvidia-304xx/repos/extra-x86_64/nvidia.install (from rev 238254, nvidia-304xx/repos/testing-x86_64/nvidia.install) Deleted: nvidia-304xx/repos/extra-i686/PKGBUILD nvidia-304xx/repos/extra-i686/nv-drm.patch nvidia-304xx/repos/extra-i686/nvidia-3.19.patch nvidia-304xx/repos/extra-i686/nvidia.install nvidia-304xx/repos/extra-x86_64/PKGBUILD nvidia-304xx/repos/extra-x86_64/nv-drm.patch nvidia-304xx/repos/extra-x86_64/nvidia-3.19.patch nvidia-304xx/repos/extra-x86_64/nvidia.install nvidia-304xx/repos/testing-i686/ nvidia-304xx/repos/testing-x86_64/ --------------------------------+ /PKGBUILD | 114 +++++++++++++++++++++++++++++++++++++++ /nv-drm.patch | 54 ++++++++++++++++++ /nvidia-3.19.patch | 42 ++++++++++++++ /nvidia.install | 30 ++++++++++ extra-i686/PKGBUILD | 58 ------------------- extra-i686/nv-drm.patch | 27 --------- extra-i686/nvidia-3.19.patch | 21 ------- extra-i686/nvidia-4.0.patch | 28 +++++++++ extra-i686/nvidia.install | 15 ----- extra-x86_64/PKGBUILD | 58 ------------------- extra-x86_64/nv-drm.patch | 27 --------- extra-x86_64/nvidia-3.19.patch | 21 ------- extra-x86_64/nvidia-4.0.patch | 28 +++++++++ extra-x86_64/nvidia.install | 15 ----- 14 files changed, 296 insertions(+), 242 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-04-29 13:23:01 UTC (rev 238254) +++ extra-i686/PKGBUILD 2015-04-29 13:23:17 UTC (rev 238255) @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Thomas Baechler <tho...@archlinux.org> - -pkgname=nvidia-304xx -pkgver=304.125 -_extramodules=extramodules-3.19-ARCH -pkgrel=14 -pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux>=3.19' 'linux<3.20' 'libgl' "nvidia-304xx-utils=${pkgver}") -makedepends=('linux-headers>=3.19' 'linux-headers<3.20') -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' 'nvidia-3.19.patch') -md5sums+=('79671a27131da619a33eb02ed0c2c031' 'd14e651d20054d18e0360c157ae60ae4') - -prepare() { - cd "${srcdir}" - sh "${_pkg}.run" --extract-only - cd "${_pkg}" - # patches here - patch -p0 -i "$srcdir/nv-drm.patch" - patch -p1 -i "$srcdir/nvidia-3.19.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. -} Copied: nvidia-304xx/repos/extra-i686/PKGBUILD (from rev 238254, nvidia-304xx/repos/testing-i686/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-04-29 13:23:17 UTC (rev 238255) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgname=nvidia-304xx +pkgver=304.125 +_extramodules=extramodules-4.0-ARCH +pkgrel=15 +pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=4.0' 'linux<4.1' 'libgl' "nvidia-304xx-utils=${pkgver}") +makedepends=('linux-headers>=4.0' 'linux-headers<4.1') +conflicts=('nvidia') +license=('custom') +install=nvidia.install +options=(!strip) +source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" + "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" + 'nv-drm.patch' + 'nvidia-3.19.patch' + 'nvidia-4.0.patch') +sha512sums=('cd77736790876b66c1e88bf30b7a93f755c0f94118edda8fde1701dc07dc4eb60f89a27b0ed432db74729f269cb239f32f3c5e045d701f60baf69da7fc0d0ea7' + '3b50d1353ff6cfee9042455b78e889c198e40dfe832dde79eda1a47d9f1f02b29f0161f1ac694dc7502eb2a94bad6b98244568cc353f387b02de6cae1c17d4ae' + 'aaa36ef7179acdc86850381de145a3aebab22273cd3c702a9d1343dc3415192c74a35da692312555f36193c5d46a1771ce07ea9508113cb9d0698873064aa19f' + 'f52a9f82a73eef9e27046c51ce0b2671ee2893f9b12e17c722f17416c39ac0b8d7d5b1fed51b6ab6f36670b036cd96d5cfeae37300ef041c029fd3d3d136ff3d' + 'd00a2a4c5bf38041cf9e4f61aa0ad0d6123451839eb272c36d7e466d77b33d90415cfa6f96a3a9da8688a1048e93a03169f808e6b2ddc2d9d148bab8485dae27') + +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" + +prepare() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + # patches here + patch -p0 -i "$srcdir/nv-drm.patch" + patch -p1 -i "$srcdir/nvidia-3.19.patch" + patch -p0 -i "$srcdir/nvidia-4.0.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. +} Deleted: extra-i686/nv-drm.patch =================================================================== --- extra-i686/nv-drm.patch 2015-04-29 13:23:01 UTC (rev 238254) +++ extra-i686/nv-drm.patch 2015-04-29 13:23:17 UTC (rev 238255) @@ -1,27 +0,0 @@ ---- 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 <drm/drmP.h> - -+/* 3.18-rc0+ */ -+#ifndef drm_gem_object -+#include <drm/drm_gem.h> -+#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", Copied: nvidia-304xx/repos/extra-i686/nv-drm.patch (from rev 238254, nvidia-304xx/repos/testing-i686/nv-drm.patch) =================================================================== --- extra-i686/nv-drm.patch (rev 0) +++ extra-i686/nv-drm.patch 2015-04-29 13:23:17 UTC (rev 238255) @@ -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 <drm/drmP.h> + ++/* 3.18-rc0+ */ ++#ifndef drm_gem_object ++#include <drm/drm_gem.h> ++#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", Deleted: extra-i686/nvidia-3.19.patch =================================================================== --- extra-i686/nvidia-3.19.patch 2015-04-29 13:23:01 UTC (rev 238254) +++ extra-i686/nvidia-3.19.patch 2015-04-29 13:23:17 UTC (rev 238255) @@ -1,21 +0,0 @@ -diff -Npur NVIDIA-Linux-x86_64-304.orig/kernel/nv.c NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c ---- NVIDIA-Linux-x86_64-304.orig/kernel/nv.c 2014-12-02 04:58:34.000000000 +0100 -+++ NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c 2014-12-21 17:50:33.420697348 +0100 -@@ -2026,7 +2026,7 @@ long nv_kern_unlocked_ioctl( - unsigned long i_arg - ) - { -- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); -+ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); - } - - long nv_kern_compat_ioctl( -@@ -2035,7 +2035,7 @@ long nv_kern_compat_ioctl( - unsigned long i_arg - ) - { -- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); -+ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); - } - - /* Copied: nvidia-304xx/repos/extra-i686/nvidia-3.19.patch (from rev 238254, nvidia-304xx/repos/testing-i686/nvidia-3.19.patch) =================================================================== --- extra-i686/nvidia-3.19.patch (rev 0) +++ extra-i686/nvidia-3.19.patch 2015-04-29 13:23:17 UTC (rev 238255) @@ -0,0 +1,21 @@ +diff -Npur NVIDIA-Linux-x86_64-304.orig/kernel/nv.c NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c +--- NVIDIA-Linux-x86_64-304.orig/kernel/nv.c 2014-12-02 04:58:34.000000000 +0100 ++++ NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c 2014-12-21 17:50:33.420697348 +0100 +@@ -2026,7 +2026,7 @@ long nv_kern_unlocked_ioctl( + unsigned long i_arg + ) + { +- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); ++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); + } + + long nv_kern_compat_ioctl( +@@ -2035,7 +2035,7 @@ long nv_kern_compat_ioctl( + unsigned long i_arg + ) + { +- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); ++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); + } + + /* Copied: nvidia-304xx/repos/extra-i686/nvidia-4.0.patch (from rev 238254, nvidia-304xx/repos/testing-i686/nvidia-4.0.patch) =================================================================== --- extra-i686/nvidia-4.0.patch (rev 0) +++ extra-i686/nvidia-4.0.patch 2015-04-29 13:23:17 UTC (rev 238255) @@ -0,0 +1,28 @@ +--- kernel/nv-pat.c~ 2015-02-22 20:39:43.889075396 -0800 ++++ kernel/nv-pat.c 2015-02-22 20:29:33.519735577 -0800 +@@ -35,8 +35,13 @@ + unsigned long cr0 = read_cr0(); + write_cr0(((cr0 & (0xdfffffff)) | 0x40000000)); + wbinvd(); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) ++ *cr4 = __read_cr4(); ++ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80); ++#else + *cr4 = read_cr4(); + if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80); ++#endif + __flush_tlb(); + } + +@@ -46,7 +46,11 @@ + wbinvd(); + __flush_tlb(); + write_cr0((cr0 & 0x9fffffff)); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) ++ if (cr4 & 0x80) __write_cr4(cr4); ++#else + if (cr4 & 0x80) write_cr4(cr4); ++#endif + } + + static int nv_determine_pat_mode(void) Deleted: extra-i686/nvidia.install =================================================================== --- extra-i686/nvidia.install 2015-04-29 13:23:01 UTC (rev 238254) +++ extra-i686/nvidia.install 2015-04-29 13:23:17 UTC (rev 238255) @@ -1,15 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.19-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.19-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.19-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} Copied: nvidia-304xx/repos/extra-i686/nvidia.install (from rev 238254, nvidia-304xx/repos/testing-i686/nvidia.install) =================================================================== --- extra-i686/nvidia.install (rev 0) +++ extra-i686/nvidia.install 2015-04-29 13:23:17 UTC (rev 238255) @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-4.0-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-4.0-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-4.0-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-04-29 13:23:01 UTC (rev 238254) +++ extra-x86_64/PKGBUILD 2015-04-29 13:23:17 UTC (rev 238255) @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Thomas Baechler <tho...@archlinux.org> - -pkgname=nvidia-304xx -pkgver=304.125 -_extramodules=extramodules-3.19-ARCH -pkgrel=14 -pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux>=3.19' 'linux<3.20' 'libgl' "nvidia-304xx-utils=${pkgver}") -makedepends=('linux-headers>=3.19' 'linux-headers<3.20') -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' 'nvidia-3.19.patch') -md5sums+=('79671a27131da619a33eb02ed0c2c031' 'd14e651d20054d18e0360c157ae60ae4') - -prepare() { - cd "${srcdir}" - sh "${_pkg}.run" --extract-only - cd "${_pkg}" - # patches here - patch -p0 -i "$srcdir/nv-drm.patch" - patch -p1 -i "$srcdir/nvidia-3.19.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. -} Copied: nvidia-304xx/repos/extra-x86_64/PKGBUILD (from rev 238254, nvidia-304xx/repos/testing-x86_64/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-04-29 13:23:17 UTC (rev 238255) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgname=nvidia-304xx +pkgver=304.125 +_extramodules=extramodules-4.0-ARCH +pkgrel=15 +pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=4.0' 'linux<4.1' 'libgl' "nvidia-304xx-utils=${pkgver}") +makedepends=('linux-headers>=4.0' 'linux-headers<4.1') +conflicts=('nvidia') +license=('custom') +install=nvidia.install +options=(!strip) +source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" + "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" + 'nv-drm.patch' + 'nvidia-3.19.patch' + 'nvidia-4.0.patch') +sha512sums=('cd77736790876b66c1e88bf30b7a93f755c0f94118edda8fde1701dc07dc4eb60f89a27b0ed432db74729f269cb239f32f3c5e045d701f60baf69da7fc0d0ea7' + '3b50d1353ff6cfee9042455b78e889c198e40dfe832dde79eda1a47d9f1f02b29f0161f1ac694dc7502eb2a94bad6b98244568cc353f387b02de6cae1c17d4ae' + 'aaa36ef7179acdc86850381de145a3aebab22273cd3c702a9d1343dc3415192c74a35da692312555f36193c5d46a1771ce07ea9508113cb9d0698873064aa19f' + 'f52a9f82a73eef9e27046c51ce0b2671ee2893f9b12e17c722f17416c39ac0b8d7d5b1fed51b6ab6f36670b036cd96d5cfeae37300ef041c029fd3d3d136ff3d' + 'd00a2a4c5bf38041cf9e4f61aa0ad0d6123451839eb272c36d7e466d77b33d90415cfa6f96a3a9da8688a1048e93a03169f808e6b2ddc2d9d148bab8485dae27') + +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" + +prepare() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + # patches here + patch -p0 -i "$srcdir/nv-drm.patch" + patch -p1 -i "$srcdir/nvidia-3.19.patch" + patch -p0 -i "$srcdir/nvidia-4.0.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. +} Deleted: extra-x86_64/nv-drm.patch =================================================================== --- extra-x86_64/nv-drm.patch 2015-04-29 13:23:01 UTC (rev 238254) +++ extra-x86_64/nv-drm.patch 2015-04-29 13:23:17 UTC (rev 238255) @@ -1,27 +0,0 @@ ---- 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 <drm/drmP.h> - -+/* 3.18-rc0+ */ -+#ifndef drm_gem_object -+#include <drm/drm_gem.h> -+#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", Copied: nvidia-304xx/repos/extra-x86_64/nv-drm.patch (from rev 238254, nvidia-304xx/repos/testing-x86_64/nv-drm.patch) =================================================================== --- extra-x86_64/nv-drm.patch (rev 0) +++ extra-x86_64/nv-drm.patch 2015-04-29 13:23:17 UTC (rev 238255) @@ -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 <drm/drmP.h> + ++/* 3.18-rc0+ */ ++#ifndef drm_gem_object ++#include <drm/drm_gem.h> ++#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", Deleted: extra-x86_64/nvidia-3.19.patch =================================================================== --- extra-x86_64/nvidia-3.19.patch 2015-04-29 13:23:01 UTC (rev 238254) +++ extra-x86_64/nvidia-3.19.patch 2015-04-29 13:23:17 UTC (rev 238255) @@ -1,21 +0,0 @@ -diff -Npur NVIDIA-Linux-x86_64-304.orig/kernel/nv.c NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c ---- NVIDIA-Linux-x86_64-304.orig/kernel/nv.c 2014-12-02 04:58:34.000000000 +0100 -+++ NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c 2014-12-21 17:50:33.420697348 +0100 -@@ -2026,7 +2026,7 @@ long nv_kern_unlocked_ioctl( - unsigned long i_arg - ) - { -- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); -+ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); - } - - long nv_kern_compat_ioctl( -@@ -2035,7 +2035,7 @@ long nv_kern_compat_ioctl( - unsigned long i_arg - ) - { -- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); -+ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); - } - - /* Copied: nvidia-304xx/repos/extra-x86_64/nvidia-3.19.patch (from rev 238254, nvidia-304xx/repos/testing-x86_64/nvidia-3.19.patch) =================================================================== --- extra-x86_64/nvidia-3.19.patch (rev 0) +++ extra-x86_64/nvidia-3.19.patch 2015-04-29 13:23:17 UTC (rev 238255) @@ -0,0 +1,21 @@ +diff -Npur NVIDIA-Linux-x86_64-304.orig/kernel/nv.c NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c +--- NVIDIA-Linux-x86_64-304.orig/kernel/nv.c 2014-12-02 04:58:34.000000000 +0100 ++++ NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c 2014-12-21 17:50:33.420697348 +0100 +@@ -2026,7 +2026,7 @@ long nv_kern_unlocked_ioctl( + unsigned long i_arg + ) + { +- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); ++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); + } + + long nv_kern_compat_ioctl( +@@ -2035,7 +2035,7 @@ long nv_kern_compat_ioctl( + unsigned long i_arg + ) + { +- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); ++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); + } + + /* Copied: nvidia-304xx/repos/extra-x86_64/nvidia-4.0.patch (from rev 238254, nvidia-304xx/repos/testing-x86_64/nvidia-4.0.patch) =================================================================== --- extra-x86_64/nvidia-4.0.patch (rev 0) +++ extra-x86_64/nvidia-4.0.patch 2015-04-29 13:23:17 UTC (rev 238255) @@ -0,0 +1,28 @@ +--- kernel/nv-pat.c~ 2015-02-22 20:39:43.889075396 -0800 ++++ kernel/nv-pat.c 2015-02-22 20:29:33.519735577 -0800 +@@ -35,8 +35,13 @@ + unsigned long cr0 = read_cr0(); + write_cr0(((cr0 & (0xdfffffff)) | 0x40000000)); + wbinvd(); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) ++ *cr4 = __read_cr4(); ++ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80); ++#else + *cr4 = read_cr4(); + if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80); ++#endif + __flush_tlb(); + } + +@@ -46,7 +46,11 @@ + wbinvd(); + __flush_tlb(); + write_cr0((cr0 & 0x9fffffff)); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) ++ if (cr4 & 0x80) __write_cr4(cr4); ++#else + if (cr4 & 0x80) write_cr4(cr4); ++#endif + } + + static int nv_determine_pat_mode(void) Deleted: extra-x86_64/nvidia.install =================================================================== --- extra-x86_64/nvidia.install 2015-04-29 13:23:01 UTC (rev 238254) +++ extra-x86_64/nvidia.install 2015-04-29 13:23:17 UTC (rev 238255) @@ -1,15 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.19-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.19-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.19-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} Copied: nvidia-304xx/repos/extra-x86_64/nvidia.install (from rev 238254, nvidia-304xx/repos/testing-x86_64/nvidia.install) =================================================================== --- extra-x86_64/nvidia.install (rev 0) +++ extra-x86_64/nvidia.install 2015-04-29 13:23:17 UTC (rev 238255) @@ -0,0 +1,15 @@ +post_install() { + EXTRAMODULES='extramodules-4.0-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + EXTRAMODULES='extramodules-4.0-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-4.0-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +}