Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

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

 science/gdal/0001-fix-compile-error-due-to-missing-uchar-type.patch |   82 
++++++++++
 science/gdal/DETAILS                                                |    4 
 science/gdal/HISTORY                                                |    5 
 science/gdal/PRE_BUILD                                              |    4 
 4 files changed, 93 insertions(+), 2 deletions(-)

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

    science/gdal: version 2.1.2

diff --git 
a/science/gdal/0001-fix-compile-error-due-to-missing-uchar-type.patch 
b/science/gdal/0001-fix-compile-error-due-to-missing-uchar-type.patch
new file mode 100644
index 0000000..a796d6a
--- /dev/null
+++ b/science/gdal/0001-fix-compile-error-due-to-missing-uchar-type.patch
@@ -0,0 +1,82 @@
+From 3782d6e5056e2c2704a339f653a9c6c1b669af61 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sat, 14 Jan 2017 21:08:33 +0100
+Subject: [PATCH] fix compile error due to missing uchar type
+
+---
+ frmts/jpeg2000/jpeg2000_vsil_io.cpp | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/frmts/jpeg2000/jpeg2000_vsil_io.cpp 
b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
+index 74f1e64..f478558 100644
+--- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
++++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
+@@ -9,7 +9,7 @@
+ 
+ /* Following code is mostly derived from jas_stream.c, which is licensed */
+ /* under the below terms */
+- 
++
+ /*
+  * Copyright (c) 1999-2000 Image Power, Inc. and the University of
+  *   British Columbia.
+@@ -19,15 +19,15 @@
+  */
+ 
+ /* __START_OF_JASPER_LICENSE__
+- * 
++ *
+  * JasPer License Version 2.0
+- * 
++ *
+  * Copyright (c) 2001-2006 Michael David Adams
+  * Copyright (c) 1999-2000 Image Power, Inc.
+  * Copyright (c) 1999-2000 The University of British Columbia
+- * 
++ *
+  * All rights reserved.
+- * 
++ *
+  * Permission is hereby granted, free of charge, to any person (the
+  * "User") obtaining a copy of this software and associated documentation
+  * files (the "Software"), to deal in the Software without restriction,
+@@ -35,15 +35,15 @@
+  * publish, distribute, and/or sell copies of the Software, and to permit
+  * persons to whom the Software is furnished to do so, subject to the
+  * following conditions:
+- * 
++ *
+  * 1.  The above copyright notices and this permission notice (which
+  * includes the disclaimer below) shall be included in all copies or
+  * substantial portions of the Software.
+- * 
++ *
+  * 2.  The name of a copyright holder shall not be used to endorse or
+  * promote products derived from the Software without specific prior
+  * written permission.
+- * 
++ *
+  * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+  * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
+  * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
+@@ -70,7 +70,7 @@
+  * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
+  * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
+  * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
+- * 
++ *
+  * __END_OF_JASPER_LICENSE__
+  */
+ 
+@@ -209,7 +209,7 @@ static void 
JPEG2000_VSIL_jas_stream_initbuf(jas_stream_t *stream, int bufmode,
+                       /* The buffer must be large enough to accommodate 
maximum
+                         putback. */
+                       assert(bufsize > JAS_STREAM_MAXPUTBACK);
+-                      stream->bufbase_ = JAS_CAST(uchar *, buf);
++                      stream->bufbase_ = JAS_CAST(unsigned char *, buf);
+                       stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
+               }
+       } else {
+-- 
+2.11.0
+
diff --git a/science/gdal/DETAILS b/science/gdal/DETAILS
index 3042477..b692023 100755
--- a/science/gdal/DETAILS
+++ b/science/gdal/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gdal
-         VERSION=2.0.2
-     
SOURCE_HASH=sha512:45b91834ec3b4908344d6ab29a2ffea1cfc245859e322d9630179bb811183c52cb8aaa6901c522e749ca4932b3dabb9895ca501e6c9cde6f8ff20cdfed24d778
+         VERSION=2.1.2
+     
SOURCE_HASH=sha512:fbd43a090d1343256e3a77ee3e36c897c7f27a983d925f36688ba43cdb7c8ee305a532ff9005e945dc32ec3f840e32cad214d6d144d716696cdbdb5259d3b3cd
           SOURCE="$SPELL-$VERSION.tar.xz"
    SOURCE_URL[0]=http://download.osgeo.org/$SPELL/$VERSION/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/science/gdal/HISTORY b/science/gdal/HISTORY
index 5344cda..5168e99 100644
--- a/science/gdal/HISTORY
+++ b/science/gdal/HISTORY
@@ -1,3 +1,8 @@
+2017-01-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.1.2
+       * PRE_BUILD, 0001-fix-compile-error-due-to-missing-uchar-type.patch: 
fix
+         compile error
+
 2016-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * TRIGGERS: on cast icu check self
 
diff --git a/science/gdal/PRE_BUILD b/science/gdal/PRE_BUILD
new file mode 100755
index 0000000..da7ab89
--- /dev/null
+++ b/science/gdal/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build      &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < 
"$SPELL_DIRECTORY/0001-fix-compile-error-due-to-missing-uchar-type.patch"