Merge branch 'stumbles-nvidia'

lunar-linux · Feb 24, 2018 · d31938a · d31938a
2 parents c1adddc + fac5542
commit d31938a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 34 deletions.
diff --git a/driver/NVIDIA/DETAILS b/driver/NVIDIA/DETAILS
@@ -1,43 +1,28 @@
           MODULE=NVIDIA
-         VERSION=384.98
+         VERSION=390.25
           SOURCE=NVIDIA-Linux-x86-$VERSION.run
          SOURCE2=nvidia-settings-$VERSION.tar.bz2
          SOURCE3=nvidia-installer-$VERSION.tar.bz2
          SOURCE4=nvidia-xconfig-$VERSION.tar.bz2
          SOURCE5=NVIDIA-kernel-4.14.9-fix.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION
-   SOURCE_URL[0]=http://download.nvidia.com/XFree86/Linux-x86/$VERSION
-   SOURCE_URL[1]=http://download.nvidia.com/XFree86/Linux-x86/$VERSION
-   SOURCE_URL[2]=http://us.download.nvidia.com/XFree86/Linux-x86/$VERSION
-   SOURCE_URL[3]=http://pl.download.nvidia.com/XFree86/Linux-x86/$VERSION
-   SOURCE_URL[4]=http://de.download.nvidia.com/XFree86/Linux-x86/$VERSION
-   SOURCE_URL[5]=http://uk.download.nvidia.com/XFree86/Linux-x86/$VERSION
-   SOURCE_URL[6]=http://es.download.nvidia.com/XFree86/Linux-x86/$VERSION
-   SOURCE_URL[7]=http://fr.download.nvidia.com/XFree86/Linux-x86/$VERSION
-   SOURCE_URL[8]=http://in.download.nvidia.com/XFree86/Linux-x86/$VERSION
-   SOURCE_URL[9]=http://sg.download.nvidia.com/XFree86/Linux-x86/$VERSION
-  SOURCE_URL[10]=http://cn.download.nvidia.com/XFree86/Linux-x86/$VERSION
-  SOURCE_URL[11]=http://tw.download.nvidia.com/XFree86/Linux-x86/$VERSION
-  SOURCE_URL[12]=http://jp.download.nvidia.com/XFree86/Linux-x86/$VERSION
-  SOURCE_URL[13]=http://kr.download.nvidia.com/XFree86/Linux-x86/$VERSION
-  SOURCE_URL[14]=http://ru.download.nvidia.com/XFree86/Linux-x86/$VERSION
-  SOURCE_URL[15]=http://it.download.nvidia.com/XFree86/Linux-x86/$VERSION
-  SOURCE2_URL[0]=http://download.nvidia.com/XFree86/nvidia-settings
-  SOURCE3_URL[0]=http://download.nvidia.com/XFree86/nvidia-installer
-  SOURCE4_URL[0]=http://download.nvidia.com/XFree86/nvidia-xconfig
+      SOURCE_URL=$NVIDIA_URL/Linux-x86/$VERSION
+  SOURCE2_URL[0]=$NVIDIA_URL/nvidia-settings
   SOURCE2_URL[1]=https://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot
+  SOURCE3_URL[0]=$NVIDIA_URL/nvidia-installer
   SOURCE3_URL[1]=https://cgit.freedesktop.org/~aplattner/nvidia-installer/snapshot
+  SOURCE4_URL[0]=$NVIDIA_URL/nvidia-xconfig
   SOURCE4_URL[1]=https://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot
      SOURCE5_URL=$PATCH_URL
