[arch-commits] Commit in nvidia/repos (8 files)
Thomas Bächler
thomas at nymeria.archlinux.org
Wed Nov 6 00:25:23 UTC 2013
Date: Wednesday, November 6, 2013 @ 01:25:23
Author: thomas
Revision: 198994
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nvidia/repos/testing-i686/
nvidia/repos/testing-i686/PKGBUILD
(from rev 198993, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-i686/nvidia-linux-3.12.patch
(from rev 198993, nvidia/trunk/nvidia-linux-3.12.patch)
nvidia/repos/testing-i686/nvidia.install
(from rev 198993, nvidia/trunk/nvidia.install)
nvidia/repos/testing-x86_64/
nvidia/repos/testing-x86_64/PKGBUILD
(from rev 198993, nvidia/trunk/PKGBUILD)
nvidia/repos/testing-x86_64/nvidia-linux-3.12.patch
(from rev 198993, nvidia/trunk/nvidia-linux-3.12.patch)
nvidia/repos/testing-x86_64/nvidia.install
(from rev 198993, nvidia/trunk/nvidia.install)
----------------------------------------+
testing-i686/PKGBUILD | 52 +++++++++++++++++++++++++++++++
testing-i686/nvidia-linux-3.12.patch | 40 +++++++++++++++++++++++
testing-i686/nvidia.install | 18 ++++++++++
testing-x86_64/PKGBUILD | 52 +++++++++++++++++++++++++++++++
testing-x86_64/nvidia-linux-3.12.patch | 40 +++++++++++++++++++++++
testing-x86_64/nvidia.install | 18 ++++++++++
6 files changed, 220 insertions(+)
Copied: nvidia/repos/testing-i686/PKGBUILD (from rev 198993, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-11-06 00:25:23 UTC (rev 198994)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=325.15
+_extramodules=extramodules-3.12-ARCH
+pkgrel=11
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.12' 'linux<3.13' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.12' 'linux-headers<3.13')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.install
+options=(!strip)
+source=('nvidia-linux-3.12.patch')
+md5sums=('d267069bc456de269424b4e1b46a3745')
+
+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
+
+prepare() {
+ cd "${srcdir}"
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}"
+ patch -Np1 -i ${srcdir}/nvidia-linux-3.12.patch
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${srcdir}"/"${_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"
+}
Copied: nvidia/repos/testing-i686/nvidia-linux-3.12.patch (from rev 198993, nvidia/trunk/nvidia-linux-3.12.patch)
===================================================================
--- testing-i686/nvidia-linux-3.12.patch (rev 0)
+++ testing-i686/nvidia-linux-3.12.patch 2013-11-06 00:25:23 UTC (rev 198994)
@@ -0,0 +1,40 @@
+diff -Nur NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-drm.c NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-drm.c
+--- NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-drm.c 2013-08-01 02:49:26.000000000 +0200
++++ NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-drm.c 2013-11-06 01:16:40.547079457 +0100
+@@ -106,7 +106,6 @@
+ .unlocked_ioctl = drm_ioctl,
+ .mmap = drm_gem_mmap,
+ .poll = drm_poll,
+- .fasync = drm_fasync,
+ .read = drm_read,
+ .llseek = noop_llseek,
+ };
+@@ -202,12 +201,7 @@
+ memset(&nv_obj->base, 0, sizeof(nv_obj->base));
+ nv_obj->pages = pages;
+
+- ret = drm_gem_private_object_init(nvl->drm, &nv_obj->base, size);
+- if (ret)
+- {
+- status = RM_ERR_OPERATING_SYSTEM;
+- goto done;
+- }
++ drm_gem_private_object_init(nvl->drm, &nv_obj->base, size);
+
+ ret = drm_gem_handle_create(file_priv, &nv_obj->base, handle);
+ if (ret)
+diff -Nur NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-linux.h NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-linux.h
+--- NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-linux.h 2013-08-01 02:49:26.000000000 +0200
++++ NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-linux.h 2013-11-06 01:15:41.838303440 +0100
+@@ -958,7 +958,11 @@
+ #endif
+
+ #if !defined(NV_VMWARE)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)
+ #define NV_NUM_PHYSPAGES num_physpages
++#else
++#define NV_NUM_PHYSPAGES get_num_physpages()
++#endif
+ #define NV_GET_CURRENT_PROCESS() current->tgid
+ #define NV_IN_ATOMIC() in_atomic()
+ #define NV_LOCAL_BH_DISABLE() local_bh_disable()
Copied: nvidia/repos/testing-i686/nvidia.install (from rev 198993, nvidia/trunk/nvidia.install)
===================================================================
--- testing-i686/nvidia.install (rev 0)
+++ testing-i686/nvidia.install 2013-11-06 00:25:23 UTC (rev 198994)
@@ -0,0 +1,18 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.11-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.11-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.11-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 198993, nvidia/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-11-06 00:25:23 UTC (rev 198994)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=325.15
+_extramodules=extramodules-3.12-ARCH
+pkgrel=11
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.12' 'linux<3.13' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.12' 'linux-headers<3.13')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.install
+options=(!strip)
+source=('nvidia-linux-3.12.patch')
+md5sums=('d267069bc456de269424b4e1b46a3745')
+
+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
+
+prepare() {
+ cd "${srcdir}"
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}"
+ patch -Np1 -i ${srcdir}/nvidia-linux-3.12.patch
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${srcdir}"/"${_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"
+}
Copied: nvidia/repos/testing-x86_64/nvidia-linux-3.12.patch (from rev 198993, nvidia/trunk/nvidia-linux-3.12.patch)
===================================================================
--- testing-x86_64/nvidia-linux-3.12.patch (rev 0)
+++ testing-x86_64/nvidia-linux-3.12.patch 2013-11-06 00:25:23 UTC (rev 198994)
@@ -0,0 +1,40 @@
+diff -Nur NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-drm.c NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-drm.c
+--- NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-drm.c 2013-08-01 02:49:26.000000000 +0200
++++ NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-drm.c 2013-11-06 01:16:40.547079457 +0100
+@@ -106,7 +106,6 @@
+ .unlocked_ioctl = drm_ioctl,
+ .mmap = drm_gem_mmap,
+ .poll = drm_poll,
+- .fasync = drm_fasync,
+ .read = drm_read,
+ .llseek = noop_llseek,
+ };
+@@ -202,12 +201,7 @@
+ memset(&nv_obj->base, 0, sizeof(nv_obj->base));
+ nv_obj->pages = pages;
+
+- ret = drm_gem_private_object_init(nvl->drm, &nv_obj->base, size);
+- if (ret)
+- {
+- status = RM_ERR_OPERATING_SYSTEM;
+- goto done;
+- }
++ drm_gem_private_object_init(nvl->drm, &nv_obj->base, size);
+
+ ret = drm_gem_handle_create(file_priv, &nv_obj->base, handle);
+ if (ret)
+diff -Nur NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-linux.h NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-linux.h
+--- NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-linux.h 2013-08-01 02:49:26.000000000 +0200
++++ NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-linux.h 2013-11-06 01:15:41.838303440 +0100
+@@ -958,7 +958,11 @@
+ #endif
+
+ #if !defined(NV_VMWARE)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)
+ #define NV_NUM_PHYSPAGES num_physpages
++#else
++#define NV_NUM_PHYSPAGES get_num_physpages()
++#endif
+ #define NV_GET_CURRENT_PROCESS() current->tgid
+ #define NV_IN_ATOMIC() in_atomic()
+ #define NV_LOCAL_BH_DISABLE() local_bh_disable()
Copied: nvidia/repos/testing-x86_64/nvidia.install (from rev 198993, nvidia/trunk/nvidia.install)
===================================================================
--- testing-x86_64/nvidia.install (rev 0)
+++ testing-x86_64/nvidia.install 2013-11-06 00:25:23 UTC (rev 198994)
@@ -0,0 +1,18 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.11-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.11-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.11-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
More information about the arch-commits
mailing list