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

2017-04-27 Thread Tobias Powalowski
Date: Friday, April 28, 2017 @ 06:53:52
  Author: tpowa
Revision: 294967

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

Added:
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-i686/4.10.0_kernel.patch
(from rev 294966, nvidia-340xx/trunk/4.10.0_kernel.patch)
  nvidia-340xx/repos/testing-i686/PKGBUILD
(from rev 294966, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-i686/fs52243.patch
(from rev 294966, nvidia-340xx/trunk/fs52243.patch)
  nvidia-340xx/repos/testing-i686/nvidia-340xx.install
(from rev 294966, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/testing-x86_64/
  nvidia-340xx/repos/testing-x86_64/4.10.0_kernel.patch
(from rev 294966, nvidia-340xx/trunk/4.10.0_kernel.patch)
  nvidia-340xx/repos/testing-x86_64/PKGBUILD
(from rev 294966, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-x86_64/fs52243.patch
(from rev 294966, nvidia-340xx/trunk/fs52243.patch)
  nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install
(from rev 294966, nvidia-340xx/trunk/nvidia-340xx.install)

-+
 testing-i686/4.10.0_kernel.patch|  131 ++
 testing-i686/PKGBUILD   |   74 +++
 testing-i686/fs52243.patch  |   14 +++
 testing-i686/nvidia-340xx.install   |   13 +++
 testing-x86_64/4.10.0_kernel.patch  |  131 ++
 testing-x86_64/PKGBUILD |   74 +++
 testing-x86_64/fs52243.patch|   14 +++
 testing-x86_64/nvidia-340xx.install |   13 +++
 8 files changed, 464 insertions(+)

Copied: nvidia-340xx/repos/testing-i686/4.10.0_kernel.patch (from rev 294966, 
nvidia-340xx/trunk/4.10.0_kernel.patch)
===
--- testing-i686/4.10.0_kernel.patch(rev 0)
+++ testing-i686/4.10.0_kernel.patch2017-04-28 06:53:52 UTC (rev 294967)
@@ -0,0 +1,131 @@
+From 983a2ca221a371e08bb5ad11758a729cfa5aa88c Mon Sep 17 00:00:00 2001
+From: Alberto Milone 
+Date: Wed, 15 Feb 2017 17:05:55 +0100
+Subject: [PATCH 1/1] Add support for Linux 4.10
+
+---
+ nv-linux.h|  7 +++
+ nv-pat.c  | 40 
+ uvm/nvidia_uvm_lite.c |  4 
+ 3 files changed, 51 insertions(+)
+
+diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
+index e7068e3..2d62492 100644
+--- a/kernel/nv-linux.h
 b/kernel/nv-linux.h
+@@ -2082,6 +2082,8 @@ static inline NvU64 nv_node_end_pfn(int nid)
+  *2016 Dec 14:5b56d49fc31dbb0487e14ead790fc81ca9fb2c99
+  */
+ 
++#include 
++
+ #if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
+ #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS)
+ #define NV_GET_USER_PAGES   get_user_pages
+@@ -2129,8 +2131,13 @@ static inline NvU64 nv_node_end_pfn(int nid)
+ 
+ #else
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
+ pages, vmas);
++#else
++   return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
++pages, vmas, NULL);
++#endif
+ 
+ #endif
+ 
+diff --git a/kernel/nv-pat.c b/kernel/nv-pat.c
+index a725533..cec6f3f 100644
+--- a/kernel/nv-pat.c
 b/kernel/nv-pat.c
+@@ -203,6 +203,7 @@ void nv_disable_pat_support(void)
+ }
+ 
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ static int
+ nvidia_cpu_callback(struct notifier_block *nfb, unsigned long action, void 
*hcpu)
+ {
+@@ -234,6 +235,34 @@ static struct notifier_block nv_hotcpu_nfb = {
+ .notifier_call = nvidia_cpu_callback,
+ .priority = 0
+ };
++#else
++static int nvidia_cpu_online(unsigned int hcpu)
++{
++unsigned int cpu = get_cpu();
++if (cpu == hcpu)
++nv_setup_pat_entries(NULL);
++else
++NV_SMP_CALL_FUNCTION(nv_setup_pat_entries, (void *)(long int)hcpu, 1);
++
++put_cpu();
++
++return 0;
++}
++
++static int nvidia_cpu_down_prep(unsigned int hcpu)
++{
++unsigned int cpu = get_cpu();
++if (cpu == hcpu)
++nv_restore_pat_entries(NULL);
++else
++NV_SMP_CALL_FUNCTION(nv_restore_pat_entries, (void *)(long int)hcpu, 
1);
++
++put_cpu();
++
++return 0;
++}
++#endif
++
+ #endif
+ 
+ int nv_init_pat_support(nv_stack_t *sp)
+@@ -255,7 +284,14 @@ int nv_init_pat_support(nv_stack_t *sp)
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
+ if (nv_pat_mode == NV_PAT_MODE_BUILTIN)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ if (register_hotcpu_notifier(&nv_hotcpu_nfb) != 0)
++#else
++if (cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
++  "gpu/nvidia:online",
++  nvidia_cpu_online,
++ 

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

2017-03-18 Thread Tobias Powalowski
Date: Saturday, March 18, 2017 @ 21:11:40
  Author: tpowa
Revision: 291055

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

Added:
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-i686/4.10.0_kernel.patch
(from rev 291054, nvidia-340xx/trunk/4.10.0_kernel.patch)
  nvidia-340xx/repos/testing-i686/PKGBUILD
(from rev 291054, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-i686/fs52243.patch
(from rev 291054, nvidia-340xx/trunk/fs52243.patch)
  nvidia-340xx/repos/testing-i686/nvidia-340xx.install
(from rev 291054, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/testing-x86_64/
  nvidia-340xx/repos/testing-x86_64/4.10.0_kernel.patch
(from rev 291054, nvidia-340xx/trunk/4.10.0_kernel.patch)
  nvidia-340xx/repos/testing-x86_64/PKGBUILD
(from rev 291054, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-x86_64/fs52243.patch
(from rev 291054, nvidia-340xx/trunk/fs52243.patch)
  nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install
(from rev 291054, nvidia-340xx/trunk/nvidia-340xx.install)

-+
 testing-i686/4.10.0_kernel.patch|  131 ++
 testing-i686/PKGBUILD   |   74 +++
 testing-i686/fs52243.patch  |   14 +++
 testing-i686/nvidia-340xx.install   |   13 +++
 testing-x86_64/4.10.0_kernel.patch  |  131 ++
 testing-x86_64/PKGBUILD |   74 +++
 testing-x86_64/fs52243.patch|   14 +++
 testing-x86_64/nvidia-340xx.install |   13 +++
 8 files changed, 464 insertions(+)

Copied: nvidia-340xx/repos/testing-i686/4.10.0_kernel.patch (from rev 291054, 
nvidia-340xx/trunk/4.10.0_kernel.patch)
===
--- testing-i686/4.10.0_kernel.patch(rev 0)
+++ testing-i686/4.10.0_kernel.patch2017-03-18 21:11:40 UTC (rev 291055)
@@ -0,0 +1,131 @@
+From 983a2ca221a371e08bb5ad11758a729cfa5aa88c Mon Sep 17 00:00:00 2001
+From: Alberto Milone 
+Date: Wed, 15 Feb 2017 17:05:55 +0100
+Subject: [PATCH 1/1] Add support for Linux 4.10
+
+---
+ nv-linux.h|  7 +++
+ nv-pat.c  | 40 
+ uvm/nvidia_uvm_lite.c |  4 
+ 3 files changed, 51 insertions(+)
+
+diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
+index e7068e3..2d62492 100644
+--- a/kernel/nv-linux.h
 b/kernel/nv-linux.h
+@@ -2082,6 +2082,8 @@ static inline NvU64 nv_node_end_pfn(int nid)
+  *2016 Dec 14:5b56d49fc31dbb0487e14ead790fc81ca9fb2c99
+  */
+ 
++#include 
++
+ #if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
+ #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS)
+ #define NV_GET_USER_PAGES   get_user_pages
+@@ -2129,8 +2131,13 @@ static inline NvU64 nv_node_end_pfn(int nid)
+ 
+ #else
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
+ pages, vmas);
++#else
++   return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
++pages, vmas, NULL);
++#endif
+ 
+ #endif
+ 
+diff --git a/kernel/nv-pat.c b/kernel/nv-pat.c
+index a725533..cec6f3f 100644
+--- a/kernel/nv-pat.c
 b/kernel/nv-pat.c
+@@ -203,6 +203,7 @@ void nv_disable_pat_support(void)
+ }
+ 
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ static int
+ nvidia_cpu_callback(struct notifier_block *nfb, unsigned long action, void 
*hcpu)
+ {
+@@ -234,6 +235,34 @@ static struct notifier_block nv_hotcpu_nfb = {
+ .notifier_call = nvidia_cpu_callback,
+ .priority = 0
+ };
++#else
++static int nvidia_cpu_online(unsigned int hcpu)
++{
++unsigned int cpu = get_cpu();
++if (cpu == hcpu)
++nv_setup_pat_entries(NULL);
++else
++NV_SMP_CALL_FUNCTION(nv_setup_pat_entries, (void *)(long int)hcpu, 1);
++
++put_cpu();
++
++return 0;
++}
++
++static int nvidia_cpu_down_prep(unsigned int hcpu)
++{
++unsigned int cpu = get_cpu();
++if (cpu == hcpu)
++nv_restore_pat_entries(NULL);
++else
++NV_SMP_CALL_FUNCTION(nv_restore_pat_entries, (void *)(long int)hcpu, 
1);
++
++put_cpu();
++
++return 0;
++}
++#endif
++
+ #endif
+ 
+ int nv_init_pat_support(nv_stack_t *sp)
+@@ -255,7 +284,14 @@ int nv_init_pat_support(nv_stack_t *sp)
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
+ if (nv_pat_mode == NV_PAT_MODE_BUILTIN)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ if (register_hotcpu_notifier(&nv_hotcpu_nfb) != 0)
++#else
++if (cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
++  "gpu/nvidia:online",
++  nvidia_cpu_online,
++   

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

2017-02-26 Thread Jan Steffens
Date: Sunday, February 26, 2017 @ 22:42:16
  Author: heftig
Revision: 289585

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

Added:
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-i686/4.10.0_kernel.patch
(from rev 289584, nvidia-340xx/trunk/4.10.0_kernel.patch)
  nvidia-340xx/repos/testing-i686/PKGBUILD
(from rev 289584, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-i686/fs52243.patch
(from rev 289584, nvidia-340xx/trunk/fs52243.patch)
  nvidia-340xx/repos/testing-i686/nvidia-340xx.install
(from rev 289584, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/testing-x86_64/
  nvidia-340xx/repos/testing-x86_64/4.10.0_kernel.patch
(from rev 289584, nvidia-340xx/trunk/4.10.0_kernel.patch)
  nvidia-340xx/repos/testing-x86_64/PKGBUILD
(from rev 289584, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-x86_64/fs52243.patch
(from rev 289584, nvidia-340xx/trunk/fs52243.patch)
  nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install
(from rev 289584, nvidia-340xx/trunk/nvidia-340xx.install)

-+
 testing-i686/4.10.0_kernel.patch|  131 ++
 testing-i686/PKGBUILD   |   74 +++
 testing-i686/fs52243.patch  |   14 +++
 testing-i686/nvidia-340xx.install   |   13 +++
 testing-x86_64/4.10.0_kernel.patch  |  131 ++
 testing-x86_64/PKGBUILD |   74 +++
 testing-x86_64/fs52243.patch|   14 +++
 testing-x86_64/nvidia-340xx.install |   13 +++
 8 files changed, 464 insertions(+)

Copied: nvidia-340xx/repos/testing-i686/4.10.0_kernel.patch (from rev 289584, 
nvidia-340xx/trunk/4.10.0_kernel.patch)
===
--- testing-i686/4.10.0_kernel.patch(rev 0)
+++ testing-i686/4.10.0_kernel.patch2017-02-26 22:42:16 UTC (rev 289585)
@@ -0,0 +1,131 @@
+From 983a2ca221a371e08bb5ad11758a729cfa5aa88c Mon Sep 17 00:00:00 2001
+From: Alberto Milone 
+Date: Wed, 15 Feb 2017 17:05:55 +0100
+Subject: [PATCH 1/1] Add support for Linux 4.10
+
+---
+ nv-linux.h|  7 +++
+ nv-pat.c  | 40 
+ uvm/nvidia_uvm_lite.c |  4 
+ 3 files changed, 51 insertions(+)
+
+diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
+index e7068e3..2d62492 100644
+--- a/kernel/nv-linux.h
 b/kernel/nv-linux.h
+@@ -2082,6 +2082,8 @@ static inline NvU64 nv_node_end_pfn(int nid)
+  *2016 Dec 14:5b56d49fc31dbb0487e14ead790fc81ca9fb2c99
+  */
+ 
++#include 
++
+ #if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
+ #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS)
+ #define NV_GET_USER_PAGES   get_user_pages
+@@ -2129,8 +2131,13 @@ static inline NvU64 nv_node_end_pfn(int nid)
+ 
+ #else
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
+ pages, vmas);
++#else
++   return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
++pages, vmas, NULL);
++#endif
+ 
+ #endif
+ 
+diff --git a/kernel/nv-pat.c b/kernel/nv-pat.c
+index a725533..cec6f3f 100644
+--- a/kernel/nv-pat.c
 b/kernel/nv-pat.c
+@@ -203,6 +203,7 @@ void nv_disable_pat_support(void)
+ }
+ 
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ static int
+ nvidia_cpu_callback(struct notifier_block *nfb, unsigned long action, void 
*hcpu)
+ {
+@@ -234,6 +235,34 @@ static struct notifier_block nv_hotcpu_nfb = {
+ .notifier_call = nvidia_cpu_callback,
+ .priority = 0
+ };
++#else
++static int nvidia_cpu_online(unsigned int hcpu)
++{
++unsigned int cpu = get_cpu();
++if (cpu == hcpu)
++nv_setup_pat_entries(NULL);
++else
++NV_SMP_CALL_FUNCTION(nv_setup_pat_entries, (void *)(long int)hcpu, 1);
++
++put_cpu();
++
++return 0;
++}
++
++static int nvidia_cpu_down_prep(unsigned int hcpu)
++{
++unsigned int cpu = get_cpu();
++if (cpu == hcpu)
++nv_restore_pat_entries(NULL);
++else
++NV_SMP_CALL_FUNCTION(nv_restore_pat_entries, (void *)(long int)hcpu, 
1);
++
++put_cpu();
++
++return 0;
++}
++#endif
++
+ #endif
+ 
+ int nv_init_pat_support(nv_stack_t *sp)
+@@ -255,7 +284,14 @@ int nv_init_pat_support(nv_stack_t *sp)
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
+ if (nv_pat_mode == NV_PAT_MODE_BUILTIN)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ if (register_hotcpu_notifier(&nv_hotcpu_nfb) != 0)
++#else
++if (cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
++  "gpu/nvidia:online",
++  nvidia_cpu_online,
++ 

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

2017-01-21 Thread Sven-Hendrik Haase
Date: Saturday, January 21, 2017 @ 19:33:48
  Author: svenstaro
Revision: 287102

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

Added:
  nvidia-340xx/repos/testing-i686/PKGBUILD
(from rev 287101, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-i686/fs52243.patch
(from rev 287101, nvidia-340xx/trunk/fs52243.patch)
  nvidia-340xx/repos/testing-i686/nvidia-340xx.install
(from rev 287101, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/testing-x86_64/PKGBUILD
(from rev 287101, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-x86_64/fs52243.patch
(from rev 287101, nvidia-340xx/trunk/fs52243.patch)
  nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install
(from rev 287101, nvidia-340xx/trunk/nvidia-340xx.install)
Deleted:
  nvidia-340xx/repos/testing-i686/PKGBUILD
  nvidia-340xx/repos/testing-i686/nvidia-340xx.install
  nvidia-340xx/repos/testing-x86_64/PKGBUILD
  nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install

-+
 /PKGBUILD   |  144 ++
 /nvidia-340xx.install   |   26 ++
 testing-i686/PKGBUILD   |   68 
 testing-i686/fs52243.patch  |   14 +++
 testing-i686/nvidia-340xx.install   |   13 ---
 testing-x86_64/PKGBUILD |   68 
 testing-x86_64/fs52243.patch|   14 +++
 testing-x86_64/nvidia-340xx.install |   13 ---
 8 files changed, 198 insertions(+), 162 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2017-01-21 19:33:34 UTC (rev 287101)
+++ testing-i686/PKGBUILD   2017-01-21 19:33:48 UTC (rev 287102)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan 
-# Contributor: Thomas Baechler 
-
-pkgbase=nvidia-340xx
-pkgname=(nvidia-340xx nvidia-340xx-dkms)
-pkgver=340.101
-_extramodules=extramodules-4.9-ARCH
-pkgrel=8
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/";
-makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.9' 'linux-headers<4.10')
-conflicts=('nvidia')
-license=('custom')
-options=(!strip)
-source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
-source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-sha512sums_i686=('5866f2b4e6e22863c54d9fc08c9c88c9c911df2396d0ceaca653ded04589ea3a9e4550ed58f4b182b0a42cfe205ef643fe43ea709478e5df5360a7f74fa87f41')
-sha512sums_x86_64=('d5bea7315346e93a7cccd3d99900f4dad51dfa6e93382d4d61c314d0ab97dea063169b8d666d3a3373dea33b4322f945c3a18ed0fc3308e3f89af6f22f373abc')
-
-[[ "$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
-
-cp -a kernel kernel-dkms
-}
-
-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_nvidia-340xx() {
-pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-depends=('linux>=4.9' 'linux<4.10' 'libgl' "nvidia-340xx-utils=${pkgver}")
-conflict+=('nvidia-340xx-dkms')
-install=nvidia-340xx.install
-
-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"
-}
-
-package_nvidia-340xx-dkms() {
-pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
-depends=('dkms' "nvidia-340xx-utils=$pkgver")
-optdepends=('linux-headers: Build the module for Arch kernel'
-'linux-lts-headers: Build the module for LTS Arch kernel')
-conflicts+=('nvidia-340xx')
-
-cd ${_pkg}
-install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
-cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}"/usr/src/nvidia-${pkgver}
-echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
-cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
-}

Copied: nvidia-340xx/repos/testing-i686/PKGBUILD (from rev 287101, 
nvidia-340xx/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-01-21 19:33:48 UTC (rev 287102)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintaine

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

2016-11-22 Thread Tobias Powalowski
Date: Tuesday, November 22, 2016 @ 13:37:18
  Author: tpowa
Revision: 281863

db-move: moved nvidia-340xx from [testing] to [extra] (i686, x86_64)

Added:
  nvidia-340xx/repos/extra-i686/PKGBUILD
(from rev 281862, nvidia-340xx/repos/testing-i686/PKGBUILD)
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
(from rev 281862, nvidia-340xx/repos/testing-i686/nvidia-340xx.install)
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
(from rev 281862, nvidia-340xx/repos/testing-x86_64/PKGBUILD)
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
(from rev 281862, nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install)
Deleted:
  nvidia-340xx/repos/extra-i686/PKGBUILD
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-x86_64/

---+
 /PKGBUILD |  136 
 /nvidia-340xx.install |   26 ++
 extra-i686/PKGBUILD   |   68 --
 extra-i686/nvidia-340xx.install   |   13 ---
 extra-x86_64/PKGBUILD |   68 --
 extra-x86_64/nvidia-340xx.install |   13 ---
 6 files changed, 162 insertions(+), 162 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-11-22 13:37:16 UTC (rev 281862)
+++ extra-i686/PKGBUILD 2016-11-22 13:37:18 UTC (rev 281863)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan 
-# Contributor: Thomas Baechler 
-
-pkgbase=nvidia-340xx
-pkgname=(nvidia-340xx nvidia-340xx-dkms)
-pkgver=340.98
-_extramodules=extramodules-4.8-ARCH
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/";
-makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.8' 'linux-headers<4.9')
-conflicts=('nvidia')
-license=('custom')
-options=(!strip)
-source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
-source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-md5sums_i686=('3ccb023eec137cbee0d2035c288b6bbe')
-md5sums_x86_64=('e8d1292d8d002a15e10ea349151fa8f2')
-
-[[ "$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
-
-cp -a kernel kernel-dkms
-}
-
-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_nvidia-340xx() {
-pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-depends=('linux>=4.8' 'linux<4.9' 'libgl' "nvidia-340xx-utils=${pkgver}")
-conflict+=('nvidia-340xx-dkms')
-install=nvidia-340xx.install
-
-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"
-}
-
-package_nvidia-340xx-dkms() {
-pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
-depends=('dkms' "nvidia-340xx-utils=$pkgver")
-optdepends=('linux-headers: Build the module for Arch kernel'
-'linux-lts-headers: Build the module for LTS Arch kernel')
-conflicts+=('nvidia-340xx')
-
-cd ${_pkg}
-install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
-cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}"/usr/src/nvidia-${pkgver}
-echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
-cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
-}

Copied: nvidia-340xx/repos/extra-i686/PKGBUILD (from rev 281862, 
nvidia-340xx/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-11-22 13:37:18 UTC (rev 281863)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.98
+_extramodules=extramodules-4.8-ARCH
+pkgrel=4
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.8' 'linux-headers<4.9')
+conflicts=('nvidia')
+license=('custom')
+options=(!strip)

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

2016-10-18 Thread Tobias Powalowski
Date: Wednesday, October 19, 2016 @ 06:18:28
  Author: tpowa
Revision: 278977

db-move: moved nvidia-340xx from [testing] to [extra] (i686, x86_64)

Added:
  nvidia-340xx/repos/extra-i686/PKGBUILD
(from rev 278976, nvidia-340xx/repos/testing-i686/PKGBUILD)
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
(from rev 278976, nvidia-340xx/repos/testing-i686/nvidia-340xx.install)
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
(from rev 278976, nvidia-340xx/repos/testing-x86_64/PKGBUILD)
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
(from rev 278976, nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install)
Deleted:
  nvidia-340xx/repos/extra-i686/PKGBUILD
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-x86_64/

---+
 /PKGBUILD |  136 
 /nvidia-340xx.install |   26 ++
 extra-i686/PKGBUILD   |   68 --
 extra-i686/nvidia-340xx.install   |   13 ---
 extra-x86_64/PKGBUILD |   68 --
 extra-x86_64/nvidia-340xx.install |   13 ---
 6 files changed, 162 insertions(+), 162 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-10-19 06:18:26 UTC (rev 278976)
+++ extra-i686/PKGBUILD 2016-10-19 06:18:28 UTC (rev 278977)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan 
-# Contributor: Thomas Baechler 
-
-pkgbase=nvidia-340xx
-pkgname=(nvidia-340xx nvidia-340xx-dkms)
-pkgver=340.98
-_extramodules=extramodules-4.7-ARCH
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/";
-makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.7' 'linux-headers<4.8')
-conflicts=('nvidia')
-license=('custom')
-options=(!strip)
-source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
-source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-md5sums_i686=('3ccb023eec137cbee0d2035c288b6bbe')
-md5sums_x86_64=('e8d1292d8d002a15e10ea349151fa8f2')
-
-[[ "$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
-
-cp -a kernel kernel-dkms
-}
-
-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_nvidia-340xx() {
-pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-depends=('linux>=4.7' 'linux<4.8' 'libgl' "nvidia-340xx-utils=${pkgver}")
-conflict+=('nvidia-340xx-dkms')
-install=nvidia-340xx.install
-
-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"
-}
-
-package_nvidia-340xx-dkms() {
-pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
-depends=('dkms' "nvidia-340xx-utils=$pkgver")
-optdepends=('linux-headers: Build the module for Arch kernel'
-'linux-lts-headers: Build the module for LTS Arch kernel')
-conflicts+=('nvidia-340xx')
-
-cd ${_pkg}
-install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
-cp -dr --no-preserve='ownership' kernel-dkms 
"${pkgdir}"/usr/src/nvidia-${pkgver}
-echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
-cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
-}

Copied: nvidia-340xx/repos/extra-i686/PKGBUILD (from rev 278976, 
nvidia-340xx/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-10-19 06:18:28 UTC (rev 278977)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.98
+_extramodules=extramodules-4.8-ARCH
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.8' 'linux-headers<4.9')
+conflicts=('nvidia')
+license=('custom')
+options=(!strip)

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

2016-05-09 Thread Tobias Powalowski
Date: Tuesday, May 10, 2016 @ 08:18:29
  Author: tpowa
Revision: 267304

db-move: moved nvidia-340xx from [testing] to [extra] (i686, x86_64)

Added:
  nvidia-340xx/repos/extra-i686/PKGBUILD
(from rev 267303, nvidia-340xx/repos/testing-i686/PKGBUILD)
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
(from rev 267303, nvidia-340xx/repos/testing-i686/nvidia-340xx.install)
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
(from rev 267303, nvidia-340xx/repos/testing-x86_64/PKGBUILD)
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
(from rev 267303, nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install)
Deleted:
  nvidia-340xx/repos/extra-i686/PKGBUILD
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-x86_64/

---+
 /PKGBUILD |  134 
 /nvidia-340xx.install |   26 ++
 extra-i686/PKGBUILD   |   67 --
 extra-i686/nvidia-340xx.install   |   13 ---
 extra-x86_64/PKGBUILD |   67 --
 extra-x86_64/nvidia-340xx.install |   13 ---
 6 files changed, 160 insertions(+), 160 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-05-10 06:18:28 UTC (rev 267303)
+++ extra-i686/PKGBUILD 2016-05-10 06:18:29 UTC (rev 267304)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan 
-# Contributor: Thomas Baechler 
-
-pkgbase=nvidia-340xx
-pkgname=(nvidia-340xx nvidia-340xx-dkms)
-pkgver=340.96
-_extramodules=extramodules-4.5-ARCH
-pkgrel=11
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/";
-makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.5' 'linux-headers<4.6')
-conflicts=('nvidia')
-license=('custom')
-options=(!strip)
-source_i686+=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
-source_x86_64+=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-md5sums_i686=('cb64b165b638671bcdc75bcf297b8d90')
-md5sums_x86_64=('7bdbcee13bade63227933d9217571882')
-
-[[ "$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_nvidia-340xx() {
-pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-depends=('linux>=4.5' 'linux<4.6' 'libgl' "nvidia-340xx-utils=${pkgver}")
-conflict+=('nvidia-340xx-dkms')
-install=nvidia-340xx.install
-
-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"
-}
-
-package_nvidia-340xx-dkms() {
-pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
-depends=('dkms' "nvidia-340xx-utils=$pkgver")
-optdepends=('linux-headers: Build the module for Arch kernel'
-'linux-lts-headers: Build the module for LTS Arch kernel')
-conflicts+=('nvidia-340xx')
-
-cd ${_pkg}
-make -C kernel clean
-install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
-cp -dr --no-preserve='ownership' kernel 
"${pkgdir}"/usr/src/nvidia-${pkgver}
-echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
-cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
-}

Copied: nvidia-340xx/repos/extra-i686/PKGBUILD (from rev 267303, 
nvidia-340xx/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-05-10 06:18:29 UTC (rev 267304)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.96
+_extramodules=extramodules-4.5-ARCH
+pkgrel=12
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.5' 'linux-headers<4.6')
+conflicts=('nvidia')
+license=('custom')
+options=(!strip)
+source_i686+=("ftp://

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

2016-05-07 Thread Tobias Powalowski
Date: Saturday, May 7, 2016 @ 20:25:37
  Author: tpowa
Revision: 267192

db-move: moved nvidia-340xx from [testing] to [extra] (i686, x86_64)

Added:
  nvidia-340xx/repos/extra-i686/PKGBUILD
(from rev 267191, nvidia-340xx/repos/testing-i686/PKGBUILD)
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
(from rev 267191, nvidia-340xx/repos/testing-i686/nvidia-340xx.install)
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
(from rev 267191, nvidia-340xx/repos/testing-x86_64/PKGBUILD)
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
(from rev 267191, nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install)
Deleted:
  nvidia-340xx/repos/extra-i686/PKGBUILD
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-x86_64/

---+
 /PKGBUILD |  134 
 /nvidia-340xx.install |   26 ++
 extra-i686/PKGBUILD   |   67 --
 extra-i686/nvidia-340xx.install   |   13 ---
 extra-x86_64/PKGBUILD |   67 --
 extra-x86_64/nvidia-340xx.install |   13 ---
 6 files changed, 160 insertions(+), 160 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-05-07 18:25:35 UTC (rev 267191)
+++ extra-i686/PKGBUILD 2016-05-07 18:25:37 UTC (rev 267192)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan 
-# Contributor: Thomas Baechler 
-
-pkgbase=nvidia-340xx
-pkgname=(nvidia-340xx nvidia-340xx-dkms)
-pkgver=340.96
-_extramodules=extramodules-4.5-ARCH
-pkgrel=10
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/";
-makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.5' 'linux-headers<4.6')
-conflicts=('nvidia')
-license=('custom')
-options=(!strip)
-source_i686+=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
-source_x86_64+=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-md5sums_i686=('cb64b165b638671bcdc75bcf297b8d90')
-md5sums_x86_64=('7bdbcee13bade63227933d9217571882')
-
-[[ "$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_nvidia-340xx() {
-pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-depends=('linux>=4.5' 'linux<4.6' 'libgl' "nvidia-340xx-utils=${pkgver}")
-conflict+=('nvidia-340xx-dkms')
-install=nvidia-340xx.install
-
-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"
-}
-
-package_nvidia-340xx-dkms() {
-pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
-depends=('dkms' "nvidia-340xx-utils=$pkgver")
-optdepends=('linux-headers: Build the module for Arch kernel'
-'linux-lts-headers: Build the module for LTS Arch kernel')
-conflicts+=('nvidia-340xx')
-
-cd ${_pkg}
-make -C kernel clean
-install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
-cp -dr --no-preserve='ownership' kernel 
"${pkgdir}"/usr/src/nvidia-${pkgver}
-echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
-cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
-}

Copied: nvidia-340xx/repos/extra-i686/PKGBUILD (from rev 267191, 
nvidia-340xx/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-05-07 18:25:37 UTC (rev 267192)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.96
+_extramodules=extramodules-4.5-ARCH
+pkgrel=11
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.5' 'linux-headers<4.6')
+conflicts=('nvidia')
+license=('custom')
+options=(!strip)
+source_i686+=("ftp://

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

2016-04-18 Thread Tobias Powalowski
Date: Tuesday, April 19, 2016 @ 08:55:46
  Author: tpowa
Revision: 265151

db-move: moved nvidia-340xx from [testing] to [extra] (i686, x86_64)

Added:
  nvidia-340xx/repos/extra-i686/PKGBUILD
(from rev 265150, nvidia-340xx/repos/testing-i686/PKGBUILD)
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
(from rev 265150, nvidia-340xx/repos/testing-i686/nvidia-340xx.install)
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
(from rev 265150, nvidia-340xx/repos/testing-x86_64/PKGBUILD)
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
(from rev 265150, nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install)
Deleted:
  nvidia-340xx/repos/extra-i686/PKGBUILD
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-x86_64/

---+
 /PKGBUILD |  134 
 /nvidia-340xx.install |   26 ++
 extra-i686/PKGBUILD   |   67 --
 extra-i686/nvidia-340xx.install   |   13 ---
 extra-x86_64/PKGBUILD |   67 --
 extra-x86_64/nvidia-340xx.install |   13 ---
 6 files changed, 160 insertions(+), 160 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-04-19 06:55:45 UTC (rev 265150)
+++ extra-i686/PKGBUILD 2016-04-19 06:55:46 UTC (rev 265151)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan 
-# Contributor: Thomas Baechler 
-
-pkgbase=nvidia-340xx
-pkgname=(nvidia-340xx nvidia-340xx-dkms)
-pkgver=340.96
-_extramodules=extramodules-4.5-ARCH
-pkgrel=9
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/";
-makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.5' 'linux-headers<4.6')
-conflicts=('nvidia')
-license=('custom')
-options=(!strip)
-source_i686+=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
-source_x86_64+=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-md5sums_i686=('cb64b165b638671bcdc75bcf297b8d90')
-md5sums_x86_64=('7bdbcee13bade63227933d9217571882')
-
-[[ "$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_nvidia-340xx() {
-pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-depends=('linux>=4.5' 'linux<4.6' 'libgl' "nvidia-340xx-utils=${pkgver}")
-conflict+=('nvidia-340xx-dkms')
-install=nvidia-340xx.install
-
-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"
-}
-
-package_nvidia-340xx-dkms() {
-pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
-depends=('dkms' "nvidia-340xx-utils=$pkgver")
-optdepends=('linux-headers: Build the module for Arch kernel'
-'linux-lts-headers: Build the module for LTS Arch kernel')
-conflicts+=('nvidia-340xx')
-
-cd ${_pkg}
-make -C kernel clean
-install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
-cp -dr --no-preserve='ownership' kernel 
"${pkgdir}"/usr/src/nvidia-${pkgver}
-echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
-cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
-}

Copied: nvidia-340xx/repos/extra-i686/PKGBUILD (from rev 265150, 
nvidia-340xx/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-04-19 06:55:46 UTC (rev 265151)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.96
+_extramodules=extramodules-4.5-ARCH
+pkgrel=10
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.5' 'linux-headers<4.6')
+conflicts=('nvidia')
+license=('custom')
+options=(!strip)
+source_i686+=("ftp:/

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

2016-04-13 Thread Tobias Powalowski
Date: Thursday, April 14, 2016 @ 07:06:53
  Author: tpowa
Revision: 264862

db-move: moved nvidia-340xx from [testing] to [extra] (i686, x86_64)

Added:
  nvidia-340xx/repos/extra-i686/PKGBUILD
(from rev 264861, nvidia-340xx/repos/testing-i686/PKGBUILD)
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
(from rev 264861, nvidia-340xx/repos/testing-i686/nvidia-340xx.install)
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
(from rev 264861, nvidia-340xx/repos/testing-x86_64/PKGBUILD)
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
(from rev 264861, nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install)
Deleted:
  nvidia-340xx/repos/extra-i686/PKGBUILD
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-x86_64/

---+
 /PKGBUILD |  134 
 /nvidia-340xx.install |   26 ++
 extra-i686/PKGBUILD   |   67 --
 extra-i686/nvidia-340xx.install   |   13 ---
 extra-x86_64/PKGBUILD |   67 --
 extra-x86_64/nvidia-340xx.install |   13 ---
 6 files changed, 160 insertions(+), 160 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-04-14 05:06:52 UTC (rev 264861)
+++ extra-i686/PKGBUILD 2016-04-14 05:06:53 UTC (rev 264862)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan 
-# Contributor: Thomas Baechler 
-
-pkgbase=nvidia-340xx
-pkgname=(nvidia-340xx nvidia-340xx-dkms)
-pkgver=340.96
-_extramodules=extramodules-4.4-ARCH
-pkgrel=8
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/";
-makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.4' 'linux-headers<4.5')
-conflicts=('nvidia')
-license=('custom')
-options=(!strip)
-source_i686+=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
-source_x86_64+=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-md5sums_i686=('cb64b165b638671bcdc75bcf297b8d90')
-md5sums_x86_64=('7bdbcee13bade63227933d9217571882')
-
-[[ "$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_nvidia-340xx() {
-pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-depends=('linux>=4.4' 'linux<4.5' 'libgl' "nvidia-340xx-utils=${pkgver}")
-conflict+=('nvidia-340xx-dkms')
-install=nvidia-340xx.install
-
-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"
-}
-
-package_nvidia-340xx-dkms() {
-pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
-depends=('dkms' "nvidia-340xx-utils=$pkgver")
-optdepends=('linux-headers: Build the module for Arch kernel'
-'linux-lts-headers: Build the module for LTS Arch kernel')
-conflicts+=('nvidia-340xx')
-
-cd ${_pkg}
-make -C kernel clean
-install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
-cp -dr --no-preserve='ownership' kernel 
"${pkgdir}"/usr/src/nvidia-${pkgver}
-echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
-cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
-}

Copied: nvidia-340xx/repos/extra-i686/PKGBUILD (from rev 264861, 
nvidia-340xx/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-04-14 05:06:53 UTC (rev 264862)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.96
+_extramodules=extramodules-4.5-ARCH
+pkgrel=9
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.5' 'linux-headers<4.6')
+conflicts=('nvidia')
+license=('custom')
+options=(!strip)
+source_i686+=("ftp:/

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

2015-10-24 Thread Tobias Powalowski
Date: Saturday, October 24, 2015 @ 09:15:43
  Author: tpowa
Revision: 249732

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

Added:
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-i686/PKGBUILD
(from rev 249731, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-i686/nv-drm.patch
(from rev 249731, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/testing-i686/nvidia-340xx-dkms.install
(from rev 249731, nvidia-340xx/trunk/nvidia-340xx-dkms.install)
  nvidia-340xx/repos/testing-i686/nvidia-340xx.install
(from rev 249731, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/testing-x86_64/
  nvidia-340xx/repos/testing-x86_64/PKGBUILD
(from rev 249731, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-x86_64/nv-drm.patch
(from rev 249731, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/testing-x86_64/nvidia-340xx-dkms.install
(from rev 249731, nvidia-340xx/trunk/nvidia-340xx-dkms.install)
  nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install
(from rev 249731, nvidia-340xx/trunk/nvidia-340xx.install)

--+
 testing-i686/PKGBUILD|   71 +
 testing-i686/nv-drm.patch|   27 +++
 testing-i686/nvidia-340xx-dkms.install   |   30 
 testing-i686/nvidia-340xx.install|   13 +
 testing-x86_64/PKGBUILD  |   71 +
 testing-x86_64/nv-drm.patch  |   27 +++
 testing-x86_64/nvidia-340xx-dkms.install |   30 
 testing-x86_64/nvidia-340xx.install  |   13 +
 8 files changed, 282 insertions(+)

Copied: nvidia-340xx/repos/testing-i686/PKGBUILD (from rev 249731, 
nvidia-340xx/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-10-24 07:15:43 UTC (rev 249732)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.93
+_extramodules=extramodules-4.2-ARCH
+pkgrel=4
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 
'linux' 'linux-headers>=4.2' 'linux-headers<4.3')
+conflicts=('nvidia')
+license=('custom')
+options=(!strip)
+source=(nv-drm.patch)
+source_i686+=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
+source_x86_64+=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
+md5sums=('79671a27131da619a33eb02ed0c2c031')
+md5sums_i686=('4a7edf6838a80c77a57fb6f6ec7f0437')
+md5sums_x86_64=('cb80e3f1cb6f2fb6e6eab35fad0884e4')
+
+[[ "$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 -p0 -i ../nv-drm.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_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.2' 'linux<4.3' 'libgl' "nvidia-340xx-utils=${pkgver}")
+conflict+=('nvidia-340xx-dkms')
+install=nvidia-340xx.install
+
+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"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver")
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflicts+=('nvidia-340xx')
+install=nvidia-340xx-dkms.install
+
+cd ${_pkg}
+make -C kernel clean
+install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+cp -dr --no-preserve='ownership' kernel 
"${pkgdir}"/usr/src/nvidia-${pkgver}
+echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
+cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> 
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+}

Copied: nvidia-340xx/repos/testing-i686/nv-drm.patch (from rev 249731, 
nvidia-340xx/trunk/nv-drm.patch)
===
--- testi

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

2015-09-03 Thread Felix Yan
Date: Friday, September 4, 2015 @ 07:46:27
  Author: fyan
Revision: 245256

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

Added:
  nvidia-340xx/repos/staging-i686/
  nvidia-340xx/repos/staging-i686/PKGBUILD
(from rev 245255, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-i686/nv-drm.patch
(from rev 245255, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/staging-i686/nvidia-340xx-dkms.install
(from rev 245255, nvidia-340xx/trunk/nvidia-340xx-dkms.install)
  nvidia-340xx/repos/staging-i686/nvidia-340xx.install
(from rev 245255, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 245255, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/nv-drm.patch
(from rev 245255, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/staging-x86_64/nvidia-340xx-dkms.install
(from rev 245255, nvidia-340xx/trunk/nvidia-340xx-dkms.install)
  nvidia-340xx/repos/staging-x86_64/nvidia-340xx.install
(from rev 245255, nvidia-340xx/trunk/nvidia-340xx.install)

--+
 staging-i686/PKGBUILD|   69 +
 staging-i686/nv-drm.patch|   27 +++
 staging-i686/nvidia-340xx-dkms.install   |   30 
 staging-i686/nvidia-340xx.install|   13 +
 staging-x86_64/PKGBUILD  |   69 +
 staging-x86_64/nv-drm.patch  |   27 +++
 staging-x86_64/nvidia-340xx-dkms.install |   30 
 staging-x86_64/nvidia-340xx.install  |   13 +
 8 files changed, 278 insertions(+)

Copied: nvidia-340xx/repos/staging-i686/PKGBUILD (from rev 245255, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-09-04 05:46:27 UTC (rev 245256)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer : Thomas Baechler 
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.93
+_extramodules=extramodules-4.2-ARCH
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.2' 
'linux-headers<4.3')
+conflicts=('nvidia')
+license=('custom')
+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.patch)
+md5sums=('4a7edf6838a80c77a57fb6f6ec7f0437'
+ 'cb80e3f1cb6f2fb6e6eab35fad0884e4'
+ '79671a27131da619a33eb02ed0c2c031')
+
+[[ "$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 -p0 -i ../nv-drm.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_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.2' 'linux<4.3' 'libgl' "nvidia-340xx-utils=${pkgver}")
+conflict+=('nvidia-340xx-dkms')
+install=nvidia-340xx.install
+
+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"
+}
+
+package_nvidia-340xx-dkms() {
+pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+depends=('dkms' "nvidia-340xx-utils=$pkgver")
+optdepends=('linux-headers: Build the module for Arch kernel'
+'linux-lts-headers: Build the module for LTS Arch kernel')
+conflict+=('nvidia-340xx')
+install=nvidia-340xx-dkms.install
+
+cd ${_pkg}
+make -C kernel clean
+install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+cp -dr --no-preserve='ownership' kernel 
"${pkgdir}"/usr/src/nvidia-${pkgver}
+echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
+}

Copied: nvidia-340xx/repos/staging-i686/nv-drm.patch (from rev 245255, 
nvidia-340xx/trunk/nv-drm.patch)
===
--- staging-i686/nv-drm.patch   (rev 0)
+++ staging-i686/nv-drm.patch   2015-09-04 05:46:27 UTC (rev 245256)
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.0 +0200
 kerne

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

2015-09-03 Thread Tobias Powalowski
Date: Thursday, September 3, 2015 @ 21:21:41
  Author: tpowa
Revision: 245249

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

Added:
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-i686/PKGBUILD
(from rev 245248, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-i686/nv-drm.patch
(from rev 245248, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/testing-i686/nvidia-340xx.install
(from rev 245248, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/testing-i686/nvidia-4.0.patch
(from rev 245248, nvidia-340xx/trunk/nvidia-4.0.patch)
  nvidia-340xx/repos/testing-x86_64/
  nvidia-340xx/repos/testing-x86_64/PKGBUILD
(from rev 245248, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-x86_64/nv-drm.patch
(from rev 245248, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install
(from rev 245248, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/testing-x86_64/nvidia-4.0.patch
(from rev 245248, nvidia-340xx/trunk/nvidia-4.0.patch)

-+
 testing-i686/PKGBUILD   |   54 ++
 testing-i686/nv-drm.patch   |   27 +
 testing-i686/nvidia-340xx.install   |   13 
 testing-i686/nvidia-4.0.patch   |   28 +
 testing-x86_64/PKGBUILD |   54 ++
 testing-x86_64/nv-drm.patch |   27 +
 testing-x86_64/nvidia-340xx.install |   13 
 testing-x86_64/nvidia-4.0.patch |   28 +
 8 files changed, 244 insertions(+)

Copied: nvidia-340xx/repos/testing-i686/PKGBUILD (from rev 245248, 
nvidia-340xx/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-09-03 19:21:41 UTC (rev 245249)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
+# Maintainer : Thomas Baechler 
+
+pkgname=nvidia-340xx
+pkgver=340.76
+_extramodules=extramodules-4.2-ARCH
+pkgrel=15
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+depends=('linux>=4.2' 'linux<4.3' 'nvidia-340xx-libgl' 
"nvidia-340xx-utils=${pkgver}")
+makedepends=('linux-headers>=4.2' 'linux-headers<4.3')
+conflicts=('nvidia')
+license=('custom')
+install=${pkgname}.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.patch
+nvidia-4.0.patch)
+md5sums=('8064c0a0998c3e7ee3c98ac1832b8194'
+ '440df290e213280d6e20d4d4be6f8b4c'
+ '79671a27131da619a33eb02ed0c2c031'
+ 'f42bdf589f52d4e6c38baa5bef15eef8')
+
+[[ "$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 -p0 -i ../nv-drm.patch
+patch -p0 -i ../nvidia-4.0.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-340xx/repos/testing-i686/nv-drm.patch (from rev 245248, 
nvidia-340xx/trunk/nv-drm.patch)
===
--- testing-i686/nv-drm.patch   (rev 0)
+++ testing-i686/nv-drm.patch   2015-09-03 19:21:41 UTC (rev 245249)
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.0 +0200
 kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include 
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include 
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
 kernel/nv-drm.c
+@@ -129,6 +129,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",

Copied: nvidia-3

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

2015-08-12 Thread Tobias Powalowski
Date: Wednesday, August 12, 2015 @ 09:25:22
  Author: tpowa
Revision: 243203

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

Added:
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-i686/PKGBUILD
(from rev 243202, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-i686/nv-drm.patch
(from rev 243202, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/testing-i686/nvidia-340xx.install
(from rev 243202, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/testing-i686/nvidia-4.0.patch
(from rev 243202, nvidia-340xx/trunk/nvidia-4.0.patch)
  nvidia-340xx/repos/testing-x86_64/
  nvidia-340xx/repos/testing-x86_64/PKGBUILD
(from rev 243202, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-x86_64/nv-drm.patch
(from rev 243202, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install
(from rev 243202, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/testing-x86_64/nvidia-4.0.patch
(from rev 243202, nvidia-340xx/trunk/nvidia-4.0.patch)

-+
 testing-i686/PKGBUILD   |   54 ++
 testing-i686/nv-drm.patch   |   27 +
 testing-i686/nvidia-340xx.install   |   13 
 testing-i686/nvidia-4.0.patch   |   28 +
 testing-x86_64/PKGBUILD |   54 ++
 testing-x86_64/nv-drm.patch |   27 +
 testing-x86_64/nvidia-340xx.install |   13 
 testing-x86_64/nvidia-4.0.patch |   28 +
 8 files changed, 244 insertions(+)

Copied: nvidia-340xx/repos/testing-i686/PKGBUILD (from rev 243202, 
nvidia-340xx/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-08-12 07:25:22 UTC (rev 243203)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
+# Maintainer : Thomas Baechler 
+
+pkgname=nvidia-340xx
+pkgver=340.76
+_extramodules=extramodules-4.1-ARCH
+pkgrel=14
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+depends=('linux>=4.1' 'linux<4.2' 'libgl' "nvidia-340xx-utils=${pkgver}")
+makedepends=('linux-headers>=4.1' 'linux-headers<4.2')
+conflicts=('nvidia')
+license=('custom')
+install=${pkgname}.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.patch
+nvidia-4.0.patch)
+md5sums=('8064c0a0998c3e7ee3c98ac1832b8194'
+ '440df290e213280d6e20d4d4be6f8b4c'
+ '79671a27131da619a33eb02ed0c2c031'
+ 'f42bdf589f52d4e6c38baa5bef15eef8')
+
+[[ "$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 -p0 -i ../nv-drm.patch
+patch -p0 -i ../nvidia-4.0.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-340xx/repos/testing-i686/nv-drm.patch (from rev 243202, 
nvidia-340xx/trunk/nv-drm.patch)
===
--- testing-i686/nv-drm.patch   (rev 0)
+++ testing-i686/nv-drm.patch   2015-08-12 07:25:22 UTC (rev 243203)
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.0 +0200
 kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include 
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include 
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
 kernel/nv-drm.c
+@@ -129,6 +129,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",

Copied: nvidia-340xx/repos/test

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

2015-08-03 Thread Evangelos Foutras
Date: Tuesday, August 4, 2015 @ 00:13:55
  Author: foutrelis
Revision: 242984

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

Added:
  nvidia-340xx/repos/staging-i686/
  nvidia-340xx/repos/staging-i686/PKGBUILD
(from rev 242983, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-i686/nv-drm.patch
(from rev 242983, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/staging-i686/nvidia-340xx.install
(from rev 242983, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/staging-i686/nvidia-4.0.patch
(from rev 242983, nvidia-340xx/trunk/nvidia-4.0.patch)
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 242983, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/nv-drm.patch
(from rev 242983, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/staging-x86_64/nvidia-340xx.install
(from rev 242983, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/staging-x86_64/nvidia-4.0.patch
(from rev 242983, nvidia-340xx/trunk/nvidia-4.0.patch)

-+
 staging-i686/PKGBUILD   |   54 ++
 staging-i686/nv-drm.patch   |   27 +
 staging-i686/nvidia-340xx.install   |   13 
 staging-i686/nvidia-4.0.patch   |   28 +
 staging-x86_64/PKGBUILD |   54 ++
 staging-x86_64/nv-drm.patch |   27 +
 staging-x86_64/nvidia-340xx.install |   13 
 staging-x86_64/nvidia-4.0.patch |   28 +
 8 files changed, 244 insertions(+)

Copied: nvidia-340xx/repos/staging-i686/PKGBUILD (from rev 242983, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-08-03 22:13:55 UTC (rev 242984)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
+# Maintainer : Thomas Baechler 
+
+pkgname=nvidia-340xx
+pkgver=340.76
+_extramodules=extramodules-4.1-ARCH
+pkgrel=13
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+depends=('linux>=4.1' 'linux<4.2' 'libgl' "nvidia-340xx-utils=${pkgver}")
+makedepends=('linux-headers>=4.1' 'linux-headers<4.2')
+conflicts=('nvidia')
+license=('custom')
+install=${pkgname}.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.patch
+nvidia-4.0.patch)
+md5sums=('8064c0a0998c3e7ee3c98ac1832b8194'
+ '440df290e213280d6e20d4d4be6f8b4c'
+ '79671a27131da619a33eb02ed0c2c031'
+ 'f42bdf589f52d4e6c38baa5bef15eef8')
+
+[[ "$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 -p0 -i ../nv-drm.patch
+patch -p0 -i ../nvidia-4.0.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-340xx/repos/staging-i686/nv-drm.patch (from rev 242983, 
nvidia-340xx/trunk/nv-drm.patch)
===
--- staging-i686/nv-drm.patch   (rev 0)
+++ staging-i686/nv-drm.patch   2015-08-03 22:13:55 UTC (rev 242984)
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.0 +0200
 kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include 
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include 
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
 kernel/nv-drm.c
+@@ -129,6 +129,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",

Copied: nvidia-340xx/repos/sta

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

2015-07-10 Thread Evangelos Foutras
Date: Friday, July 10, 2015 @ 20:20:06
  Author: foutrelis
Revision: 242098

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

Added:
  nvidia-340xx/repos/staging-i686/
  nvidia-340xx/repos/staging-i686/PKGBUILD
(from rev 242097, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-i686/nv-drm.patch
(from rev 242097, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/staging-i686/nvidia-340xx.install
(from rev 242097, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/staging-i686/nvidia-4.0.patch
(from rev 242097, nvidia-340xx/trunk/nvidia-4.0.patch)
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 242097, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/nv-drm.patch
(from rev 242097, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/staging-x86_64/nvidia-340xx.install
(from rev 242097, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/staging-x86_64/nvidia-4.0.patch
(from rev 242097, nvidia-340xx/trunk/nvidia-4.0.patch)

-+
 staging-i686/PKGBUILD   |   54 ++
 staging-i686/nv-drm.patch   |   27 +
 staging-i686/nvidia-340xx.install   |   13 
 staging-i686/nvidia-4.0.patch   |   28 +
 staging-x86_64/PKGBUILD |   54 ++
 staging-x86_64/nv-drm.patch |   27 +
 staging-x86_64/nvidia-340xx.install |   13 
 staging-x86_64/nvidia-4.0.patch |   28 +
 8 files changed, 244 insertions(+)

Copied: nvidia-340xx/repos/staging-i686/PKGBUILD (from rev 242097, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-07-10 18:20:06 UTC (rev 242098)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
+# Maintainer : Thomas Baechler 
+
+pkgname=nvidia-340xx
+pkgver=340.76
+_extramodules=extramodules-4.1-ARCH
+pkgrel=12
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+depends=('linux>=4.1' 'linux<4.2' 'libgl' "nvidia-340xx-utils=${pkgver}")
+makedepends=('linux-headers>=4.1' 'linux-headers<4.2')
+conflicts=('nvidia')
+license=('custom')
+install=${pkgname}.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.patch
+nvidia-4.0.patch)
+md5sums=('8064c0a0998c3e7ee3c98ac1832b8194'
+ '440df290e213280d6e20d4d4be6f8b4c'
+ '79671a27131da619a33eb02ed0c2c031'
+ 'f42bdf589f52d4e6c38baa5bef15eef8')
+
+[[ "$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 -p0 -i ../nv-drm.patch
+patch -p0 -i ../nvidia-4.0.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-340xx/repos/staging-i686/nv-drm.patch (from rev 242097, 
nvidia-340xx/trunk/nv-drm.patch)
===
--- staging-i686/nv-drm.patch   (rev 0)
+++ staging-i686/nv-drm.patch   2015-07-10 18:20:06 UTC (rev 242098)
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.0 +0200
 kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include 
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include 
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
 kernel/nv-drm.c
+@@ -129,6 +129,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",

Copied: nvidia-340xx/repos/stagi

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

2015-07-04 Thread Evangelos Foutras
Date: Saturday, July 4, 2015 @ 16:29:30
  Author: foutrelis
Revision: 241803

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

Added:
  nvidia-340xx/repos/staging-i686/
  nvidia-340xx/repos/staging-i686/PKGBUILD
(from rev 241802, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-i686/nv-drm.patch
(from rev 241802, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/staging-i686/nvidia-340xx.install
(from rev 241802, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/staging-i686/nvidia-4.0.patch
(from rev 241802, nvidia-340xx/trunk/nvidia-4.0.patch)
  nvidia-340xx/repos/staging-x86_64/
  nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 241802, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/staging-x86_64/nv-drm.patch
(from rev 241802, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/staging-x86_64/nvidia-340xx.install
(from rev 241802, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/staging-x86_64/nvidia-4.0.patch
(from rev 241802, nvidia-340xx/trunk/nvidia-4.0.patch)

-+
 staging-i686/PKGBUILD   |   54 ++
 staging-i686/nv-drm.patch   |   27 +
 staging-i686/nvidia-340xx.install   |   13 
 staging-i686/nvidia-4.0.patch   |   28 +
 staging-x86_64/PKGBUILD |   54 ++
 staging-x86_64/nv-drm.patch |   27 +
 staging-x86_64/nvidia-340xx.install |   13 
 staging-x86_64/nvidia-4.0.patch |   28 +
 8 files changed, 244 insertions(+)

Copied: nvidia-340xx/repos/staging-i686/PKGBUILD (from rev 241802, 
nvidia-340xx/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-07-04 14:29:30 UTC (rev 241803)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
+# Maintainer : Thomas Baechler 
+
+pkgname=nvidia-340xx
+pkgver=340.76
+_extramodules=extramodules-4.1-ARCH
+pkgrel=11
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+depends=('linux>=4.1' 'linux<4.2' 'libgl' "nvidia-340xx-utils=${pkgver}")
+makedepends=('linux-headers>=4.1' 'linux-headers<4.2')
+conflicts=('nvidia')
+license=('custom')
+install=${pkgname}.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.patch
+nvidia-4.0.patch)
+md5sums=('8064c0a0998c3e7ee3c98ac1832b8194'
+ '440df290e213280d6e20d4d4be6f8b4c'
+ '79671a27131da619a33eb02ed0c2c031'
+ 'f42bdf589f52d4e6c38baa5bef15eef8')
+
+[[ "$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 -p0 -i ../nv-drm.patch
+patch -p0 -i ../nvidia-4.0.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-340xx/repos/staging-i686/nv-drm.patch (from rev 241802, 
nvidia-340xx/trunk/nv-drm.patch)
===
--- staging-i686/nv-drm.patch   (rev 0)
+++ staging-i686/nv-drm.patch   2015-07-04 14:29:30 UTC (rev 241803)
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.0 +0200
 kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include 
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include 
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
 kernel/nv-drm.c
+@@ -129,6 +129,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",

Copied: nvidia-340xx/repos/stag

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

2015-05-08 Thread Tobias Powalowski
Date: Friday, May 8, 2015 @ 14:26:11
  Author: tpowa
Revision: 238695

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

Added:
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-i686/PKGBUILD
(from rev 238694, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-i686/nv-drm.patch
(from rev 238694, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/testing-i686/nvidia-340xx.install
(from rev 238694, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/testing-i686/nvidia-4.0.patch
(from rev 238694, nvidia-340xx/trunk/nvidia-4.0.patch)
  nvidia-340xx/repos/testing-x86_64/
  nvidia-340xx/repos/testing-x86_64/PKGBUILD
(from rev 238694, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-x86_64/nv-drm.patch
(from rev 238694, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install
(from rev 238694, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/testing-x86_64/nvidia-4.0.patch
(from rev 238694, nvidia-340xx/trunk/nvidia-4.0.patch)

-+
 testing-i686/PKGBUILD   |   54 ++
 testing-i686/nv-drm.patch   |   27 +
 testing-i686/nvidia-340xx.install   |   15 +
 testing-i686/nvidia-4.0.patch   |   28 +
 testing-x86_64/PKGBUILD |   54 ++
 testing-x86_64/nv-drm.patch |   27 +
 testing-x86_64/nvidia-340xx.install |   15 +
 testing-x86_64/nvidia-4.0.patch |   28 +
 8 files changed, 248 insertions(+)

Copied: nvidia-340xx/repos/testing-i686/PKGBUILD (from rev 238694, 
nvidia-340xx/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-05-08 12:26:11 UTC (rev 238695)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
+# Maintainer : Thomas Baechler 
+
+pkgname=nvidia-340xx
+pkgver=340.76
+_extramodules=extramodules-4.0-ARCH
+pkgrel=9
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+depends=('linux>=4.0' 'linux<4.1' 'libgl' "nvidia-340xx-utils=${pkgver}")
+makedepends=('linux-headers>=4.0' 'linux-headers<4.1')
+conflicts=('nvidia')
+license=('custom')
+install=${pkgname}.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.patch
+nvidia-4.0.patch)
+md5sums=('8064c0a0998c3e7ee3c98ac1832b8194'
+ '440df290e213280d6e20d4d4be6f8b4c'
+ '79671a27131da619a33eb02ed0c2c031'
+ 'f42bdf589f52d4e6c38baa5bef15eef8')
+
+[[ "$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 -p0 -i ../nv-drm.patch
+patch -p0 -i ../nvidia-4.0.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-340xx/repos/testing-i686/nv-drm.patch (from rev 238694, 
nvidia-340xx/trunk/nv-drm.patch)
===
--- testing-i686/nv-drm.patch   (rev 0)
+++ testing-i686/nv-drm.patch   2015-05-08 12:26:11 UTC (rev 238695)
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.0 +0200
 kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include 
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include 
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
 kernel/nv-drm.c
+@@ -129,6 +129,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",

Copied: nvidia-340xx/repos/testing-i6

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

2015-04-13 Thread Tobias Powalowski
Date: Monday, April 13, 2015 @ 10:03:55
  Author: tpowa
Revision: 236350

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

Added:
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-i686/PKGBUILD
(from rev 236349, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-i686/nv-drm.patch
(from rev 236349, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/testing-i686/nvidia-340xx.install
(from rev 236349, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/testing-i686/nvidia-4.0.patch
(from rev 236349, nvidia-340xx/trunk/nvidia-4.0.patch)
  nvidia-340xx/repos/testing-x86_64/
  nvidia-340xx/repos/testing-x86_64/PKGBUILD
(from rev 236349, nvidia-340xx/trunk/PKGBUILD)
  nvidia-340xx/repos/testing-x86_64/nv-drm.patch
(from rev 236349, nvidia-340xx/trunk/nv-drm.patch)
  nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install
(from rev 236349, nvidia-340xx/trunk/nvidia-340xx.install)
  nvidia-340xx/repos/testing-x86_64/nvidia-4.0.patch
(from rev 236349, nvidia-340xx/trunk/nvidia-4.0.patch)

-+
 testing-i686/PKGBUILD   |   54 ++
 testing-i686/nv-drm.patch   |   27 +
 testing-i686/nvidia-340xx.install   |   15 +
 testing-i686/nvidia-4.0.patch   |   28 +
 testing-x86_64/PKGBUILD |   54 ++
 testing-x86_64/nv-drm.patch |   27 +
 testing-x86_64/nvidia-340xx.install |   15 +
 testing-x86_64/nvidia-4.0.patch |   28 +
 8 files changed, 248 insertions(+)

Copied: nvidia-340xx/repos/testing-i686/PKGBUILD (from rev 236349, 
nvidia-340xx/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-04-13 08:03:55 UTC (rev 236350)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
+# Maintainer : Thomas Baechler 
+
+pkgname=nvidia-340xx
+pkgver=340.76
+_extramodules=extramodules-4.0-ARCH
+pkgrel=8
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+depends=('linux>=4.0' 'linux<4.1' 'libgl' "nvidia-340xx-utils=${pkgver}")
+makedepends=('linux-headers>=4.0' 'linux-headers<4.1')
+conflicts=('nvidia')
+license=('custom')
+install=${pkgname}.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.patch
+nvidia-4.0.patch)
+md5sums=('8064c0a0998c3e7ee3c98ac1832b8194'
+ '440df290e213280d6e20d4d4be6f8b4c'
+ '79671a27131da619a33eb02ed0c2c031'
+ 'f42bdf589f52d4e6c38baa5bef15eef8')
+
+[[ "$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 -p0 -i ../nv-drm.patch
+patch -p0 -i ../nvidia-4.0.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-340xx/repos/testing-i686/nv-drm.patch (from rev 236349, 
nvidia-340xx/trunk/nv-drm.patch)
===
--- testing-i686/nv-drm.patch   (rev 0)
+++ testing-i686/nv-drm.patch   2015-04-13 08:03:55 UTC (rev 236350)
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.0 +0200
 kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include 
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include 
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
 kernel/nv-drm.c
+@@ -129,6 +129,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",

Copied: nvidia-340xx/repos/testing

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

2014-12-20 Thread Felix Yan
Date: Sunday, December 21, 2014 @ 05:39:44
  Author: fyan
Revision: 227856

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

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

-+
 /PKGBUILD   |  102 ++
 /nvidia-340xx.install   |   30 ++
 testing-i686/PKGBUILD   |   48 
 testing-i686/nv-drm.patch   |   27 +
 testing-i686/nvidia-340xx.install   |   15 -
 testing-x86_64/PKGBUILD |   48 
 testing-x86_64/nv-drm.patch |   27 +
 testing-x86_64/nvidia-340xx.install |   15 -
 8 files changed, 186 insertions(+), 126 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2014-12-21 04:39:21 UTC (rev 227855)
+++ testing-i686/PKGBUILD   2014-12-21 04:39:44 UTC (rev 227856)
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
-# Maintainer : Thomas Baechler 
-
-pkgname=nvidia-340xx
-pkgver=340.65
-_extramodules=extramodules-3.18-ARCH
-pkgrel=5
-pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/";
-depends=('linux>=3.18' 'linux<3.19' "nvidia-340xx-libgl" 
"nvidia-340xx-utils=${pkgver}")
-makedepends=('linux-headers>=3.18' 'linux-headers<3.19')
-conflicts=('nvidia')
-license=('custom')
-install=${pkgname}.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=('4aa6039b8543312b41a924bb87b0b2db'
- '4558104f8601d27c7fd3e5cec7892345')
-
-[[ "$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-340xx/repos/testing-i686/PKGBUILD (from rev 227855, 
nvidia-340xx/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-12-21 04:39:44 UTC (rev 227856)
@@ -0,0 +1,51 @@
+# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
+# Maintainer : Thomas Baechler 
+
+pkgname=nvidia-340xx
+pkgver=340.65
+_extramodules=extramodules-3.18-ARCH
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+depends=('linux>=3.18' 'linux<3.19' "nvidia-340xx-libgl" 
"nvidia-340xx-utils=${pkgver}")
+makedepends=('linux-headers>=3.18' 'linux-headers<3.19')
+conflicts=('nvidia')
+license=('custom')
+install=${pkgname}.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.patch)
+md5sums=('4aa6039b8543312b41a924bb87b0b2db'
+ '4558104f8601d27c7fd3e5cec7892345'
+ '79671a27131da619a33eb02ed0c2c031')
+
+[[ "$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}"
+ 

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

2014-11-26 Thread Tobias Powalowski
Date: Wednesday, November 26, 2014 @ 14:39:48
  Author: tpowa
Revision: 227130

db-move: moved nvidia-340xx from [testing] to [extra] (i686, x86_64)

Added:
  nvidia-340xx/repos/extra-i686/PKGBUILD
(from rev 227126, nvidia-340xx/repos/testing-i686/PKGBUILD)
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
(from rev 227126, nvidia-340xx/repos/testing-i686/nvidia-340xx.install)
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
(from rev 227126, nvidia-340xx/repos/testing-x86_64/PKGBUILD)
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
(from rev 227126, nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install)
Deleted:
  nvidia-340xx/repos/extra-i686/PKGBUILD
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-x86_64/

---+
 /PKGBUILD |   96 
 /nvidia-340xx.install |   30 +++
 extra-i686/PKGBUILD   |   48 --
 extra-i686/nvidia-340xx.install   |   15 -
 extra-x86_64/PKGBUILD |   48 --
 extra-x86_64/nvidia-340xx.install |   15 -
 6 files changed, 126 insertions(+), 126 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2014-11-26 13:39:47 UTC (rev 227129)
+++ extra-i686/PKGBUILD 2014-11-26 13:39:48 UTC (rev 227130)
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
-# Maintainer : Thomas Baechler 
-
-pkgname=nvidia-340xx
-pkgver=340.58
-_extramodules=extramodules-3.17-ARCH
-pkgrel=1
-pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/";
-depends=('linux>=3.17' 'linux<3.18' "nvidia-libgl" 
"nvidia-340xx-utils=${pkgver}")
-makedepends=('linux-headers>=3.17' 'linux-headers<3.18')
-conflicts=('nvidia')
-license=('custom')
-install=${pkgname}.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=('b993f9fc59434140f560e32fd7bd2b3d'
- '26e75f80df3f49ac2fe35c65b9de709e')
-
-[[ "$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-340xx/repos/extra-i686/PKGBUILD (from rev 227126, 
nvidia-340xx/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-11-26 13:39:48 UTC (rev 227130)
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
+# Maintainer : Thomas Baechler 
+
+pkgname=nvidia-340xx
+pkgver=340.58
+_extramodules=extramodules-3.17-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+depends=('linux>=3.17' 'linux<3.18' "nvidia-libgl" 
"nvidia-340xx-utils=${pkgver}")
+makedepends=('linux-headers>=3.17' 'linux-headers<3.18')
+conflicts=('nvidia')
+license=('custom')
+install=${pkgname}.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=('b993f9fc59434140f560e32fd7bd2b3d'
+ '26e75f80df3f49ac2fe35c65b9de709e')
+
+[[ "$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