[arch-commits] Commit in nvidia/repos (8 files)

Tobias Powalowski tpowa at archlinux.org
Mon Apr 13 07:19:16 UTC 2015


    Date: Monday, April 13, 2015 @ 09:19:15
  Author: tpowa
Revision: 236335

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  nvidia/repos/testing-i686/
  nvidia/repos/testing-i686/PKGBUILD
    (from rev 236334, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-i686/nv-drm-343.36.patch
    (from rev 236334, nvidia/trunk/nv-drm-343.36.patch)
  nvidia/repos/testing-i686/nvidia.install
    (from rev 236334, nvidia/trunk/nvidia.install)
  nvidia/repos/testing-x86_64/
  nvidia/repos/testing-x86_64/PKGBUILD
    (from rev 236334, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-x86_64/nv-drm-343.36.patch
    (from rev 236334, nvidia/trunk/nv-drm-343.36.patch)
  nvidia/repos/testing-x86_64/nvidia.install
    (from rev 236334, nvidia/trunk/nvidia.install)

------------------------------------+
 testing-i686/PKGBUILD              |   54 +++++++++++++++++++++++++++++++++++
 testing-i686/nv-drm-343.36.patch   |   14 +++++++++
 testing-i686/nvidia.install        |   18 +++++++++++
 testing-x86_64/PKGBUILD            |   54 +++++++++++++++++++++++++++++++++++
 testing-x86_64/nv-drm-343.36.patch |   14 +++++++++
 testing-x86_64/nvidia.install      |   18 +++++++++++
 6 files changed, 172 insertions(+)

Copied: nvidia/repos/testing-i686/PKGBUILD (from rev 236334, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2015-04-13 07:19:15 UTC (rev 236335)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=346.59
+_extramodules=extramodules-4.0-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=4.0' 'linux<4.1' "nvidia-utils=${pkgver}" 'libgl')
+makedepends=('linux-headers>=4.0' 'linux-headers<4.1')
+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")
+md5sums=('565800c3d9bf347eb35a393f48a6b7f3'
+         'db1cebc2a78eac85777bb4c7c2c8c70c')
+
+[[ "$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
+
+    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 236334, nvidia/trunk/nv-drm-343.36.patch)
===================================================================
--- testing-i686/nv-drm-343.36.patch	                        (rev 0)
+++ testing-i686/nv-drm-343.36.patch	2015-04-13 07:19:15 UTC (rev 236335)
@@ -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 236334, nvidia/trunk/nvidia.install)
===================================================================
--- testing-i686/nvidia.install	                        (rev 0)
+++ testing-i686/nvidia.install	2015-04-13 07:19:15 UTC (rev 236335)
@@ -0,0 +1,18 @@
+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)
+    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-4.0-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}

Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 236334, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2015-04-13 07:19:15 UTC (rev 236335)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=346.59
+_extramodules=extramodules-4.0-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=4.0' 'linux<4.1' "nvidia-utils=${pkgver}" 'libgl')
+makedepends=('linux-headers>=4.0' 'linux-headers<4.1')
+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")
+md5sums=('565800c3d9bf347eb35a393f48a6b7f3'
+         'db1cebc2a78eac85777bb4c7c2c8c70c')
+
+[[ "$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
+
+    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 236334, 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-04-13 07:19:15 UTC (rev 236335)
@@ -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 236334, nvidia/trunk/nvidia.install)
===================================================================
--- testing-x86_64/nvidia.install	                        (rev 0)
+++ testing-x86_64/nvidia.install	2015-04-13 07:19:15 UTC (rev 236335)
@@ -0,0 +1,18 @@
+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)
+    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-4.0-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}



More information about the arch-commits mailing list