Merge branch 'master' of ssh://rcook@scm.sourcemage.org/smgl/grimoire

7 files changed, 50 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 904c773a21..9b03f5f42c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+
+2008-11-30 Thomas Orgis <sobukus@sourcemage.org>
+	* audio-soft/meterbridge: New spell, monitoring jack audio.
+
 2008-11-30 Juuso Alasuutari <iuso@sourcemage.org>
 	* audio-soft/jack_capture: New spell, audio recording utility.
 	* audio-libs/celt: New spell, audio codec for low-delay communication.
diff --git a/archive/p7zip/DETAILS b/archive/p7zip/DETAILS
index 6bf979b1a5..cf44109937 100755
--- a/archive/p7zip/DETAILS
+++ b/archive/p7zip/DETAILS
@@ -1,15 +1,15 @@
            SPELL=p7zip
-         VERSION=4.58
-     SOURCE_HASH=sha512:34c6336136bc239a81f5923176f3b662661005ff87a6d928230e2c099eddf696473461a801454942befbc28d51a558931beb87701ab54b2f8c3a8c1369753068
+         VERSION=4.61
+     SOURCE_HASH=sha512:9fade7c70f9e611fef3ad13f78f5c201286db6bbfecad4c98b4cd3aa413aa6934933c9b3760cda30977947880c3b1ca2cf625e3a8136ce4fabeaede16bb5b7a1
           SOURCE=${SPELL}_${VERSION}_src_all.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}_$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
             DOCS=""
         WEB_SITE=http://p7zip.sourceforge.net/
          ENTERED=20050123
       LICENSE[0]=LGPL
         KEYWORDS="archive"
-           SHORT="a quick port of command-line tools of 7zip for UNIX"
+           SHORT="quick port of command-line tools of 7zip for UNIX"
 cat << EOF
 p7zip is a quick port of 7z.exe and 7za.exe (command line version
 of 7zip, see www.7-zip.org) for Unix. 7-Zip is a file archiver with
diff --git a/archive/p7zip/HISTORY b/archive/p7zip/HISTORY
index 3545d9b37a..b42b5aef93 100644
--- a/archive/p7zip/HISTORY
+++ b/archive/p7zip/HISTORY
@@ -1,3 +1,6 @@
+2008-12-01 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 4.61; quoting paths
+
 2008-06-08 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 4.58
 
@@ -94,4 +97,3 @@
 
 2005-01-23 Sergey Lipnevich <sergey@sourcemage.org>
 	* ALL: spell created.
-
diff --git a/audio-soft/meterbridge/DEPENDS b/audio-soft/meterbridge/DEPENDS
new file mode 100755
index 0000000000..bd15d65bf0
--- /dev/null
+++ b/audio-soft/meterbridge/DEPENDS
@@ -0,0 +1,3 @@
+depends JACK-DRIVER &&
+depends sdl &&
+depends sdl_image
diff --git a/audio-soft/meterbridge/DETAILS b/audio-soft/meterbridge/DETAILS
new file mode 100755
index 0000000000..c0bfefcca6
--- /dev/null
+++ b/audio-soft/meterbridge/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=meterbridge
+         VERSION=0.9.2
+          SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=http://plugin.org.uk/meterbridge/$SOURCE
+     SOURCE_HASH=sha512:dec68307430649f3281528b31f20f501df07c4c9841776bac9c532d16a309bc701d39a5f577dc55eccb0edebc514d2eeca45c057a81a5c6c57bd61faae7deff0
+        WEB_SITE=http://plugin.org.uk/meterbridge/
+         ENTERED=20081130
+      LICENSE[0]="GPL"
+           SHORT="a software meterbridge for the UNIX based JACK audio system"
+cat << EOF
+This app visualizes the audio on JACK ports. A basic application is monitoring the level
+of several channels (useful for tuning input levels from microphone preamps).
+It supports a number of different types of meter, rendered using the SDL library and
+user-editable pixmaps.
+EOF
diff --git a/audio-soft/meterbridge/HISTORY b/audio-soft/meterbridge/HISTORY
new file mode 100644
index 0000000000..26a132485a
--- /dev/null
+++ b/audio-soft/meterbridge/HISTORY
@@ -0,0 +1,3 @@
+2008-11-30 Thomas Orgis <sobukus@sourcemage.org>
+	* DETAILS, DEPENDS: created spell
+	* PRE_BUILD: patch one line for current gcc
diff --git a/audio-soft/meterbridge/PRE_BUILD b/audio-soft/meterbridge/PRE_BUILD
new file mode 100755
index 0000000000..5163110b75
--- /dev/null
+++ b/audio-soft/meterbridge/PRE_BUILD
@@ -0,0 +1,17 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+# Fixing this in version 0.9.2:
+# vu_meters.c:11: error: static declaration of 'buf_rect' follows non-static declaration
+# main.h:11: error: previous declaration of 'buf_rect' was here
+echo '--- /usr/src/meterbridge-0.9.2/src/main.h	2003-06-05 11:42:41.000000000 +0200
++++ src/main.h	2008-08-01 10:08:16.000000000 +0200
+@@ -8,7 +8,8 @@
+ 
+ extern SDL_Surface *screen;
+ extern SDL_Surface *image, *meter, *meter_buf;
+-extern SDL_Rect win, buf_rect[MAX_METERS], dest[MAX_METERS];
++/* extern SDL_Rect win, buf_rect[MAX_METERS], dest[MAX_METERS]; */
++extern SDL_Rect win, dest[MAX_METERS];
+ 
+ extern jack_port_t *input_ports[MAX_METERS];
+ extern jack_port_t *output_ports[MAX_METERS];' | patch -Np0