Date: Sunday, December 21, 2014 @ 05:39:44 Author: fyan Revision: 227856
archrelease: copy trunk to testing-i686, testing-x86_64 Added: nvidia-340xx/repos/testing-i686/PKGBUILD (from rev 227855, nvidia-340xx/trunk/PKGBUILD) nvidia-340xx/repos/testing-i686/nv-drm.patch (from rev 227855, nvidia-340xx/trunk/nv-drm.patch) nvidia-340xx/repos/testing-i686/nvidia-340xx.install (from rev 227855, nvidia-340xx/trunk/nvidia-340xx.install) nvidia-340xx/repos/testing-x86_64/PKGBUILD (from rev 227855, nvidia-340xx/trunk/PKGBUILD) nvidia-340xx/repos/testing-x86_64/nv-drm.patch (from rev 227855, nvidia-340xx/trunk/nv-drm.patch) nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install (from rev 227855, nvidia-340xx/trunk/nvidia-340xx.install) Deleted: nvidia-340xx/repos/testing-i686/PKGBUILD nvidia-340xx/repos/testing-i686/nvidia-340xx.install nvidia-340xx/repos/testing-x86_64/PKGBUILD nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install -------------------------------------+ /PKGBUILD | 102 ++++++++++++++++++++++++++++++++++ /nvidia-340xx.install | 30 ++++++++++ testing-i686/PKGBUILD | 48 ---------------- testing-i686/nv-drm.patch | 27 +++++++++ testing-i686/nvidia-340xx.install | 15 ----- testing-x86_64/PKGBUILD | 48 ---------------- testing-x86_64/nv-drm.patch | 27 +++++++++ testing-x86_64/nvidia-340xx.install | 15 ----- 8 files changed, 186 insertions(+), 126 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2014-12-21 04:39:21 UTC (rev 227855) +++ testing-i686/PKGBUILD 2014-12-21 04:39:44 UTC (rev 227856) @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $ -# Maintainer : Thomas Baechler <tho...@archlinux.org> - -pkgname=nvidia-340xx -pkgver=340.65 -_extramodules=extramodules-3.18-ARCH -pkgrel=5 -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") -md5sums=('4aa6039b8543312b41a924bb87b0b2db' - '4558104f8601d27c7fd3e5cec7892345') - -[[ "$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 -} - -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/testing-i686/PKGBUILD (from rev 227855, nvidia-340xx/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2014-12-21 04:39:44 UTC (rev 227856) @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $ +# Maintainer : Thomas Baechler <tho...@archlinux.org> + +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" +} Copied: nvidia-340xx/repos/testing-i686/nv-drm.patch (from rev 227855, nvidia-340xx/trunk/nv-drm.patch) =================================================================== --- testing-i686/nv-drm.patch (rev 0) +++ testing-i686/nv-drm.patch 2014-12-21 04:39:44 UTC (rev 227856) @@ -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: testing-i686/nvidia-340xx.install =================================================================== --- testing-i686/nvidia-340xx.install 2014-12-21 04:39:21 UTC (rev 227855) +++ testing-i686/nvidia-340xx.install 2014-12-21 04:39:44 UTC (rev 227856) @@ -1,15 +0,0 @@ -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) -} Copied: nvidia-340xx/repos/testing-i686/nvidia-340xx.install (from rev 227855, nvidia-340xx/trunk/nvidia-340xx.install) =================================================================== --- testing-i686/nvidia-340xx.install (rev 0) +++ testing-i686/nvidia-340xx.install 2014-12-21 04:39:44 UTC (rev 227856) @@ -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) +} Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2014-12-21 04:39:21 UTC (rev 227855) +++ testing-x86_64/PKGBUILD 2014-12-21 04:39:44 UTC (rev 227856) @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $ -# Maintainer : Thomas Baechler <tho...@archlinux.org> - -pkgname=nvidia-340xx -pkgver=340.65 -_extramodules=extramodules-3.18-ARCH -pkgrel=5 -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") -md5sums=('4aa6039b8543312b41a924bb87b0b2db' - '4558104f8601d27c7fd3e5cec7892345') - -[[ "$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 -} - -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/testing-x86_64/PKGBUILD (from rev 227855, nvidia-340xx/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2014-12-21 04:39:44 UTC (rev 227856) @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $ +# Maintainer : Thomas Baechler <tho...@archlinux.org> + +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" +} Copied: nvidia-340xx/repos/testing-x86_64/nv-drm.patch (from rev 227855, nvidia-340xx/trunk/nv-drm.patch) =================================================================== --- testing-x86_64/nv-drm.patch (rev 0) +++ testing-x86_64/nv-drm.patch 2014-12-21 04:39:44 UTC (rev 227856) @@ -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: testing-x86_64/nvidia-340xx.install =================================================================== --- testing-x86_64/nvidia-340xx.install 2014-12-21 04:39:21 UTC (rev 227855) +++ testing-x86_64/nvidia-340xx.install 2014-12-21 04:39:44 UTC (rev 227856) @@ -1,15 +0,0 @@ -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) -} Copied: nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install (from rev 227855, nvidia-340xx/trunk/nvidia-340xx.install) =================================================================== --- testing-x86_64/nvidia-340xx.install (rev 0) +++ testing-x86_64/nvidia-340xx.install 2014-12-21 04:39:44 UTC (rev 227856) @@ -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) +}