[arch-commits] Commit in nvidia/trunk (PKGBUILD nvidia-4.3-build.patch)

2015-11-20 Thread Felix Yan 
Date: Saturday, November 21, 2015 @ 04:05:36
  Author: fyan
Revision: 251759

upgpkg: nvidia 358.16-1

Modified:
  nvidia/trunk/PKGBUILD
Deleted:
  nvidia/trunk/nvidia-4.3-build.patch

+
 PKGBUILD   |   25 +
 nvidia-4.3-build.patch |   20 
 2 files changed, 13 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-21 03:02:03 UTC (rev 251758)
+++ PKGBUILD2015-11-21 03:05:36 UTC (rev 251759)
@@ -5,21 +5,19 @@
 
 pkgbase=nvidia
 pkgname=(nvidia nvidia-dkms)
-pkgver=355.11
+pkgver=358.16
 _extramodules=extramodules-4.3-ARCH
-pkgrel=5
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/;
 makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 
'linux-headers>=4.3' 'linux-headers<4.4')
 license=('custom')
-options=(!strip)
-source=('nvidia-4.3-build.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=('1e5f60cf8e77af482345549b9436887a')
-md5sums_i686='16d143ccafe99328a2ca8e5a396fd4bc'
-md5sums_x86_64='30133d89690f4683c4e289ec6c0247dc'
+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=('a5d37fb56a59b9958f6c34139250baf13a1c42ffc70f7deb19ffaac1ae6c2ce80b96649c5797d60754050d75792d14141cd5ebc8820bb73ee4aad4aa6d6c5b20')
+sha512sums_x86_64=('eb1abeebbfa807c784e9019afaa3f238d2142b28467c80dcac8d5199cf1082d72ab417e39660bda076023aecb7d04d9c3c91a2d494f1513cfe82b617b17a2297')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -28,7 +26,6 @@
 sh "${_pkg}.run" --extract-only
 cd "${_pkg}"
 # patches here
-patch -Np1 -i ${srcdir}/nvidia-4.3-build.patch
 
 cp -a kernel kernel-dkms
 cd kernel-dkms
@@ -38,7 +35,9 @@
 sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
 DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
 BUILT_MODULE_NAME[1]="nvidia-uvm"\
-DEST_MODULE_LOCATION[1]="/kernel/drivers/video"' dkms.conf
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"' dkms.conf
 }
 
 build() {
@@ -54,6 +53,8 @@
 
 install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
 "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko"
 
 if [[ "$CARCH" = "x86_64" ]]; then
 install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
@@ -68,7 +69,7 @@
 
 package_nvidia-dkms() {
 pkgdesc="NVIDIA driver sources for linux"
-depends=('dkms' "nvidia-utils=$pkgver")
+depends=('dkms' "nvidia-utils=$pkgver" 'libgl')
 optdepends=('linux-headers: Build the module for Arch kernel'
 'linux-lts-headers: Build the module for LTS Arch kernel')
 conflicts+=('nvidia')

Deleted: nvidia-4.3-build.patch
===
--- nvidia-4.3-build.patch  2015-11-21 03:02:03 UTC (rev 251758)
+++ nvidia-4.3-build.patch  2015-11-21 03:05:36 UTC (rev 251759)
@@ -1,20 +0,0 @@
 a/kernel/nvidia/nv-procfs.c
-+++ b/kernel/nvidia/nv-procfs.c
-@@ -360,7 +360,8 @@ nv_procfs_read_registry(
- registry_keys = ((nvl != NULL) ?
- nvl->registry_keys : nv_registry_keys);
- 
--return seq_printf(s, "Binary: \"%s\"\n", registry_keys);
-+seq_printf(s, "Binary: \"%s\"\n", registry_keys);
-+return 0;
- }
- 
- static ssize_t
-@@ -560,7 +561,8 @@ nv_procfs_read_text_file(
- void *v
- )
- {
--return seq_puts(s, s->private);
-+seq_puts(s, s->private);
-+return 0;
- }

[arch-commits] Commit in nvidia/trunk (PKGBUILD nvidia-4.3-build.patch)

2015-11-04 Thread Tobias Powalowski 
Date: Wednesday, November 4, 2015 @ 15:42:30
  Author: tpowa
Revision: 250098

upgpkg: nvidia 355.11-5

rebuild against 4.3 series

Added:
  nvidia/trunk/nvidia-4.3-build.patch
Modified:
  nvidia/trunk/PKGBUILD

+
 PKGBUILD   |   11 +++
 nvidia-4.3-build.patch |   20 
 2 files changed, 27 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-04 14:39:55 UTC (rev 250097)
+++ PKGBUILD2015-11-04 14:42:30 UTC (rev 250098)
@@ -6,16 +6,18 @@
 pkgbase=nvidia
 pkgname=(nvidia nvidia-dkms)
 pkgver=355.11
-_extramodules=extramodules-4.2-ARCH
-pkgrel=4
+_extramodules=extramodules-4.3-ARCH
+pkgrel=5
 pkgdesc="NVIDIA drivers for linux"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/;
-makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 
'linux-headers>=4.2' 'linux-headers<4.3')
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 
'linux-headers>=4.3' 'linux-headers<4.4')
 license=('custom')
 options=(!strip)
+source=('nvidia-4.3-build.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=('1e5f60cf8e77af482345549b9436887a')
 md5sums_i686='16d143ccafe99328a2ca8e5a396fd4bc'
 md5sums_x86_64='30133d89690f4683c4e289ec6c0247dc'
 
@@ -26,6 +28,7 @@
 sh "${_pkg}.run" --extract-only
 cd "${_pkg}"
 # patches here
+patch -Np1 -i ${srcdir}/nvidia-4.3-build.patch
 
 cp -a kernel kernel-dkms
 cd kernel-dkms
@@ -46,7 +49,7 @@
 
 package_nvidia() {
 pkgdesc="NVIDIA drivers for linux"
-depends=('linux>=4.2' 'linux<4.3' "nvidia-utils=${pkgver}" 'libgl')
+depends=('linux>=4.3' 'linux<4.4' "nvidia-utils=${pkgver}" 'libgl')
 install=nvidia.install
 
 install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \

Added: nvidia-4.3-build.patch
===
--- nvidia-4.3-build.patch  (rev 0)
+++ nvidia-4.3-build.patch  2015-11-04 14:42:30 UTC (rev 250098)
@@ -0,0 +1,20 @@
+--- a/kernel/nvidia/nv-procfs.c
 b/kernel/nvidia/nv-procfs.c
+@@ -360,7 +360,8 @@ nv_procfs_read_registry(
+ registry_keys = ((nvl != NULL) ?
+ nvl->registry_keys : nv_registry_keys);
+ 
+-return seq_printf(s, "Binary: \"%s\"\n", registry_keys);
++seq_printf(s, "Binary: \"%s\"\n", registry_keys);
++return 0;
+ }
+ 
+ static ssize_t
+@@ -560,7 +561,8 @@ nv_procfs_read_text_file(
+ void *v
+ )
+ {
+-return seq_puts(s, s->private);
++seq_puts(s, s->private);
++return 0;
+ }