[arch-commits] Commit in nvidia/repos (12 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Wed Aug 13 13:42:32 UTC 2014
Date: Wednesday, August 13, 2014 @ 15:42:32
Author: svenstaro
Revision: 219669
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
nvidia/repos/extra-i686/PKGBUILD
(from rev 219668, nvidia/trunk/PKGBUILD)
nvidia/repos/extra-i686/nvidia-3.14.patch
(from rev 219668, nvidia/trunk/nvidia-3.14.patch)
nvidia/repos/extra-i686/nvidia.install
(from rev 219668, nvidia/trunk/nvidia.install)
nvidia/repos/extra-x86_64/PKGBUILD
(from rev 219668, nvidia/trunk/PKGBUILD)
nvidia/repos/extra-x86_64/nvidia-3.14.patch
(from rev 219668, nvidia/trunk/nvidia-3.14.patch)
nvidia/repos/extra-x86_64/nvidia.install
(from rev 219668, nvidia/trunk/nvidia.install)
Deleted:
nvidia/repos/extra-i686/PKGBUILD
nvidia/repos/extra-i686/nvidia-3.14.patch
nvidia/repos/extra-i686/nvidia.install
nvidia/repos/extra-x86_64/PKGBUILD
nvidia/repos/extra-x86_64/nvidia-3.14.patch
nvidia/repos/extra-x86_64/nvidia.install
--------------------------------+
/PKGBUILD | 98 +++++++++++++++++++++++++++++++++++++++
/nvidia-3.14.patch | 24 +++++++++
/nvidia.install | 36 ++++++++++++++
extra-i686/PKGBUILD | 49 -------------------
extra-i686/nvidia-3.14.patch | 12 ----
extra-i686/nvidia.install | 18 -------
extra-x86_64/PKGBUILD | 49 -------------------
extra-x86_64/nvidia-3.14.patch | 12 ----
extra-x86_64/nvidia.install | 18 -------
9 files changed, 158 insertions(+), 158 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-08-13 13:42:26 UTC (rev 219668)
+++ extra-i686/PKGBUILD 2014-08-13 13:42:32 UTC (rev 219669)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=340.24
-_extramodules=extramodules-3.16-ARCH
-pkgrel=4
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.16' 'linux<3.17' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.16' 'linux-headers<3.17')
-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")
-md5sums=('edd4c618265d22ef4d2b28baf070c6ff'
- 'b71118e3e3ae9b227bf6f17a2cc8c726')
-
-[[ "$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"
- sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
-}
Copied: nvidia/repos/extra-i686/PKGBUILD (from rev 219668, nvidia/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-08-13 13:42:32 UTC (rev 219669)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=340.32
+_extramodules=extramodules-3.16-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.16' 'linux<3.17' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.16' 'linux-headers<3.17')
+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")
+md5sums=('423ea1a6938dbf226bb84504746fc646'
+ 'baea4c968a06d3eddec8fb1287bb38bb')
+
+[[ "$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"
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
+}
Deleted: extra-i686/nvidia-3.14.patch
===================================================================
--- extra-i686/nvidia-3.14.patch 2014-08-13 13:42:26 UTC (rev 219668)
+++ extra-i686/nvidia-3.14.patch 2014-08-13 13:42:32 UTC (rev 219669)
@@ -1,12 +0,0 @@
---- 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/extra-i686/nvidia-3.14.patch (from rev 219668, nvidia/trunk/nvidia-3.14.patch)
===================================================================
--- extra-i686/nvidia-3.14.patch (rev 0)
+++ extra-i686/nvidia-3.14.patch 2014-08-13 13:42:32 UTC (rev 219669)
@@ -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
Deleted: extra-i686/nvidia.install
===================================================================
--- extra-i686/nvidia.install 2014-08-13 13:42:26 UTC (rev 219668)
+++ extra-i686/nvidia.install 2014-08-13 13:42:32 UTC (rev 219669)
@@ -1,18 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-3.15-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
- EXTRAMODULES='extramodules-3.15-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.15-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
Copied: nvidia/repos/extra-i686/nvidia.install (from rev 219668, nvidia/trunk/nvidia.install)
===================================================================
--- extra-i686/nvidia.install (rev 0)
+++ extra-i686/nvidia.install 2014-08-13 13:42:32 UTC (rev 219669)
@@ -0,0 +1,18 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.15-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.15-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.15-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-08-13 13:42:26 UTC (rev 219668)
+++ extra-x86_64/PKGBUILD 2014-08-13 13:42:32 UTC (rev 219669)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=340.24
-_extramodules=extramodules-3.16-ARCH
-pkgrel=4
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.16' 'linux<3.17' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.16' 'linux-headers<3.17')
-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")
-md5sums=('edd4c618265d22ef4d2b28baf070c6ff'
- 'b71118e3e3ae9b227bf6f17a2cc8c726')
-
-[[ "$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"
- sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
-}
Copied: nvidia/repos/extra-x86_64/PKGBUILD (from rev 219668, nvidia/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-08-13 13:42:32 UTC (rev 219669)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=340.32
+_extramodules=extramodules-3.16-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.16' 'linux<3.17' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.16' 'linux-headers<3.17')
+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")
+md5sums=('423ea1a6938dbf226bb84504746fc646'
+ 'baea4c968a06d3eddec8fb1287bb38bb')
+
+[[ "$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"
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
+}
Deleted: extra-x86_64/nvidia-3.14.patch
===================================================================
--- extra-x86_64/nvidia-3.14.patch 2014-08-13 13:42:26 UTC (rev 219668)
+++ extra-x86_64/nvidia-3.14.patch 2014-08-13 13:42:32 UTC (rev 219669)
@@ -1,12 +0,0 @@
---- 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/extra-x86_64/nvidia-3.14.patch (from rev 219668, nvidia/trunk/nvidia-3.14.patch)
===================================================================
--- extra-x86_64/nvidia-3.14.patch (rev 0)
+++ extra-x86_64/nvidia-3.14.patch 2014-08-13 13:42:32 UTC (rev 219669)
@@ -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
Deleted: extra-x86_64/nvidia.install
===================================================================
--- extra-x86_64/nvidia.install 2014-08-13 13:42:26 UTC (rev 219668)
+++ extra-x86_64/nvidia.install 2014-08-13 13:42:32 UTC (rev 219669)
@@ -1,18 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-3.15-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
- EXTRAMODULES='extramodules-3.15-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.15-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
Copied: nvidia/repos/extra-x86_64/nvidia.install (from rev 219668, nvidia/trunk/nvidia.install)
===================================================================
--- extra-x86_64/nvidia.install (rev 0)
+++ extra-x86_64/nvidia.install 2014-08-13 13:42:32 UTC (rev 219669)
@@ -0,0 +1,18 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.15-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.15-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.15-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
More information about the arch-commits
mailing list