Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 audio-soft/meterbridge/HISTORY                                      |    4 +
 audio-soft/meterbridge/PRE_BUILD                                    |    2 
 audio-soft/meterbridge/meterbridge_0.9.2-fix_build_with_gcc-5.patch |   31 
++++++++++
 utils/unetbootin/DETAILS                                            |    4 -
 utils/unetbootin/HISTORY                                            |    3 
 5 files changed, 41 insertions(+), 3 deletions(-)

New commits:
commit 1564e38ae9b1fc17c8af67203375f12d2b15bc2e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    unetbootin: version 608

commit d6e7fa43483a5d0d177a3aceb851dc84428a04b0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    meterbridge: fix build with gcc 5

diff --git a/audio-soft/meterbridge/HISTORY b/audio-soft/meterbridge/HISTORY
index 20ac8b6..2308712 100644
--- a/audio-soft/meterbridge/HISTORY
+++ b/audio-soft/meterbridge/HISTORY
@@ -1,3 +1,7 @@
+2015-06-10 Thomas Orgis <sobukus AT sourcemage.org>
+       * PRE_BUILD: patch for gcc 5
+       * meterbridge_0.9.2-fix_build_with_gcc-5.patch: added from Debian
+
 2015-03-23 Thomas Orgis <sobukus AT sourcemage.org>
        * PRE_BUILD: use autoreconf -if, fixing erratic failures
 
diff --git a/audio-soft/meterbridge/PRE_BUILD 
b/audio-soft/meterbridge/PRE_BUILD
index 686809e..8565b9e 100755
--- a/audio-soft/meterbridge/PRE_BUILD
+++ b/audio-soft/meterbridge/PRE_BUILD
@@ -4,7 +4,7 @@ cd "$SOURCE_DIRECTORY" &&
 patch -p1 < $SPELL_DIRECTORY/main.h.patch        &&
 patch -p1 < $SPELL_DIRECTORY/binutils_gold.patch &&
 patch -p1 < $SPELL_DIRECTORY/meterbridge_0.9.2_iec_fix.patch &&
-
+patch -p1 < "$SCRIPT_DIRECTORY/meterbridge_0.9.2-fix_build_with_gcc-5.patch" 
&&
 #Magically seems to fix strange erratic build errors (indicated
 # by missing run of
 #      ./config.status --recheck
diff --git 
a/audio-soft/meterbridge/meterbridge_0.9.2-fix_build_with_gcc-5.patch 
b/audio-soft/meterbridge/meterbridge_0.9.2-fix_build_with_gcc-5.patch
new file mode 100644
index 0000000..a738cd0
--- /dev/null
+++ b/audio-soft/meterbridge/meterbridge_0.9.2-fix_build_with_gcc-5.patch
@@ -0,0 +1,31 @@
+Description: Fix build with gcc-5
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778003
+Author: Jaromír Mikeš <mira.mikes AT seznam.cz>
+Forwarded: No
+
+Index: meterbridge/src/linedraw.h
+===================================================================
+--- meterbridge.orig/src/linedraw.h
++++ meterbridge/src/linedraw.h
+@@ -1,7 +1,7 @@
+ #ifndef LINEDRAW_H
+ #define LINEDRAW_H
+ 
+-inline void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col);
++void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col);
+ 
+ void draw_ptr(SDL_Surface *surface, int x1, int y1, int x2, int y2, Uint32 
nedle_col, Uint32 aa_col);
+ 
+Index: meterbridge/src/linedraw.c
+===================================================================
+--- meterbridge.orig/src/linedraw.c
++++ meterbridge/src/linedraw.c
+@@ -4,7 +4,7 @@
+ /* set a pixel on an SDL_Surface, assumes that the surface is 32bit RGBA,
+  * ordered ABGR (I think), probably wont work on bigendian systems */
+ 
+-inline void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col)
++void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col)
+ {
+       Uint32 *bufp = (Uint32 *)surface->pixels + y*surface->pitch/4 + x;
+       *bufp = col;
diff --git a/utils/unetbootin/DETAILS b/utils/unetbootin/DETAILS
index d3f526e..710990c 100755
--- a/utils/unetbootin/DETAILS
+++ b/utils/unetbootin/DETAILS
@@ -1,7 +1,7 @@
            SPELL=unetbootin
-         VERSION=585
+         VERSION=608
           SOURCE="${SPELL}-source-${VERSION}.tar.gz"
-     
SOURCE_HASH=sha512:c41d97765bdb5601fd5fdc24671df09baf8ea16d9cedc25dfe36d1a6416acc8def17c306dab75694faa4016d5e71113b6e208abd2a10845a8a1cf862a5c37ab1
+     
SOURCE_HASH=sha512:d164537c96845eb90ac5aae1fa0c553c9392d778696e4818760cb11f78341e6a3ea6a05f702678583c5d680dc8fb1348cdc2b2dfba9bebfdf793779c23611d16
    
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/UNetbootin/${VERSION}/${SOURCE}
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://unetbootin.sourceforge.net/";
diff --git a/utils/unetbootin/HISTORY b/utils/unetbootin/HISTORY
index 75dd2a5..a1318b4 100644
--- a/utils/unetbootin/HISTORY
+++ b/utils/unetbootin/HISTORY
@@ -1,3 +1,6 @@
+2015-06-01 Thomas Orgis <sobukus AT sourcemage.org>
+       * DETAILS: version 608
+
 2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: remove SOURCEFORGE_URL usage (automated)