[arch-commits] Commit in nvidia/repos (10 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Tue Aug 6 09:46:55 UTC 2013
Date: Tuesday, August 6, 2013 @ 11:46:54
Author: tpowa
Revision: 192142
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nvidia/repos/testing-i686/PKGBUILD
(from rev 192141, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-i686/nvidia.install
(from rev 192141, nvidia/trunk/nvidia.install)
nvidia/repos/testing-x86_64/PKGBUILD
(from rev 192141, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-x86_64/nvidia.install
(from rev 192141, nvidia/trunk/nvidia.install)
Deleted:
nvidia/repos/testing-i686/PKGBUILD
nvidia/repos/testing-i686/nvidia-linux-3.10.patch
nvidia/repos/testing-i686/nvidia.install
nvidia/repos/testing-x86_64/PKGBUILD
nvidia/repos/testing-x86_64/nvidia-linux-3.10.patch
nvidia/repos/testing-x86_64/nvidia.install
----------------------------------------+
/PKGBUILD | 90 +++++++++++++++++++++++++++++++
/nvidia.install | 36 ++++++++++++
testing-i686/PKGBUILD | 48 ----------------
testing-i686/nvidia-linux-3.10.patch | 34 -----------
testing-i686/nvidia.install | 18 ------
testing-x86_64/PKGBUILD | 48 ----------------
testing-x86_64/nvidia-linux-3.10.patch | 34 -----------
testing-x86_64/nvidia.install | 18 ------
8 files changed, 126 insertions(+), 200 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-08-06 09:46:42 UTC (rev 192141)
+++ testing-i686/PKGBUILD 2013-08-06 09:46:54 UTC (rev 192142)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=319.32
-_extramodules=extramodules-3.10-ARCH
-pkgrel=6
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.10' 'linux<3.11' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.10' 'linux-headers<3.11')
-conflicts=('nvidia-96xx' 'nvidia-173xx')
-license=('custom')
-install=nvidia.install
-options=(!strip)
-source=('nvidia-linux-3.10.patch')
-md5sums=('8323dcba90576dcae67c42d6ea94704e')
-
-if [ "$CARCH" = "i686" ]; then
- _arch='x86'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
- source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums+=('978339ff37c3207f3a39d3952721dcdb')
-elif [ "$CARCH" = "x86_64" ]; then
- _arch='x86_64'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
- source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums+=('d181d856768868823df3bda4607a5315')
-fi
-
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- cd "${srcdir}"
- sh "${_pkg}.run" --extract-only
- cd "${_pkg}/kernel"
- patch -Np3 -i ${srcdir}/nvidia-linux-3.10.patch
- 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"
-}
Copied: nvidia/repos/testing-i686/PKGBUILD (from rev 192141, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-08-06 09:46:54 UTC (rev 192142)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=325.15
+_extramodules=extramodules-3.10-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.10' 'linux<3.11' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.10' 'linux-headers<3.11')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.install
+options=(!strip)
+
+if [ "$CARCH" = "i686" ]; then
+ _arch='x86'
+ _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
+ source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+ md5sums+=('528fc538584de6446384b9cec3099d6c')
+elif [ "$CARCH" = "x86_64" ]; then
+ _arch='x86_64'
+ _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
+ source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+ md5sums+=('63b2caa0cb128efa1a7808d7bddb2074')
+fi
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${srcdir}"
+ sh "${_pkg}.run" --extract-only
+ 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"
+}
Deleted: testing-i686/nvidia-linux-3.10.patch
===================================================================
--- testing-i686/nvidia-linux-3.10.patch 2013-08-06 09:46:42 UTC (rev 192141)
+++ testing-i686/nvidia-linux-3.10.patch 2013-08-06 09:46:54 UTC (rev 192142)
@@ -1,34 +0,0 @@
-diff --git a/modules/nvidia-kernel/nv-i2c.c b/modules/nvidia-kernel/nv-i2c.c
-index a702506..ece9c3c 100644
---- a/modules/nvidia-kernel/nv-i2c.c
-+++ b/modules/nvidia-kernel/nv-i2c.c
-@@ -324,13 +324,10 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
- if (!pI2cAdapter) return FALSE;
-
- // attempt release with the OS
-- osstatus = i2c_del_adapter(pI2cAdapter);
-+ i2c_del_adapter(pI2cAdapter);
-
-- if (!osstatus)
-- {
-- os_free_mem(pI2cAdapter);
-- wasReleased = TRUE;
-- }
-+ os_free_mem(pI2cAdapter);
-+ wasReleased = TRUE;
-
- return wasReleased;
- }
-diff --git a/modules/nvidia-kernel/nv-procfs.c b/modules/nvidia-kernel/nv-procfs.c
-index 3e05ef5..75fc7e0 100644
---- a/modules/nvidia-kernel/nv-procfs.c
-+++ b/modules/nvidia-kernel/nv-procfs.c
-@@ -14,6 +14,8 @@
- #include "os-interface.h"
- #include "nv-linux.h"
-
-+#undef CONFIG_PROC_FS
-+
- #if defined(CONFIG_PROC_FS)
-
- #include "nv_compiler.h"
\ No newline at end of file
Deleted: testing-i686/nvidia.install
===================================================================
--- testing-i686/nvidia.install 2013-08-06 09:46:42 UTC (rev 192141)
+++ testing-i686/nvidia.install 2013-08-06 09:46:54 UTC (rev 192142)
@@ -1,18 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-3.10-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
- EXTRAMODULES='extramodules-3.10-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.10-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
Copied: nvidia/repos/testing-i686/nvidia.install (from rev 192141, nvidia/trunk/nvidia.install)
===================================================================
--- testing-i686/nvidia.install (rev 0)
+++ testing-i686/nvidia.install 2013-08-06 09:46:54 UTC (rev 192142)
@@ -0,0 +1,18 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.10-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.10-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.10-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-08-06 09:46:42 UTC (rev 192141)
+++ testing-x86_64/PKGBUILD 2013-08-06 09:46:54 UTC (rev 192142)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=319.32
-_extramodules=extramodules-3.10-ARCH
-pkgrel=6
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.10' 'linux<3.11' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.10' 'linux-headers<3.11')
-conflicts=('nvidia-96xx' 'nvidia-173xx')
-license=('custom')
-install=nvidia.install
-options=(!strip)
-source=('nvidia-linux-3.10.patch')
-md5sums=('8323dcba90576dcae67c42d6ea94704e')
-
-if [ "$CARCH" = "i686" ]; then
- _arch='x86'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
- source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums+=('978339ff37c3207f3a39d3952721dcdb')
-elif [ "$CARCH" = "x86_64" ]; then
- _arch='x86_64'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
- source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
- md5sums+=('d181d856768868823df3bda4607a5315')
-fi
-
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- cd "${srcdir}"
- sh "${_pkg}.run" --extract-only
- cd "${_pkg}/kernel"
- patch -Np3 -i ${srcdir}/nvidia-linux-3.10.patch
- 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"
-}
Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 192141, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-08-06 09:46:54 UTC (rev 192142)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=325.15
+_extramodules=extramodules-3.10-ARCH
+pkgrel=1
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.10' 'linux<3.11' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.10' 'linux-headers<3.11')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.install
+options=(!strip)
+
+if [ "$CARCH" = "i686" ]; then
+ _arch='x86'
+ _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
+ source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+ md5sums+=('528fc538584de6446384b9cec3099d6c')
+elif [ "$CARCH" = "x86_64" ]; then
+ _arch='x86_64'
+ _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
+ source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
+ md5sums+=('63b2caa0cb128efa1a7808d7bddb2074')
+fi
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${srcdir}"
+ sh "${_pkg}.run" --extract-only
+ 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"
+}
Deleted: testing-x86_64/nvidia-linux-3.10.patch
===================================================================
--- testing-x86_64/nvidia-linux-3.10.patch 2013-08-06 09:46:42 UTC (rev 192141)
+++ testing-x86_64/nvidia-linux-3.10.patch 2013-08-06 09:46:54 UTC (rev 192142)
@@ -1,34 +0,0 @@
-diff --git a/modules/nvidia-kernel/nv-i2c.c b/modules/nvidia-kernel/nv-i2c.c
-index a702506..ece9c3c 100644
---- a/modules/nvidia-kernel/nv-i2c.c
-+++ b/modules/nvidia-kernel/nv-i2c.c
-@@ -324,13 +324,10 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
- if (!pI2cAdapter) return FALSE;
-
- // attempt release with the OS
-- osstatus = i2c_del_adapter(pI2cAdapter);
-+ i2c_del_adapter(pI2cAdapter);
-
-- if (!osstatus)
-- {
-- os_free_mem(pI2cAdapter);
-- wasReleased = TRUE;
-- }
-+ os_free_mem(pI2cAdapter);
-+ wasReleased = TRUE;
-
- return wasReleased;
- }
-diff --git a/modules/nvidia-kernel/nv-procfs.c b/modules/nvidia-kernel/nv-procfs.c
-index 3e05ef5..75fc7e0 100644
---- a/modules/nvidia-kernel/nv-procfs.c
-+++ b/modules/nvidia-kernel/nv-procfs.c
-@@ -14,6 +14,8 @@
- #include "os-interface.h"
- #include "nv-linux.h"
-
-+#undef CONFIG_PROC_FS
-+
- #if defined(CONFIG_PROC_FS)
-
- #include "nv_compiler.h"
\ No newline at end of file
Deleted: testing-x86_64/nvidia.install
===================================================================
--- testing-x86_64/nvidia.install 2013-08-06 09:46:42 UTC (rev 192141)
+++ testing-x86_64/nvidia.install 2013-08-06 09:46:54 UTC (rev 192142)
@@ -1,18 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-3.10-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
- EXTRAMODULES='extramodules-3.10-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.10-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
Copied: nvidia/repos/testing-x86_64/nvidia.install (from rev 192141, nvidia/trunk/nvidia.install)
===================================================================
--- testing-x86_64/nvidia.install (rev 0)
+++ testing-x86_64/nvidia.install 2013-08-06 09:46:54 UTC (rev 192142)
@@ -0,0 +1,18 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.10-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.10-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.10-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
More information about the arch-commits
mailing list