Source Mage code commit list

[Ladislav Hagara <scm AT sourcemage.org>]

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                |    4 ++
 z-kernels/nvidia_legacy_340xx/PRE_BUILD              |    3 --
 z-kernels/nvidia_legacy_340xx/nvidia-4.2.patch       |   26 
-------------------
 z-kernels/nvidia_legacy_340xx/nvidia-4.3-build.patch |   20 --------------
 5 files changed, 12 insertions(+), 57 deletions(-)

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

    nvidia_legacy_340xx 340.96

diff --git a/z-kernels/nvidia_legacy_340xx/DETAILS 
b/z-kernels/nvidia_legacy_340xx/DETAILS
index d6c117d..93e83e4 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.93
-     
SOURCE_HASH=sha512:f7540f3a49ccd67346b81332e4bfd03becef135f7e777cef3256fe33b3313456456ae095a352e333bbf6463bb13b9486a70718fa4c4355d66222bb0a7437de29
+         VERSION=340.96
+     
SOURCE_HASH=sha512:6ffa4567ef6f5e09bcd50760b87baa2abe6a6ed1fbc280319101cc6582f2a381c36ab3fd1b4d74bcb5748adc3b82881618673ef77e5fe1a74c19a657774bcd87
 else
-         VERSION=340.93
-     
SOURCE_HASH=sha512:f7540f3a49ccd67346b81332e4bfd03becef135f7e777cef3256fe33b3313456456ae095a352e333bbf6463bb13b9486a70718fa4c4355d66222bb0a7437de29
+         VERSION=340.96
+     
SOURCE_HASH=sha512:6ffa4567ef6f5e09bcd50760b87baa2abe6a6ed1fbc280319101cc6582f2a381c36ab3fd1b4d74bcb5748adc3b82881618673ef77e5fe1a74c19a657774bcd87
 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.93
-     
SOURCE_HASH=sha512:7507553bd4b11cac2cd882cd8afba59e773f58a26e67ee7e781c488be963a4f1eb54dcd72b40b29d33dd81c74d4748a76c1632b2c8ea08b524b4318c18b5dfe5
+         VERSION=340.96
+     
SOURCE_HASH=sha512:c6306a101b7dc6298eb02290fb7792f624b8b16b1449b5d58148617017e8fdb87f1838f99b225103bf6a81c60a3246de9a27eab89608f099273a1c3d1c0003da
 else
-         VERSION=340.93
-     
SOURCE_HASH=sha512:7507553bd4b11cac2cd882cd8afba59e773f58a26e67ee7e781c488be963a4f1eb54dcd72b40b29d33dd81c74d4748a76c1632b2c8ea08b524b4318c18b5dfe5
+         VERSION=340.96
+     
SOURCE_HASH=sha512:c6306a101b7dc6298eb02290fb7792f624b8b16b1449b5d58148617017e8fdb87f1838f99b225103bf6a81c60a3246de9a27eab89608f099273a1c3d1c0003da
 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 03ab1c9..5888e9a 100644
--- a/z-kernels/nvidia_legacy_340xx/HISTORY
+++ b/z-kernels/nvidia_legacy_340xx/HISTORY
@@ -1,3 +1,7 @@
+2016-02-03 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 340.96
+       * PRE_BUILD, nvidia-4.2.patch, nvidia-4.3-build.patch: patches removed
+
 2015-11-09 Ladislav Hagara <hgr AT vabo.cz>
        * PRE_BUILD, nvidia-4.3-build.patch: patch from Arch added
 
diff --git a/z-kernels/nvidia_legacy_340xx/PRE_BUILD 
b/z-kernels/nvidia_legacy_340xx/PRE_BUILD
index c166d6c..920f631 100755
--- a/z-kernels/nvidia_legacy_340xx/PRE_BUILD
+++ b/z-kernels/nvidia_legacy_340xx/PRE_BUILD
@@ -9,9 +9,6 @@ cd $SOURCE_DIRECTORY                                          
&&
 # Fix defunct desktop file
 sedit  's/__.*__\///'  nvidia-settings.desktop  &&
 
-#patch -p1 < "$SPELL_DIRECTORY"/nvidia-4.2.patch &&
-patch -p1 < "$SPELL_DIRECTORY"/nvidia-4.3-build.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
deleted file mode 100644
index 412b786..0000000
--- a/z-kernels/nvidia_legacy_340xx/nvidia-4.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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");
diff --git a/z-kernels/nvidia_legacy_340xx/nvidia-4.3-build.patch 
b/z-kernels/nvidia_legacy_340xx/nvidia-4.3-build.patch
deleted file mode 100644
index 0bc5394..0000000
--- a/z-kernels/nvidia_legacy_340xx/nvidia-4.3-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/kernel/nv-procfs.c
-+++ b/kernel/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;
- }