[arch-commits] Commit in nvidia/repos (8 files)
Thomas Bächler
thomas at nymeria.archlinux.org
Tue Apr 1 21:47:44 UTC 2014
Date: Tuesday, April 1, 2014 @ 23:47:44
Author: thomas
Revision: 209728
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nvidia/repos/testing-i686/
nvidia/repos/testing-i686/PKGBUILD
(from rev 209727, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-i686/nvidia-3.14.patch
(from rev 209727, nvidia/trunk/nvidia-3.14.patch)
nvidia/repos/testing-i686/nvidia.install
(from rev 209727, nvidia/trunk/nvidia.install)
nvidia/repos/testing-x86_64/
nvidia/repos/testing-x86_64/PKGBUILD
(from rev 209727, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-x86_64/nvidia-3.14.patch
(from rev 209727, nvidia/trunk/nvidia-3.14.patch)
nvidia/repos/testing-x86_64/nvidia.install
(from rev 209727, nvidia/trunk/nvidia.install)
----------------------------------+
testing-i686/PKGBUILD | 52 +++++++++++++++++++++++++++++++++++++
testing-i686/nvidia-3.14.patch | 12 ++++++++
testing-i686/nvidia.install | 18 ++++++++++++
testing-x86_64/PKGBUILD | 52 +++++++++++++++++++++++++++++++++++++
testing-x86_64/nvidia-3.14.patch | 12 ++++++++
testing-x86_64/nvidia.install | 18 ++++++++++++
6 files changed, 164 insertions(+)
Copied: nvidia/repos/testing-i686/PKGBUILD (from rev 209727, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-04-01 21:47:44 UTC (rev 209728)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=334.21
+_extramodules=extramodules-3.14-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.14' 'linux<3.15' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.14' 'linux-headers<3.15')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+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"
+ 'nvidia-3.14.patch')
+md5sums=('3b2736dd6ed7e24f71004bad0e55e32e'
+ 'f96b6708702830fe647a7d11832c514e'
+ '08810729376eb0f829dedaf00d1c5915')
+
+[[ "$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 "${srcdir}/nvidia-3.14.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"
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
+}
Copied: nvidia/repos/testing-i686/nvidia-3.14.patch (from rev 209727, nvidia/trunk/nvidia-3.14.patch)
===================================================================
--- testing-i686/nvidia-3.14.patch (rev 0)
+++ testing-i686/nvidia-3.14.patch 2014-04-01 21:47:44 UTC (rev 209728)
@@ -0,0 +1,12 @@
+--- a/kernel/nv-linux.h 2014-01-09 04:49:25.000000000 +0200
++++ b/kernel/nv-linux.h 2014-02-05 16:46:55.552408568 +0200
+@@ -273,8 +273,7 @@
+ #endif
+
+ #if !defined(NV_VMWARE) && defined(CONFIG_ACPI)
+-#include <acpi/acpi.h>
+-#include <acpi/acpi_drivers.h>
++#include <linux/acpi.h>
+ #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
+ #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
+ #endif
Copied: nvidia/repos/testing-i686/nvidia.install (from rev 209727, nvidia/trunk/nvidia.install)
===================================================================
--- testing-i686/nvidia.install (rev 0)
+++ testing-i686/nvidia.install 2014-04-01 21:47:44 UTC (rev 209728)
@@ -0,0 +1,18 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.13-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.13-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.13-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 209727, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-04-01 21:47:44 UTC (rev 209728)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=334.21
+_extramodules=extramodules-3.14-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.14' 'linux<3.15' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.14' 'linux-headers<3.15')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+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"
+ 'nvidia-3.14.patch')
+md5sums=('3b2736dd6ed7e24f71004bad0e55e32e'
+ 'f96b6708702830fe647a7d11832c514e'
+ '08810729376eb0f829dedaf00d1c5915')
+
+[[ "$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 "${srcdir}/nvidia-3.14.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"
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
+}
Copied: nvidia/repos/testing-x86_64/nvidia-3.14.patch (from rev 209727, nvidia/trunk/nvidia-3.14.patch)
===================================================================
--- testing-x86_64/nvidia-3.14.patch (rev 0)
+++ testing-x86_64/nvidia-3.14.patch 2014-04-01 21:47:44 UTC (rev 209728)
@@ -0,0 +1,12 @@
+--- a/kernel/nv-linux.h 2014-01-09 04:49:25.000000000 +0200
++++ b/kernel/nv-linux.h 2014-02-05 16:46:55.552408568 +0200
+@@ -273,8 +273,7 @@
+ #endif
+
+ #if !defined(NV_VMWARE) && defined(CONFIG_ACPI)
+-#include <acpi/acpi.h>
+-#include <acpi/acpi_drivers.h>
++#include <linux/acpi.h>
+ #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
+ #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
+ #endif
Copied: nvidia/repos/testing-x86_64/nvidia.install (from rev 209727, nvidia/trunk/nvidia.install)
===================================================================
--- testing-x86_64/nvidia.install (rev 0)
+++ testing-x86_64/nvidia.install 2014-04-01 21:47:44 UTC (rev 209728)
@@ -0,0 +1,18 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.13-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.13-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.13-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
More information about the arch-commits
mailing list