Date: Sunday, December 21, 2014 @ 05:23:41
  Author: fyan
Revision: 227854

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

Added:
  nvidia/repos/testing-i686/PKGBUILD
    (from rev 227853, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-i686/nv-drm-343.36.patch
    (from rev 227853, nvidia/trunk/nv-drm-343.36.patch)
  nvidia/repos/testing-i686/nvidia.install
    (from rev 227853, nvidia/trunk/nvidia.install)
  nvidia/repos/testing-x86_64/PKGBUILD
    (from rev 227853, nvidia/trunk/PKGBUILD)
  nvidia/repos/testing-x86_64/nv-drm-343.36.patch
    (from rev 227853, nvidia/trunk/nv-drm-343.36.patch)
  nvidia/repos/testing-x86_64/nvidia.install
    (from rev 227853, nvidia/trunk/nvidia.install)
Deleted:
  nvidia/repos/testing-i686/PKGBUILD
  nvidia/repos/testing-i686/nvidia.install
  nvidia/repos/testing-x86_64/PKGBUILD
  nvidia/repos/testing-x86_64/nvidia.install

------------------------------------+
 /PKGBUILD                          |  100 +++++++++++++++++++++++++++++++++++
 /nvidia.install                    |   36 ++++++++++++
 testing-i686/PKGBUILD              |   47 ----------------
 testing-i686/nv-drm-343.36.patch   |   14 ++++
 testing-i686/nvidia.install        |   18 ------
 testing-x86_64/PKGBUILD            |   47 ----------------
 testing-x86_64/nv-drm-343.36.patch |   14 ++++
 testing-x86_64/nvidia.install      |   18 ------
 8 files changed, 164 insertions(+), 130 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD       2014-12-21 04:23:13 UTC (rev 227853)
+++ testing-i686/PKGBUILD       2014-12-21 04:23:41 UTC (rev 227854)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <tho...@archlinux.org>
-
-pkgname=nvidia
-pkgver=343.36
-_extramodules=extramodules-3.18-ARCH
-pkgrel=4
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/";
-depends=('linux>=3.18' 'linux<3.19' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.18' 'linux-headers<3.19')
-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=('eae5d5407df0b371929a76f96aec4020'
-         'dfdf53ee8787455fe92a760ffa6badcb')
-
-[[ "$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"
-}

Copied: nvidia/repos/testing-i686/PKGBUILD (from rev 227853, 
nvidia/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD                               (rev 0)
+++ testing-i686/PKGBUILD       2014-12-21 04:23:41 UTC (rev 227854)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer : Thomas Baechler <tho...@archlinux.org>
+
+pkgname=nvidia
+pkgver=343.36
+_extramodules=extramodules-3.18-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+depends=('linux>=3.18' 'linux<3.19' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.18' 'linux-headers<3.19')
+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";
+        nv-drm-343.36.patch)
+md5sums=('eae5d5407df0b371929a76f96aec4020'
+         'dfdf53ee8787455fe92a760ffa6badcb'
+         'ff8a5f979e4428f8c847423fb007042c')
+
+[[ "$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 ../nv-drm-343.36.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"
+}

Copied: nvidia/repos/testing-i686/nv-drm-343.36.patch (from rev 227853, 
nvidia/trunk/nv-drm-343.36.patch)
===================================================================
--- testing-i686/nv-drm-343.36.patch                            (rev 0)
+++ testing-i686/nv-drm-343.36.patch    2014-12-21 04:23:41 UTC (rev 227854)
@@ -0,0 +1,14 @@
+diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index c0b41a0..700c193 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -128,6 +128,8 @@ static struct drm_driver nv_drm_driver = {
+     .gem_prime_vmap = nv_gem_prime_vmap,
+     .gem_prime_vunmap = nv_gem_prime_vunmap,
+ 
++    .set_busid = drm_pci_set_busid,
++
+     .name = "nvidia-drm",
+     .desc = "NVIDIA DRM driver",
+     .date = "20130102",
+

Deleted: testing-i686/nvidia.install
===================================================================
--- testing-i686/nvidia.install 2014-12-21 04:23:13 UTC (rev 227853)
+++ testing-i686/nvidia.install 2014-12-21 04:23:41 UTC (rev 227854)
@@ -1,18 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.18-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.18-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.18-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}

Copied: nvidia/repos/testing-i686/nvidia.install (from rev 227853, 
nvidia/trunk/nvidia.install)
===================================================================
--- testing-i686/nvidia.install                         (rev 0)
+++ testing-i686/nvidia.install 2014-12-21 04:23:41 UTC (rev 227854)
@@ -0,0 +1,18 @@
+post_install() {
+    EXTRAMODULES='extramodules-3.18-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.18-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.18-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD     2014-12-21 04:23:13 UTC (rev 227853)
+++ testing-x86_64/PKGBUILD     2014-12-21 04:23:41 UTC (rev 227854)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <tho...@archlinux.org>
-
-pkgname=nvidia
-pkgver=343.36
-_extramodules=extramodules-3.18-ARCH
-pkgrel=4
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/";
-depends=('linux>=3.18' 'linux<3.19' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.18' 'linux-headers<3.19')
-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=('eae5d5407df0b371929a76f96aec4020'
-         'dfdf53ee8787455fe92a760ffa6badcb')
-
-[[ "$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"
-}

Copied: nvidia/repos/testing-x86_64/PKGBUILD (from rev 227853, 
nvidia/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD                             (rev 0)
+++ testing-x86_64/PKGBUILD     2014-12-21 04:23:41 UTC (rev 227854)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer : Thomas Baechler <tho...@archlinux.org>
+
+pkgname=nvidia
+pkgver=343.36
+_extramodules=extramodules-3.18-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+depends=('linux>=3.18' 'linux<3.19' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.18' 'linux-headers<3.19')
+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";
+        nv-drm-343.36.patch)
+md5sums=('eae5d5407df0b371929a76f96aec4020'
+         'dfdf53ee8787455fe92a760ffa6badcb'
+         'ff8a5f979e4428f8c847423fb007042c')
+
+[[ "$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 ../nv-drm-343.36.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"
+}

Copied: nvidia/repos/testing-x86_64/nv-drm-343.36.patch (from rev 227853, 
nvidia/trunk/nv-drm-343.36.patch)
===================================================================
--- testing-x86_64/nv-drm-343.36.patch                          (rev 0)
+++ testing-x86_64/nv-drm-343.36.patch  2014-12-21 04:23:41 UTC (rev 227854)
@@ -0,0 +1,14 @@
+diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index c0b41a0..700c193 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -128,6 +128,8 @@ static struct drm_driver nv_drm_driver = {
+     .gem_prime_vmap = nv_gem_prime_vmap,
+     .gem_prime_vunmap = nv_gem_prime_vunmap,
+ 
++    .set_busid = drm_pci_set_busid,
++
+     .name = "nvidia-drm",
+     .desc = "NVIDIA DRM driver",
+     .date = "20130102",
+

Deleted: testing-x86_64/nvidia.install
===================================================================
--- testing-x86_64/nvidia.install       2014-12-21 04:23:13 UTC (rev 227853)
+++ testing-x86_64/nvidia.install       2014-12-21 04:23:41 UTC (rev 227854)
@@ -1,18 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.18-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.18-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.18-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}

Copied: nvidia/repos/testing-x86_64/nvidia.install (from rev 227853, 
nvidia/trunk/nvidia.install)
===================================================================
--- testing-x86_64/nvidia.install                               (rev 0)
+++ testing-x86_64/nvidia.install       2014-12-21 04:23:41 UTC (rev 227854)
@@ -0,0 +1,18 @@
+post_install() {
+    EXTRAMODULES='extramodules-3.18-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.18-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.18-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}

Reply via email to