New commits:
commit 60aba1e8283e938d8d60e403464891acfbce12f5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
fabric: new spell, simple, Pythonic tool for remote execution and
deployment
commit e771cdf1716abc6c5ead51c9aea0a0c8ccd2f71e
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
sdl_mixer: removed bunded timidity in favor of freepats gus patchset.
disabled libmikmod dep as that's broken with libmikmod-3.2.0-beta2
commit b261ceccb4eaa5730f785bceb643528ccea467eb
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
mdadm: added upstream patch for kernel 3.0 support (issue #230)
commit ba162c5a8778db47eb098ef5265ad7110b276777
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics/gimp: create gimp symlink for devel branch
commit b8ba6d97e7b04d1025bc3a7d963a651eb1fd807d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics/gimp: fixed patch error when devel branch is build
diff --git a/ChangeLog b/ChangeLog
index 18239d1..aaaa8e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * python-pypi/fabric: new spell, simple, Pythonic tool for remote
+ execution and deployment
+
2011-10-03 Ladislav Hagara <hgr AT vabo.cz>
* x11/colord: new spell, daemon that maps devices to color profiles
diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY
index d4ce62d..84e72fe 100644
--- a/disk/mdadm/HISTORY
+++ b/disk/mdadm/HISTORY
@@ -1,3 +1,6 @@
+2011-10-05 Bor Kraljič <pyrobor AT ver.si>
+ * linux-3.0.patch: added upstream patch for kernel 3.0 support (issue
#230)
+
2011-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD: remove compiler warnings/errors to fix build with
gcc 4.6
diff --git a/disk/mdadm/PRE_BUILD b/disk/mdadm/PRE_BUILD
index 1dc3479..c4886fd 100755
--- a/disk/mdadm/PRE_BUILD
+++ b/disk/mdadm/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
sedit 's:-Wall::' Makefile &&
sedit 's:-Wextra::' Makefile &&
-sedit 's:-Werror::' Makefile
+sedit 's:-Werror::' Makefile &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/linux-3.0.patch
diff --git a/disk/mdadm/linux-3.0.patch b/disk/mdadm/linux-3.0.patch
new file mode 100644
index 0000000..b8111b6
--- /dev/null
+++ b/disk/mdadm/linux-3.0.patch
@@ -0,0 +1,45 @@
+From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb AT suse.de>
+Date: Fri, 17 Jun 2011 22:49:24 +1000
+Subject: [PATCH] util: correctly parse shorter linux version numbers.
+
+The next version of Linux might be 3.0. If it is, get_linux_version
+will fail.
+So make it more robust.
+
+Reported-by: Namhyung Kim <namhyung AT gmail.com>
+Reported-by: Milan Broz <mbroz AT redhat.com>
+Signed-off-by: NeilBrown <neilb AT suse.de>
+---
+ util.c | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/util.c b/util.c
+index 10bbe56..55d171a 100644
+--- a/util.c
++++ b/util.c
+@@ -146,16 +146,16 @@ int get_linux_version()
+ {
+ struct utsname name;
+ char *cp;
+- int a,b,c;
++ int a = 0, b = 0,c = 0;
+ if (uname(&name) <0)
+ return -1;
+
+ cp = name.release;
+ a = strtoul(cp, &cp, 10);
+- if (*cp != '.') return -1;
+- b = strtoul(cp+1, &cp, 10);
+- if (*cp != '.') return -1;
+- c = strtoul(cp+1, NULL, 10);
++ if (*cp == '.')
++ b = strtoul(cp+1, &cp, 10);
++ if (*cp == '.')
++ c = strtoul(cp+1, &cp, 10);
+
+ return (a*1000000)+(b*1000)+c;
+ }
+--
+1.7.6.3
+
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index 24dd84f..607c0cd 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,9 @@
+2011-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD: don't apply gimp-poppler-0.18.patch.bz2 if
+ devel branch is built
+ * INSTALL: create /usr/bin/gimp symlink if devel version
+ is built
+
2011-10-01 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to apply the patch
* gimp-poppler-0.18.patch.bz2: added, fixes compilation with poppler
0.18
diff --git a/graphics/gimp/INSTALL b/graphics/gimp/INSTALL
new file mode 100755
index 0000000..e81a84d
--- /dev/null
+++ b/graphics/gimp/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+if [[ $GIMP_DEVEL == y ]]; then
+ ln -sf /usr/bin/gimp-$(echo ${VERSION}|sed -e 's/\.[0-9]\+$//')
${INSTALL_ROOT}/usr/bin/gimp
+fi
diff --git a/graphics/gimp/PRE_BUILD b/graphics/gimp/PRE_BUILD
index 011c1ef..e068fe8 100755
--- a/graphics/gimp/PRE_BUILD
+++ b/graphics/gimp/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+if [[ $GIMP_DEVEL == n ]]; then
if is_depends_enabled $SPELL poppler; then
bzcat "$SPELL_DIRECTORY/gimp-poppler-0.18.patch.bz2" | patch -p1
fi
+fi
diff --git a/libs/sdl_mixer/BUILD b/libs/sdl_mixer/BUILD
index 41cba52..1d3150b 100755
--- a/libs/sdl_mixer/BUILD
+++ b/libs/sdl_mixer/BUILD
@@ -1,7 +1,5 @@
sedit "s:local/lib/timidity:share/timidity/sdl:" timidity/config.h &&
-OPTS="$SDLMIXER_MOD \
- $SDLMIXER_MOD_MIKMOD \
- $SDLMIXER_NATIVE_MIDI \
+OPTS="$SDLMIXER_NATIVE_MIDI \
$SDLMIXER_NATIVE_MIDI_GPL \
$SDLMIXER_TIMIDITY_MIDI \
$SDLMIXER_TIMIDITY_MIDI_OUTPUT \
diff --git a/libs/sdl_mixer/CONFIGURE b/libs/sdl_mixer/CONFIGURE
index 9626462..a4afcbc 100755
--- a/libs/sdl_mixer/CONFIGURE
+++ b/libs/sdl_mixer/CONFIGURE
@@ -1,25 +1,25 @@
config_query_option SDLMIXER_NATIVE_MIDI \
- "Enable MIDI support" \
+ "Enable native MIDI support?" \
y \
"--enable-music-native-midi" \
"--disable-music-native-midi" &&
if [[ "$SDLMIXER_NATIVE_MIDI" == "--enable-music-native-midi" ]]
then
config_query_option SDLMIXER_NATIVE_MIDI_GPL \
- "Enable MIDI support using GPL only code" \
+ "Enable MIDI support using GPL only code?" \
n \
"--enable-music-native-midi-gpl" \
"--disable-music-native-midi-gpl"
fi
config_query_option SDLMIXER_TIMIDITY_MIDI \
- "Enable MIDI via timidity" \
+ "Enable MIDI via timidity?" \
y \
"--enable-music-midi" \
"--disable-music-midi" &&
if [[ "$SDLMIXER_TIMIDITY_MIDI" == "--enable-music-midi" ]]
then
config_query_option SDLMIXER_TIMIDITY_MIDI_OUTPUT \
- "Enable MIDI through timidity output" \
+ "Enable timidity MIDI output?" \
y \
"--enable-music-timidity-midi" \
"--disable-music-timidity-midi"
diff --git a/libs/sdl_mixer/DEPENDS b/libs/sdl_mixer/DEPENDS
index 2998320..c26699d 100755
--- a/libs/sdl_mixer/DEPENDS
+++ b/libs/sdl_mixer/DEPENDS
@@ -1,20 +1,26 @@
depends sdl &&
depends audiofile &&
-optional_depends mikmod \
- "--enable-music-mod" \
- "--disable-music-mod" \
- "to play mods via mikmod" &&
+# seems broken for libmikmod 3.2.0-beta2
+#optional_depends libmikmod \
+# "--enable-music-mod" \
+# "--disable-music-mod" \
+# "to play mods via mikmod" &&