Date: Monday, September 28, 2015 @ 08:37:49 Author: tpowa Revision: 247558
db-move: moved nvidia-340xx from [testing] to [extra] (i686, x86_64) Added: nvidia-340xx/repos/extra-i686/PKGBUILD (from rev 247555, nvidia-340xx/repos/testing-i686/PKGBUILD) nvidia-340xx/repos/extra-i686/nv-drm.patch (from rev 247555, nvidia-340xx/repos/testing-i686/nv-drm.patch) nvidia-340xx/repos/extra-i686/nvidia-340xx-dkms.install (from rev 247555, nvidia-340xx/repos/testing-i686/nvidia-340xx-dkms.install) nvidia-340xx/repos/extra-i686/nvidia-340xx.install (from rev 247555, nvidia-340xx/repos/testing-i686/nvidia-340xx.install) nvidia-340xx/repos/extra-x86_64/PKGBUILD (from rev 247555, nvidia-340xx/repos/testing-x86_64/PKGBUILD) nvidia-340xx/repos/extra-x86_64/nv-drm.patch (from rev 247555, nvidia-340xx/repos/testing-x86_64/nv-drm.patch) nvidia-340xx/repos/extra-x86_64/nvidia-340xx-dkms.install (from rev 247555, nvidia-340xx/repos/testing-x86_64/nvidia-340xx-dkms.install) nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install (from rev 247555, nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install) Deleted: nvidia-340xx/repos/extra-i686/PKGBUILD nvidia-340xx/repos/extra-i686/nv-drm.patch nvidia-340xx/repos/extra-i686/nvidia-340xx.install nvidia-340xx/repos/extra-i686/nvidia-4.0.patch nvidia-340xx/repos/extra-x86_64/PKGBUILD nvidia-340xx/repos/extra-x86_64/nv-drm.patch nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install nvidia-340xx/repos/extra-x86_64/nvidia-4.0.patch nvidia-340xx/repos/testing-i686/ nvidia-340xx/repos/testing-x86_64/ ----------------------------------------+ /PKGBUILD | 140 +++++++++++++++++++++++++++++++ /nv-drm.patch | 54 +++++++++++ /nvidia-340xx.install | 26 +++++ extra-i686/PKGBUILD | 54 ----------- extra-i686/nv-drm.patch | 27 ----- extra-i686/nvidia-340xx-dkms.install | 30 ++++++ extra-i686/nvidia-340xx.install | 13 -- extra-i686/nvidia-4.0.patch | 28 ------ extra-x86_64/PKGBUILD | 54 ----------- extra-x86_64/nv-drm.patch | 27 ----- extra-x86_64/nvidia-340xx-dkms.install | 30 ++++++ extra-x86_64/nvidia-340xx.install | 13 -- extra-x86_64/nvidia-4.0.patch | 28 ------ 13 files changed, 280 insertions(+), 244 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-09-28 06:37:48 UTC (rev 247557) +++ extra-i686/PKGBUILD 2015-09-28 06:37:49 UTC (rev 247558) @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $ -# Maintainer : Thomas Baechler <tho...@archlinux.org> - -pkgname=nvidia-340xx -pkgver=340.76 -_extramodules=extramodules-4.1-ARCH -pkgrel=14 -pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux>=4.1' 'linux<4.2' 'libgl' "nvidia-340xx-utils=${pkgver}") -makedepends=('linux-headers>=4.1' 'linux-headers<4.2') -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 - nvidia-4.0.patch) -md5sums=('8064c0a0998c3e7ee3c98ac1832b8194' - '440df290e213280d6e20d4d4be6f8b4c' - '79671a27131da619a33eb02ed0c2c031' - 'f42bdf589f52d4e6c38baa5bef15eef8') - -[[ "$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 - patch -p0 -i ../nvidia-4.0.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" -} Copied: nvidia-340xx/repos/extra-i686/PKGBUILD (from rev 247555, nvidia-340xx/repos/testing-i686/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-09-28 06:37:49 UTC (rev 247558) @@ -0,0 +1,70 @@ +# $Id$ +# Maintainer : Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia-340xx +pkgname=(nvidia-340xx nvidia-340xx-dkms) +pkgver=340.93 +_extramodules=extramodules-4.2-ARCH +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.2' 'linux-headers<4.3') +conflicts=('nvidia') +license=('custom') +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=('4a7edf6838a80c77a57fb6f6ec7f0437' + 'cb80e3f1cb6f2fb6e6eab35fad0884e4' + '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_nvidia-340xx() { + pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" + depends=('linux>=4.2' 'linux<4.3' 'libgl' "nvidia-340xx-utils=${pkgver}") + conflict+=('nvidia-340xx-dkms') + install=nvidia-340xx.install + + 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" +} + +package_nvidia-340xx-dkms() { + pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch" + depends=('dkms' "nvidia-340xx-utils=$pkgver") + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflict+=('nvidia-340xx') + install=nvidia-340xx-dkms.install + + cd ${_pkg} + make -C kernel clean + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel "${pkgdir}"/usr/src/nvidia-${pkgver} + echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf + cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf +} Deleted: extra-i686/nv-drm.patch =================================================================== --- extra-i686/nv-drm.patch 2015-09-28 06:37:48 UTC (rev 247557) +++ extra-i686/nv-drm.patch 2015-09-28 06:37:49 UTC (rev 247558) @@ -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-340xx/repos/extra-i686/nv-drm.patch (from rev 247555, nvidia-340xx/repos/testing-i686/nv-drm.patch) =================================================================== --- extra-i686/nv-drm.patch (rev 0) +++ extra-i686/nv-drm.patch 2015-09-28 06:37:49 UTC (rev 247558) @@ -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", Copied: nvidia-340xx/repos/extra-i686/nvidia-340xx-dkms.install (from rev 247555, nvidia-340xx/repos/testing-i686/nvidia-340xx-dkms.install) =================================================================== --- extra-i686/nvidia-340xx-dkms.install (rev 0) +++ extra-i686/nvidia-340xx-dkms.install 2015-09-28 06:37:49 UTC (rev 247558) @@ -0,0 +1,30 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + dkms add nvidia/${1%-*} + cat << EOF +==> To build and install your modules run: dkms install nvidia/${1%-*} +==> To do this automatically at startup run: systemctl enable dkms.service +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: Deleted: extra-i686/nvidia-340xx.install =================================================================== --- extra-i686/nvidia-340xx.install 2015-09-28 06:37:48 UTC (rev 247557) +++ extra-i686/nvidia-340xx.install 2015-09-28 06:37:49 UTC (rev 247558) @@ -1,13 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-4.1-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: nvidia-340xx/repos/extra-i686/nvidia-340xx.install (from rev 247555, nvidia-340xx/repos/testing-i686/nvidia-340xx.install) =================================================================== --- extra-i686/nvidia-340xx.install (rev 0) +++ extra-i686/nvidia-340xx.install 2015-09-28 06:37:49 UTC (rev 247558) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.2-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-i686/nvidia-4.0.patch =================================================================== --- extra-i686/nvidia-4.0.patch 2015-09-28 06:37:48 UTC (rev 247557) +++ extra-i686/nvidia-4.0.patch 2015-09-28 06:37:49 UTC (rev 247558) @@ -1,28 +0,0 @@ ---- 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/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-09-28 06:37:48 UTC (rev 247557) +++ extra-x86_64/PKGBUILD 2015-09-28 06:37:49 UTC (rev 247558) @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $ -# Maintainer : Thomas Baechler <tho...@archlinux.org> - -pkgname=nvidia-340xx -pkgver=340.76 -_extramodules=extramodules-4.1-ARCH -pkgrel=14 -pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/" -depends=('linux>=4.1' 'linux<4.2' 'libgl' "nvidia-340xx-utils=${pkgver}") -makedepends=('linux-headers>=4.1' 'linux-headers<4.2') -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 - nvidia-4.0.patch) -md5sums=('8064c0a0998c3e7ee3c98ac1832b8194' - '440df290e213280d6e20d4d4be6f8b4c' - '79671a27131da619a33eb02ed0c2c031' - 'f42bdf589f52d4e6c38baa5bef15eef8') - -[[ "$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 - patch -p0 -i ../nvidia-4.0.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" -} Copied: nvidia-340xx/repos/extra-x86_64/PKGBUILD (from rev 247555, nvidia-340xx/repos/testing-x86_64/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-09-28 06:37:49 UTC (rev 247558) @@ -0,0 +1,70 @@ +# $Id$ +# Maintainer : Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia-340xx +pkgname=(nvidia-340xx nvidia-340xx-dkms) +pkgver=340.93 +_extramodules=extramodules-4.2-ARCH +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.2' 'linux-headers<4.3') +conflicts=('nvidia') +license=('custom') +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=('4a7edf6838a80c77a57fb6f6ec7f0437' + 'cb80e3f1cb6f2fb6e6eab35fad0884e4' + '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_nvidia-340xx() { + pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" + depends=('linux>=4.2' 'linux<4.3' 'libgl' "nvidia-340xx-utils=${pkgver}") + conflict+=('nvidia-340xx-dkms') + install=nvidia-340xx.install + + 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" +} + +package_nvidia-340xx-dkms() { + pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch" + depends=('dkms' "nvidia-340xx-utils=$pkgver") + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflict+=('nvidia-340xx') + install=nvidia-340xx-dkms.install + + cd ${_pkg} + make -C kernel clean + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel "${pkgdir}"/usr/src/nvidia-${pkgver} + echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf + cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf +} Deleted: extra-x86_64/nv-drm.patch =================================================================== --- extra-x86_64/nv-drm.patch 2015-09-28 06:37:48 UTC (rev 247557) +++ extra-x86_64/nv-drm.patch 2015-09-28 06:37:49 UTC (rev 247558) @@ -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-340xx/repos/extra-x86_64/nv-drm.patch (from rev 247555, nvidia-340xx/repos/testing-x86_64/nv-drm.patch) =================================================================== --- extra-x86_64/nv-drm.patch (rev 0) +++ extra-x86_64/nv-drm.patch 2015-09-28 06:37:49 UTC (rev 247558) @@ -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", Copied: nvidia-340xx/repos/extra-x86_64/nvidia-340xx-dkms.install (from rev 247555, nvidia-340xx/repos/testing-x86_64/nvidia-340xx-dkms.install) =================================================================== --- extra-x86_64/nvidia-340xx-dkms.install (rev 0) +++ extra-x86_64/nvidia-340xx-dkms.install 2015-09-28 06:37:49 UTC (rev 247558) @@ -0,0 +1,30 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + dkms add nvidia/${1%-*} + cat << EOF +==> To build and install your modules run: dkms install nvidia/${1%-*} +==> To do this automatically at startup run: systemctl enable dkms.service +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: Deleted: extra-x86_64/nvidia-340xx.install =================================================================== --- extra-x86_64/nvidia-340xx.install 2015-09-28 06:37:48 UTC (rev 247557) +++ extra-x86_64/nvidia-340xx.install 2015-09-28 06:37:49 UTC (rev 247558) @@ -1,13 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-4.1-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install (from rev 247555, nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install) =================================================================== --- extra-x86_64/nvidia-340xx.install (rev 0) +++ extra-x86_64/nvidia-340xx.install 2015-09-28 06:37:49 UTC (rev 247558) @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-4.2-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/nvidia-4.0.patch =================================================================== --- extra-x86_64/nvidia-4.0.patch 2015-09-28 06:37:48 UTC (rev 247557) +++ extra-x86_64/nvidia-4.0.patch 2015-09-28 06:37:49 UTC (rev 247558) @@ -1,28 +0,0 @@ ---- 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)