Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #232 from Ratler/nvidia

NVIDIA: Version bumped to 331.20
  • Loading branch information...
commit d132c7597a73d5f4650d990254b531f51c9996dd 2 parents 14ac1b5 + 7f92913
Stefan Wold Ratler authored
6 driver/NVIDIA/BUILD
@@ -65,14 +65,14 @@ cd nvidia-xconfig-$VERSION &&
65 65 cd .. &&
66 66
67 67 # We make the kernel modules on our own
  68 +KVER=$(cat /usr/src/linux/include/config/kernel.release)
68 69 cd kernel &&
69   -sedit "s@\$\(shell uname -r\)@`cat /usr/src/linux/include/config/kernel.release`@" Makefile.* makefile &&
70   -make module &&
  70 +make module KERNEL_UNAME=$KVER &&
71 71 rm -f $SOURCE_DIRECTORY/{libGL.so,libGLcore.so.1,libnvidia-tls.so.1} &&
72 72
73 73 prepare_install &&
74 74
75   -make install &&
  75 +make install KERNEL_UNAME=$KVER &&
76 76 cd .. &&
77 77
78 78 mkdir -p /etc/OpenCL/vendors &&
15 driver/NVIDIA/DETAILS
... ... @@ -1,10 +1,9 @@
1 1 MODULE=NVIDIA
2   - VERSION=319.49
  2 + VERSION=331.20
3 3 SOURCE=NVIDIA-Linux-x86-$VERSION.run
4 4 SOURCE2=nvidia-settings-$VERSION.tar.bz2
5 5 SOURCE3=nvidia-installer-$VERSION.tar.bz2
6 6 SOURCE4=nvidia-xconfig-$VERSION.tar.bz2
7   - SOURCE5=NVIDIA-319.49-Linux-3.11-fix.patch
8 7 SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION
9 8 SOURCE_URL[0]=ftp://download.nvidia.com/XFree86/Linux-x86/$VERSION
10 9 SOURCE_URL[1]=http://download.nvidia.com/XFree86/Linux-x86/$VERSION
@@ -28,16 +27,14 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION
28 27 SOURCE2_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot
29 28 SOURCE3_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-installer/snapshot
30 29 SOURCE4_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot
31   - SOURCE5_URL=$PATCH_URL
32   - SOURCE_VFY=sha1:f46d2f434c01a37ce516819f5c9265a801e9d159
33   - SOURCE2_VFY=sha1:c2c6e59cdf161d9d8d8946e10794af5a86e16f75
34   - SOURCE3_VFY=sha1:663ca06d4fdc052142428dfcc378b600a1f1f095
35   - SOURCE4_VFY=sha1:7e2cf697f0821a5bde1021b2141e2073159c9fd2
36   - SOURCE5_VFY=sha1:40d3e1da16b0671e9980fdd40f917876a425a3b0
  30 + SOURCE_VFY=sha1:81b29d4fefa1ebf82be4299db7733c1d7390a0b0
  31 + SOURCE2_VFY=sha1:a42cd2e821bce5061532d38d9f84a45d2986ba58
  32 + SOURCE3_VFY=sha1:ea75388dd5ad89f21fd5406d62ab01f6858c953c
  33 + SOURCE4_VFY=sha1:7c05da66de09f2fb2b22d5bd3d34aaf142e7023c
37 34 WEB_SITE=http://www.nvidia.com/
38 35 LICENSE="proprietary"
39 36 ENTERED=20030804
40   - UPDATED=20130925
  37 + UPDATED=20131207
41 38 SHORT="X11 NVIDIA binary driver for Geforce 6/7/8/9/GT2xx"
42 39
43 40 cat << EOF
15 driver/NVIDIA/DETAILS.x86_64
... ... @@ -1,10 +1,9 @@
1 1 MODULE=NVIDIA
2   - VERSION=319.49
  2 + VERSION=331.20
