[arch-commits] Commit in nvidia/repos (8 files)
Tobias Powalowski
tpowa at archlinux.org
Sat Feb 7 08:51:49 UTC 2015
Date: Saturday, February 7, 2015 @ 09:51:49
Author: tpowa
Revision: 230931
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nvidia/repos/testing-i686/
nvidia/repos/testing-i686/PKGBUILD
(from rev 230930, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-i686/nv-drm-343.36.patch
(from rev 230930, nvidia/trunk/nv-drm-343.36.patch)
nvidia/repos/testing-i686/nvidia.install
(from rev 230930, nvidia/trunk/nvidia.install)
nvidia/repos/testing-x86_64/
nvidia/repos/testing-x86_64/PKGBUILD
(from rev 230930, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-x86_64/nv-drm-343.36.patch
(from rev 230930, nvidia/trunk/nv-drm-343.36.patch)
nvidia/repos/testing-x86_64/nvidia.install
(from rev 230930, nvidia/trunk/nvidia.install)
------------------------------------+
testing-i686/PKGBUILD | 56 +++++++++++++++++++++++++++++++++++
testing-i686/nv-drm-343.36.patch | 14 ++++++++
testing-i686/nvidia.install | 18 +++++++++++
testing-x86_64/PKGBUILD | 56 +++++++++++++++++++++++++++++++++++
testing-x86_64/nv-drm-343.36.patch | 14 ++++++++
testing-x86_64/nvidia.install | 18 +++++++++++
6 files changed, 176 insertions(+)
Copied: nvidia/repos/testing-i686/PKGBUILD (from rev 230930, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-02-07 08:51:49 UTC (rev 230931)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=346.35
+_extramodules=extramodules-3.18-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+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"
+ nv-drm-343.36.patch)
+md5sums=('d2b8f7f90ef5037f03f94519f9809511'
+ '9ca9f07f91361362f304ca8317ddd453'
+ 'ff8a5f979e4428f8c847423fb007042c')
+
+[[ "$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 -p1 -i ../nv-drm-343.36.patch
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${_pkg}"/kernel
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+ if [[ "$CARCH" = "x86_64" ]]; then
+ cd uvm
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+ fi
+}
+
+package() {
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+
+ if [[ "$CARCH" = "x86_64" ]]; then
+ install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+ fi
+
+ 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/repos/testing-i686/nv-drm-343.36.patch (from rev 230930, nvidia/trunk/nv-drm-343.36.patch)
===================================================================
--- testing-i686/nv-drm-343.36.patch (rev 0)
+++ testing-i686/nv-drm-343.36.patch 2015-02-07 08:51:49 UTC (rev 230931)
@@ -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",
+
Copied: nvidia/repos/testing-i686/nvidia.install (from rev 230930, nvidia/trunk/nvidia.install)
===================================================================
--- testing-i686/nvidia.install (rev 0)
+++ testing-i686/nvidia.install 2015-02-07 08:51:49 UTC (rev 230931)
@@ -0,0 +1,18 @@
+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)
+ if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
+ echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
+ fi
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.18-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 230930, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-02-07 08:51:49 UTC (rev 230931)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=346.35
+_extramodules=extramodules-3.18-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+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"
+ nv-drm-343.36.patch)
+md5sums=('d2b8f7f90ef5037f03f94519f9809511'
+ '9ca9f07f91361362f304ca8317ddd453'
+ 'ff8a5f979e4428f8c847423fb007042c')
+
+[[ "$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 -p1 -i ../nv-drm-343.36.patch
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${_pkg}"/kernel
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+ if [[ "$CARCH" = "x86_64" ]]; then
+ cd uvm
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+ fi
+}
+
+package() {
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+
+ if [[ "$CARCH" = "x86_64" ]]; then
+ install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+ fi
+
+ 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/repos/testing-x86_64/nv-drm-343.36.patch (from rev 230930, nvidia/trunk/nv-drm-343.36.patch)
===================================================================
--- testing-x86_64/nv-drm-343.36.patch (rev 0)
+++ testing-x86_64/nv-drm-343.36.patch 2015-02-07 08:51:49 UTC (rev 230931)
@@ -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",
+
Copied: nvidia/repos/testing-x86_64/nvidia.install (from rev 230930, nvidia/trunk/nvidia.install)
===================================================================
--- testing-x86_64/nvidia.install (rev 0)
+++ testing-x86_64/nvidia.install 2015-02-07 08:51:49 UTC (rev 230931)
@@ -0,0 +1,18 @@
+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)
+ if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
+ echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
+ fi
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.18-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
More information about the arch-commits
mailing list