Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (c5f3d8d75aada3ab3cb4fafa19ba2691b217abf7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (c5f3d8d75aada3ab3cb4fafa19ba2691b217abf7)
  • Date: Thu, 24 Sep 2015 14:36:46 +0000

GIT changes to master z-rejected grimoire by Ladislav Hagara <hgr AT vabo.cz>:

z-kernels/nvidia_legacy_340xx/DETAILS | 16 +++---
z-kernels/nvidia_legacy_340xx/HISTORY | 5 ++
z-kernels/nvidia_legacy_340xx/NVIDIA-Linux-340.76-cr4.patch | 29
------------
z-kernels/nvidia_legacy_340xx/PRE_BUILD | 2
z-kernels/nvidia_legacy_340xx/nvidia-4.2.patch | 26 ++++++++++
5 files changed, 40 insertions(+), 38 deletions(-)

New commits:
commit c5f3d8d75aada3ab3cb4fafa19ba2691b217abf7
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

nvidia_legacy_340xx 340.93

diff --git a/z-kernels/nvidia_legacy_340xx/DETAILS
b/z-kernels/nvidia_legacy_340xx/DETAILS
index 66c26f2..d6c117d 100755
--- a/z-kernels/nvidia_legacy_340xx/DETAILS
+++ b/z-kernels/nvidia_legacy_340xx/DETAILS
@@ -3,11 +3,11 @@
case "${SMGL_COMPAT_ARCHS[1]}" in
x86_64)
if [[ $NVIDIA_BETA == y ]]; then
- VERSION=340.76
-
SOURCE_HASH=sha512:59ad49a49f170ec971e2b5ee3a45b9f972521bc4b7ab6f02f46a5cfc5b1998841195cc5c91dffc417d2183de39c5a589eabf7b48864e0c6842363a75051db40c
+ VERSION=340.93
+
SOURCE_HASH=sha512:f7540f3a49ccd67346b81332e4bfd03becef135f7e777cef3256fe33b3313456456ae095a352e333bbf6463bb13b9486a70718fa4c4355d66222bb0a7437de29
else
- VERSION=340.76
-
SOURCE_HASH=sha512:59ad49a49f170ec971e2b5ee3a45b9f972521bc4b7ab6f02f46a5cfc5b1998841195cc5c91dffc417d2183de39c5a589eabf7b48864e0c6842363a75051db40c
+ VERSION=340.93
+
SOURCE_HASH=sha512:f7540f3a49ccd67346b81332e4bfd03becef135f7e777cef3256fe33b3313456456ae095a352e333bbf6463bb13b9486a70718fa4c4355d66222bb0a7437de29
fi
SOURCE=NVIDIA-Linux-x86_64-$VERSION.run

SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
@@ -17,11 +17,11 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION"
;;
ia32)
if [[ $NVIDIA_BETA == y ]]; then
- VERSION=340.76
-
SOURCE_HASH=sha512:45d7b29670f9ca50de80d6d61260015b45f74422bbd12039923d04ae8b033b903b27e9f4c174461055f3cf45a4af44565ce9a8b9cd671e0e54d37770a1156839
+ VERSION=340.93
+
SOURCE_HASH=sha512:7507553bd4b11cac2cd882cd8afba59e773f58a26e67ee7e781c488be963a4f1eb54dcd72b40b29d33dd81c74d4748a76c1632b2c8ea08b524b4318c18b5dfe5
else
- VERSION=340.76
-
SOURCE_HASH=sha512:45d7b29670f9ca50de80d6d61260015b45f74422bbd12039923d04ae8b033b903b27e9f4c174461055f3cf45a4af44565ce9a8b9cd671e0e54d37770a1156839
+ VERSION=340.93
+
SOURCE_HASH=sha512:7507553bd4b11cac2cd882cd8afba59e773f58a26e67ee7e781c488be963a4f1eb54dcd72b40b29d33dd81c74d4748a76c1632b2c8ea08b524b4318c18b5dfe5
fi
SOURCE=NVIDIA-Linux-x86-$VERSION.run

SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86/$VERSION/$SOURCE
diff --git a/z-kernels/nvidia_legacy_340xx/HISTORY
b/z-kernels/nvidia_legacy_340xx/HISTORY
index ce35d92..b678789 100644
--- a/z-kernels/nvidia_legacy_340xx/HISTORY
+++ b/z-kernels/nvidia_legacy_340xx/HISTORY
@@ -1,3 +1,8 @@
+2015-09-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 340.93
+ * PRE_BUILD, NVIDIA-Linux-340.76-cr4.patch: patch removed
+ * PRE_BUILD, nvidia-4.2.patch: patch from Arch added
+
2015-05-24 Remko van der Vossen <wich AT sourcemage.org>
* PRE_BUILD, NVIDIA-Linux-340.76-cr4.patch:
allow building against newer kernels
diff --git a/z-kernels/nvidia_legacy_340xx/NVIDIA-Linux-340.76-cr4.patch
b/z-kernels/nvidia_legacy_340xx/NVIDIA-Linux-340.76-cr4.patch
deleted file mode 100644
index 620c5d9..0000000
--- a/z-kernels/nvidia_legacy_340xx/NVIDIA-Linux-340.76-cr4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur orig/kernel/nv-pat.c fixed/kernel/nv-pat.c
---- orig/kernel/nv-pat.c 2015-01-22 20:01:16.000000000 +0100
-+++ fixed/kernel/nv-pat.c 2015-05-25 11:53:18.000000000 +0200
-@@ -35,8 +35,13 @@
- unsigned long cr0 = read_cr0();
- write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
- wbinvd();
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
- *cr4 = read_cr4();
- if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
-+#else
-+ *cr4 = __read_cr4();
-+ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
-+#endif
- __flush_tlb();
- }
-
-@@ -46,7 +51,11 @@
- wbinvd();
- __flush_tlb();
- write_cr0((cr0 & 0x9fffffff));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
- if (cr4 & 0x80) write_cr4(cr4);
-+#else
-+ if (cr4 & 0x80) __write_cr4(cr4);
-+#endif
- }
-
- static int nv_determine_pat_mode(void)
diff --git a/z-kernels/nvidia_legacy_340xx/PRE_BUILD
b/z-kernels/nvidia_legacy_340xx/PRE_BUILD
index 3902790..6244dc2 100755
--- a/z-kernels/nvidia_legacy_340xx/PRE_BUILD
+++ b/z-kernels/nvidia_legacy_340xx/PRE_BUILD
@@ -9,7 +9,7 @@ cd $SOURCE_DIRECTORY
&&
# Fix defunct desktop file
sedit 's/__.*__\///' nvidia-settings.desktop &&

-patch -p1 < "$SPELL_DIRECTORY"/NVIDIA-Linux-340.76-cr4.patch &&
+patch -p1 < "$SPELL_DIRECTORY"/nvidia-4.2.patch &&

#
# Setup Makefile symlink
diff --git a/z-kernels/nvidia_legacy_340xx/nvidia-4.2.patch
b/z-kernels/nvidia_legacy_340xx/nvidia-4.2.patch
new file mode 100644
index 0000000..412b786
--- /dev/null
+++ b/z-kernels/nvidia_legacy_340xx/nvidia-4.2.patch
@@ -0,0 +1,26 @@
+diff --git a/kernel/nv-frontend.c b/kernel/nv-frontend.c
+index 65bbb1b..be39c8d 100644
+--- a/kernel/nv-frontend.c
++++ b/kernel/nv-frontend.c
+@@ -15,7 +15,7 @@
+ #include "nv-frontend.h"
+
+ #if defined(MODULE_LICENSE)
+-MODULE_LICENSE("NVIDIA");
++MODULE_LICENSE("GPL\0NVIDIA");
+ #endif
+ #if defined(MODULE_INFO)
+ MODULE_INFO(supported, "external");
+diff --git a/kernel/nv.c b/kernel/nv.c
+index abe81ed..05945b5 100644
+--- a/kernel/nv.c
++++ b/kernel/nv.c
+@@ -31,7 +31,7 @@
+
+ #if defined(NV_VMWARE) || (NV_BUILD_MODULE_INSTANCES != 0)
+ #if defined(MODULE_LICENSE)
+-MODULE_LICENSE("NVIDIA");
++MODULE_LICENSE("GPL\0NVIDIA");
+ #endif
+ #if defined(MODULE_INFO)
+ MODULE_INFO(supported, "external");



  • [SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (c5f3d8d75aada3ab3cb4fafa19ba2691b217abf7), Ladislav Hagara, 09/24/2015

Archive powered by MHonArc 2.6.24.

Top of Page