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

Sven-Hendrik Haase svenstaro at nymeria.archlinux.org
Fri Nov 15 21:40:41 UTC 2013


    Date: Friday, November 15, 2013 @ 22:40:40
  Author: svenstaro
Revision: 199771

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

Added:
  nvidia/repos/extra-i686/PKGBUILD
    (from rev 199770, nvidia/trunk/PKGBUILD)
  nvidia/repos/extra-i686/nvidia.install
    (from rev 199770, nvidia/trunk/nvidia.install)
  nvidia/repos/extra-x86_64/PKGBUILD
    (from rev 199770, nvidia/trunk/PKGBUILD)
  nvidia/repos/extra-x86_64/nvidia.install
    (from rev 199770, nvidia/trunk/nvidia.install)
Deleted:
  nvidia/repos/extra-i686/PKGBUILD
  nvidia/repos/extra-i686/nvidia-linux-3.12.patch
  nvidia/repos/extra-i686/nvidia.install
  nvidia/repos/extra-x86_64/PKGBUILD
  nvidia/repos/extra-x86_64/nvidia-linux-3.12.patch
  nvidia/repos/extra-x86_64/nvidia.install

--------------------------------------+
 /PKGBUILD                            |  102 +++++++++++++++++++++++++++++++++
 /nvidia.install                      |   36 +++++++++++
 extra-i686/PKGBUILD                  |   52 ----------------
 extra-i686/nvidia-linux-3.12.patch   |   40 ------------
 extra-i686/nvidia.install            |   18 -----
 extra-x86_64/PKGBUILD                |   52 ----------------
 extra-x86_64/nvidia-linux-3.12.patch |   40 ------------
 extra-x86_64/nvidia.install          |   18 -----
 8 files changed, 138 insertions(+), 220 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-11-15 21:40:31 UTC (rev 199770)
+++ extra-i686/PKGBUILD	2013-11-15 21:40:40 UTC (rev 199771)
@@ -1,52 +0,0 @@
-# $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/extra-i686/PKGBUILD (from rev 199770, nvidia/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-11-15 21:40:40 UTC (rev 199771)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=331.20
+_extramodules=extramodules-3.12-ARCH
+pkgrel=1
+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+=('801aa04a087891690f1cac09575b2ba9')
+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+=('28295eed56c2ca996401c0093279620f')
+fi
+
+prepare() {
+    cd "${srcdir}"
+    sh "${_pkg}.run" --extract-only
+    cd "${_pkg}"
+}
+
+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"
+}

Deleted: extra-i686/nvidia-linux-3.12.patch
===================================================================
--- extra-i686/nvidia-linux-3.12.patch	2013-11-15 21:40:31 UTC (rev 199770)
+++ extra-i686/nvidia-linux-3.12.patch	2013-11-15 21:40:40 UTC (rev 199771)
@@ -1,40 +0,0 @@
-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()

Deleted: extra-i686/nvidia.install
===================================================================
--- extra-i686/nvidia.install	2013-11-15 21:40:31 UTC (rev 199770)
+++ extra-i686/nvidia.install	2013-11-15 21:40:40 UTC (rev 199771)
@@ -1,18 +0,0 @@
-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/extra-i686/nvidia.install (from rev 199770, nvidia/trunk/nvidia.install)
===================================================================
--- extra-i686/nvidia.install	                        (rev 0)
+++ extra-i686/nvidia.install	2013-11-15 21:40:40 UTC (rev 199771)
@@ -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)
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-11-15 21:40:31 UTC (rev 199770)
+++ extra-x86_64/PKGBUILD	2013-11-15 21:40:40 UTC (rev 199771)
@@ -1,52 +0,0 @@
-# $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/extra-x86_64/PKGBUILD (from rev 199770, nvidia/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-11-15 21:40:40 UTC (rev 199771)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=331.20
+_extramodules=extramodules-3.12-ARCH
+pkgrel=1
+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+=('801aa04a087891690f1cac09575b2ba9')
+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+=('28295eed56c2ca996401c0093279620f')
+fi
+
+prepare() {
+    cd "${srcdir}"
+    sh "${_pkg}.run" --extract-only
+    cd "${_pkg}"
+}
+
+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"
+}

Deleted: extra-x86_64/nvidia-linux-3.12.patch
===================================================================
--- extra-x86_64/nvidia-linux-3.12.patch	2013-11-15 21:40:31 UTC (rev 199770)
+++ extra-x86_64/nvidia-linux-3.12.patch	2013-11-15 21:40:40 UTC (rev 199771)
@@ -1,40 +0,0 @@
-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()

Deleted: extra-x86_64/nvidia.install
===================================================================
--- extra-x86_64/nvidia.install	2013-11-15 21:40:31 UTC (rev 199770)
+++ extra-x86_64/nvidia.install	2013-11-15 21:40:40 UTC (rev 199771)
@@ -1,18 +0,0 @@
-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/extra-x86_64/nvidia.install (from rev 199770, nvidia/trunk/nvidia.install)
===================================================================
--- extra-x86_64/nvidia.install	                        (rev 0)
+++ extra-x86_64/nvidia.install	2013-11-15 21:40:40 UTC (rev 199771)
@@ -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