3 3 SOURCE=NVIDIA-Linux-x86_64-$VERSION-no-compat32.run
4 4 SOURCE2=nvidia-settings-$VERSION.tar.bz2
5 5 SOURCE3=nvidia-installer-$VERSION.tar.bz2
6 6 SOURCE4=nvidia-xconfig-$VERSION.tar.bz2
7   - SOURCE5=NVIDIA-319.49-Linux-3.11-fix.patch
8 7 SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-no-compat32
9 8 SOURCE_URL[0]=ftp://download.nvidia.com/XFree86/Linux-x86_64/$VERSION
10 9 SOURCE_URL[0]=http://download.nvidia.com/XFree86/Linux-x86_64/$VERSION
@@ -28,16 +27,14 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-no-compat32
28 27 SOURCE2_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot
29 28 SOURCE3_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-installer/snapshot
30 29 SOURCE4_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot
31   - SOURCE5_URL=$PATCH_URL
32   - SOURCE_VFY=sha1:bdcaf39a8006ce2775648fbec17249e560790537
33   - SOURCE2_VFY=sha1:c2c6e59cdf161d9d8d8946e10794af5a86e16f75
34   - SOURCE3_VFY=sha1:663ca06d4fdc052142428dfcc378b600a1f1f095
35   - SOURCE4_VFY=sha1:7e2cf697f0821a5bde1021b2141e2073159c9fd2
36   - SOURCE5_VFY=sha1:40d3e1da16b0671e9980fdd40f917876a425a3b0
  30 + SOURCE_VFY=sha1:85d3183bfa3e2ac9cdd45ecbbd05befa312eba96
  31 + SOURCE2_VFY=sha1:a42cd2e821bce5061532d38d9f84a45d2986ba58
  32 + SOURCE3_VFY=sha1:ea75388dd5ad89f21fd5406d62ab01f6858c953c
  33 + SOURCE4_VFY=sha1:7c05da66de09f2fb2b22d5bd3d34aaf142e7023c
37 34 WEB_SITE=http://www.nvidia.com/
38 35 LICENSE="proprietary"
39 36 ENTERED=20030804
40   - UPDATED=20130925
  37 + UPDATED=20131207
41 38 SHORT="X11 NVIDIA binary driver for Geforce 6/7/8/9/GT2xx"
42 39
43 40 cat << EOF
5 driver/NVIDIA/PRE_BUILD
@@ -16,7 +16,4 @@
16 16
17 17 # xf86vmode.h has been removed in xf86vidmodeproto 2.3
18 18 sedit "s:#include <X11/extensions/xf86vmode.h>:#include <X11/extensions/xf86vmproto.h>:" \
19   - nvidia-settings-$VERSION/src/libXNVCtrlAttributes/NvCtrlAttributes{,VidMode,Glx}.c &&
20   -
21   - # Fix for kernel 3.11 changes
22   - patch_it $SOURCE5 1
  19 + nvidia-settings-$VERSION/src/libXNVCtrlAttributes/NvCtrlAttributes{,VidMode,Glx}.c
3  driver/NVIDIA/PRE_BUILD.x86_64
@@ -18,9 +18,6 @@
18 18 sedit "s:#include <X11/extensions/xf86vmode.h>:#include <X11/extensions/xf86vmproto.h>:" \
19 19 nvidia-settings-$VERSION/src/libXNVCtrlAttributes/NvCtrlAttributes{,VidMode,Glx}.c &&
20 20
21   - # Fix for kernel 3.11 changes
22   - patch_it $SOURCE5 1 &&
23   -
24 21 # Don't compile 32-bits on pure 64-bit Lunar
25 22 sedit 's/COMPAT_32_SRC *= */\0#/' nvidia-installer-$VERSION/Makefile &&
26 23 sedit 's/-DNV_X86_64//' nvidia-installer-$VERSION/Makefile

0 comments on commit d132c75

Please sign in to comment.
Something went wrong with that request. Please try again.