Date: Monday, February 9, 2015 @ 08:45:51 Author: fyan Revision: 231179
archrelease: copy trunk to testing-i686, testing-x86_64 Added: nvidia-304xx/repos/testing-i686/ nvidia-304xx/repos/testing-i686/PKGBUILD (from rev 231178, nvidia-304xx/trunk/PKGBUILD) nvidia-304xx/repos/testing-i686/nv-drm.patch (from rev 231178, nvidia-304xx/trunk/nv-drm.patch) nvidia-304xx/repos/testing-i686/nvidia-3.19.patch (from rev 231178, nvidia-304xx/trunk/nvidia-3.19.patch) nvidia-304xx/repos/testing-i686/nvidia.install (from rev 231178, nvidia-304xx/trunk/nvidia.install) nvidia-304xx/repos/testing-x86_64/ nvidia-304xx/repos/testing-x86_64/PKGBUILD (from rev 231178, nvidia-304xx/trunk/PKGBUILD) nvidia-304xx/repos/testing-x86_64/nv-drm.patch (from rev 231178, nvidia-304xx/trunk/nv-drm.patch) nvidia-304xx/repos/testing-x86_64/nvidia-3.19.patch (from rev 231178, nvidia-304xx/trunk/nvidia-3.19.patch) nvidia-304xx/repos/testing-x86_64/nvidia.install (from rev 231178, nvidia-304xx/trunk/nvidia.install) ----------------------------------+ testing-i686/PKGBUILD | 58 +++++++++++++++++++++++++++++++++++++ testing-i686/nv-drm.patch | 27 +++++++++++++++++ testing-i686/nvidia-3.19.patch | 21 +++++++++++++ testing-i686/nvidia.install | 15 +++++++++ testing-x86_64/PKGBUILD | 58 +++++++++++++++++++++++++++++++++++++ testing-x86_64/nv-drm.patch | 27 +++++++++++++++++ testing-x86_64/nvidia-3.19.patch | 21 +++++++++++++ testing-x86_64/nvidia.install | 15 +++++++++ 8 files changed, 242 insertions(+) Copied: nvidia-304xx/repos/testing-i686/PKGBUILD (from rev 231178, nvidia-304xx/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2015-02-09 07:45:51 UTC (rev 231179) @@ -0,0 +1,58 @@ +# $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=10 +pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=3.19' 'linux<3.20' 'nvidia-304xx-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/testing-i686/nv-drm.patch (from rev 231178, nvidia-304xx/trunk/nv-drm.patch) =================================================================== --- testing-i686/nv-drm.patch (rev 0) +++ testing-i686/nv-drm.patch 2015-02-09 07:45:51 UTC (rev 231179) @@ -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-304xx/repos/testing-i686/nvidia-3.19.patch (from rev 231178, nvidia-304xx/trunk/nvidia-3.19.patch) =================================================================== --- testing-i686/nvidia-3.19.patch (rev 0) +++ testing-i686/nvidia-3.19.patch 2015-02-09 07:45:51 UTC (rev 231179) @@ -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/testing-i686/nvidia.install (from rev 231178, nvidia-304xx/trunk/nvidia.install) =================================================================== --- testing-i686/nvidia.install (rev 0) +++ testing-i686/nvidia.install 2015-02-09 07:45:51 UTC (rev 231179) @@ -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) +} Copied: nvidia-304xx/repos/testing-x86_64/PKGBUILD (from rev 231178, nvidia-304xx/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2015-02-09 07:45:51 UTC (rev 231179) @@ -0,0 +1,58 @@ +# $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=10 +pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/" +depends=('linux>=3.19' 'linux<3.20' 'nvidia-304xx-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/testing-x86_64/nv-drm.patch (from rev 231178, nvidia-304xx/trunk/nv-drm.patch) =================================================================== --- testing-x86_64/nv-drm.patch (rev 0) +++ testing-x86_64/nv-drm.patch 2015-02-09 07:45:51 UTC (rev 231179) @@ -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-304xx/repos/testing-x86_64/nvidia-3.19.patch (from rev 231178, nvidia-304xx/trunk/nvidia-3.19.patch) =================================================================== --- testing-x86_64/nvidia-3.19.patch (rev 0) +++ testing-x86_64/nvidia-3.19.patch 2015-02-09 07:45:51 UTC (rev 231179) @@ -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/testing-x86_64/nvidia.install (from rev 231178, nvidia-304xx/trunk/nvidia.install) =================================================================== --- testing-x86_64/nvidia.install (rev 0) +++ testing-x86_64/nvidia.install 2015-02-09 07:45:51 UTC (rev 231179) @@ -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) +}