Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master z-rejected grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 z-kernels/nvidia_driver/DETAILS          |    8 ++++----
 z-kernels/nvidia_driver/HISTORY          |    4 ++++
 z-kernels/nvidia_driver/PRE_BUILD        |    3 ---
 z-kernels/nvidia_driver/linux-3.13.patch |   26 --------------------------
 4 files changed, 8 insertions(+), 33 deletions(-)

New commits:
commit fcda2a1bffc4bb8647484d5ea74d56dfd1a1c0bb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    z-kernels/nvidia_driver: beta version 334.21

diff --git a/z-kernels/nvidia_driver/DETAILS b/z-kernels/nvidia_driver/DETAILS
index 6655d7d..d1adcbc 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -3,8 +3,8 @@
 case "${SMGL_COMPAT_ARCHS[1]}" in
         x86_64)
 if [[ $NVIDIA_BETA == y ]]; then
-         VERSION=334.16
-     
SOURCE_HASH=sha512:a864693d7e95f602a1ee3557b5e0666d792d7ea8a22195ff06733cab1162b63daf761d162168e740ff3cae97371121f66f8b570ecc97081809c84d0be0309a34
+         VERSION=334.21
+     
SOURCE_HASH=sha512:254500cbb83420df26c860df13a448aece837096db8374c41cc0a979c0102b848b5a6ad463e2daf4dc34ae5fcedf7921767e7bd7d86a97ceff4c683b7ee1c886
 else
          VERSION=331.49
      
SOURCE_HASH=sha512:757cdf445343dd4ff1f6036ba232c8d7a37a15be377d3d7c52e1e096ff0f887d89166a00c2567d374ed9cb8971749c93e3d79b5493d3ea7154e378890c2a0169
@@ -17,8 +17,8 @@ 
SOURCE_DIRECTORY="$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION"
         ;;
         ia32)
 if [[ $NVIDIA_BETA == y ]]; then
-         VERSION=334.16
-     
SOURCE_HASH=sha512:f94eeaab0a01b97126dc700b7f53e4366c34f18a9a477da2afcc868025bfc30d853fe9fcc3766d0fe5c13129711e2a914aed1cd506e46986b009b6a35296e9c3
+         VERSION=334.21
+     
SOURCE_HASH=sha512:b52a9f08fb91ef915c3c7ce2aa34ecdd93a5fd8731d7f4b9cb887289f931a4dc5e82afa259bc985be55964a8c788550683ef61306bed9a32a5614dcb2d64373d
 else
          VERSION=331.49
      
SOURCE_HASH=sha512:2a15af22a250afc92eedb8abdbf4196da68bd8772580ea8d8573ff94827a535cac2cfab16de94dcb2190b7a893ba48ad14ef7ccc24062ab8402cd79a4b2b76cc
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 8a8557a..1c3eec3 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,7 @@
+2014-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: beta versions 334.21
+       * PRE_BUILD, linux-3.13.patch: remove obsolete patch
+
 2014-02-28 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: sha512s for ia32 fixed
 
diff --git a/z-kernels/nvidia_driver/PRE_BUILD 
b/z-kernels/nvidia_driver/PRE_BUILD
index 97c2ed2..12c87b9 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -3,9 +3,6 @@ unpack_file ''  &&
 sh  $SOURCE_CACHE/$SOURCE  --extract-only                     \
                --target $SOURCE_DIRECTORY                     &&
 cd $SOURCE_DIRECTORY                                          &&
-if [[ "$NVIDIA_BETA" == "y" ]]; then
-patch -p1 < $SPELL_DIRECTORY/linux-3.13.patch
-fi &&
 
 # Fix defunct desktop file
 sedit  's/__.*__\///'  nvidia-settings.desktop  &&
diff --git a/z-kernels/nvidia_driver/linux-3.13.patch 
b/z-kernels/nvidia_driver/linux-3.13.patch
deleted file mode 100644
index e6d9741..0000000
--- a/z-kernels/nvidia_driver/linux-3.13.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d57c6bf7799dd815b6d9b0abbe9e86c2cd0ead21 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Mon, 20 Jan 2014 20:23:58 +0100
-Subject: [PATCH] fix error due to changed acpi api
-
----
- kernel/nv-acpi.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/kernel/nv-acpi.c b/kernel/nv-acpi.c
-index b0138cd..6c55144 100644
---- a/kernel/nv-acpi.c
-+++ b/kernel/nv-acpi.c
-@@ -303,7 +303,9 @@ static int nv_acpi_remove(struct acpi_device *device, 
int type)
- 
-     if (pNvAcpiObject->notify_handler_installed)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-         NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
-+#endif
- 
-         // remove event notifier
-         status = acpi_remove_notify_handler(device->handle, 
ACPI_DEVICE_NOTIFY, nv_acpi_event);
--- 
-1.8.5.3
-