-      SOURCE_VFY=sha256:93e38818b8fc5d0fc34f05449c15808e774de389545475a9536ffb6555b3bb57
-     SOURCE2_VFY=sha256:6d5f8fbfaf1ff159c370af3893633a2b13016c7aa9f839c1b1dd950626ae2e20
-     SOURCE3_VFY=sha256:eac3d3e0e9a8f6c21f2936553fd4c0ad0c730edfe5e09b26212e355748b79e09
-     SOURCE4_VFY=sha256:e7e907d58b78360b694dc7680dd599227cc8a559a527becc8c8194828d2da149
+      SOURCE_VFY=sha256:1183552b46409a3c09caa172da5a296b56078d178c5ad272bed7101a40bf6b3a
+     SOURCE2_VFY=sha256:c79bb974e3e716f3448088d72201bb9cfeec8d13ea8dbe5376439bf191c90bca
+     SOURCE3_VFY=sha256:2a9994a4af3e083f4245a018eda1096fcfda06e9ec55cbf3e786fa53ffabdc35
+     SOURCE4_VFY=sha256:1fbcc43094d2a2dc64c8906e38c103b57d7d797e3bff50bcefb2409e8df49ed1
      SOURCE5_VFY=sha256:664b565f0863441192b52cdd50a1126da8d696069c63d391bd8cdeb91ee3cf48
         WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20171228
+         UPDATED=20180224
            SHORT="X11 NVIDIA binary driver for Geforce 6/7/8/9/GT2xx"
 
 cat << EOF

diff --git a/driver/NVIDIA/DETAILS.x86_64 b/driver/NVIDIA/DETAILS.x86_64
@@ -1,28 +1,28 @@
           MODULE=NVIDIA
-         VERSION=390.12
+         VERSION=390.25
           SOURCE=NVIDIA-Linux-x86_64-$VERSION-no-compat32.run
          SOURCE2=nvidia-settings-$VERSION.tar.bz2
          SOURCE3=nvidia-installer-$VERSION.tar.bz2
          SOURCE4=nvidia-xconfig-$VERSION.tar.bz2
          SOURCE5=NVIDIA-kernel-4.14.9-fix.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-no-compat32
       SOURCE_URL=$NVIDIA_URL/Linux-x86_64/$VERSION
-     SOURCE2_URL=$NVIDIA_URL/nvidia-settings
-     SOURCE3_URL=$NVIDIA_URL/nvidia-installer
-     SOURCE4_URL=$NVIDIA_URL/nvidia-xconfig
+  SOURCE2_URL[0]=$NVIDIA_URL/nvidia-settings
   SOURCE2_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot
+  SOURCE3_URL[0]=$NVIDIA_URL/nvidia-installer
   SOURCE3_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-installer/snapshot
+  SOURCE4_URL[0]=$NVIDIA_URL/nvidia-xconfig
   SOURCE4_URL[1]=http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot
      SOURCE5_URL=$PATCH_URL
-      SOURCE_VFY=sha256:68c744abc7f42eaa9e640d90ecd3c7691a74b84584b83b776488ef1916f8eb43
-     SOURCE2_VFY=sha256:4696be7541fa83587f605cacb5f04906d33e300b2cf346c25159344987b44358
-     SOURCE3_VFY=sha256:1f546f1da595b9d94a7f3ebd0b6dcfd5a32dfca69c55680d583c627fe1a75a50
-     SOURCE4_VFY=sha256:cd6fce21a70cdac02ea895d71e44066e7f918d08925e6d67c03928f7eaa76b68
+      SOURCE_VFY=sha256:02263bc81b66e68fc8224447b249f4f0ca4ae201c467e236d917be2fe187f3d6
+     SOURCE2_VFY=sha256:c79bb974e3e716f3448088d72201bb9cfeec8d13ea8dbe5376439bf191c90bca
+     SOURCE3_VFY=sha256:2a9994a4af3e083f4245a018eda1096fcfda06e9ec55cbf3e786fa53ffabdc35
+     SOURCE4_VFY=sha256:1fbcc43094d2a2dc64c8906e38c103b57d7d797e3bff50bcefb2409e8df49ed1
      SOURCE5_VFY=sha256:664b565f0863441192b52cdd50a1126da8d696069c63d391bd8cdeb91ee3cf48
         WEB_SITE=http://www.nvidia.com/
          LICENSE="proprietary"
          ENTERED=20030804
-         UPDATED=20180109
+         UPDATED=20180216
            SHORT="X11 NVIDIA binary driver for Geforce 6/7/8/9/GT2xx"
 
 cat << EOF