Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (e771cdf1716abc6c5ead51c9aea0a0c8ccd2f71e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (e771cdf1716abc6c5ead51c9aea0a0c8ccd2f71e)
  • Date: Wed, 5 Oct 2011 07:05:04 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

dev/null |binary
libs/sdl_mixer/BUILD | 4 +---
libs/sdl_mixer/CONFIGURE | 8 ++++----
libs/sdl_mixer/DEPENDS | 20 +++++++++++++-------
libs/sdl_mixer/DETAILS | 3 ---
libs/sdl_mixer/HISTORY | 5 +++++
libs/sdl_mixer/INSTALL | 3 ---
libs/sdl_mixer/PRE_BUILD | 3 ---
libs/sdl_mixer/timidity.tar.gz.sig | 0
9 files changed, 23 insertions(+), 23 deletions(-)

New commits:
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

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" &&

-if [[ "$SDLMIXER_TIMIDITY_MIDI" == "--enable-music-midi" ]]
-then
-depends TIMIDITY
+if [[ "$SDLMIXER_TIMIDITY_MIDI" == "--enable-music-midi" ]]; then
+ depends TIMIDITY
+elif [[ "$SDLMIXER_NATIVE_MIDI" == "--enable-music-native-midi" ]]; then
+ depends freepats
fi &&

optional_depends smpeg \
"--enable-music-mp3" \
"--disable-music-mp3 --disable-smpegtest" \
"to play mpeg movies and mp3 audio" &&
+optional_depends libmad \
+ "--enable-music-mp3-mad-gpl" \
+ "--disable-music-mp3-mad-gpl" \
+ "to play mp3 audio with libmad" &&
optional_depends libvorbis \
"--enable-music-ogg" \
"--disable-music-ogg" \
diff --git a/libs/sdl_mixer/DETAILS b/libs/sdl_mixer/DETAILS
index 767d304..5042006 100755
--- a/libs/sdl_mixer/DETAILS
+++ b/libs/sdl_mixer/DETAILS
@@ -1,12 +1,9 @@
SPELL=sdl_mixer
VERSION=1.2.11
SOURCE=SDL_mixer-$VERSION.tar.gz
- SOURCE2=timidity.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL_mixer-$VERSION
SOURCE_URL[0]=http://www.libsdl.org/projects/SDL_mixer/release/$SOURCE
- SOURCE2_URL[0]=http://www.libsdl.org/projects/SDL_mixer/timidity/$SOURCE2

SOURCE_HASH=sha512:60fc881afe6ad3d7cf9b7b54ac0f916dee526c501f13ae6472029c78432e3f563a0c4e957e0dd8ee4ea8c427cf27fae2805ea6241ca8cb0a5706d6a9108080ce
- SOURCE2_GPG=gurus.gpg:$SOURCE2.sig
WEB_SITE=http://www.libsdl.org/projects/SDL_mixer/
ENTERED=20010922
LICENSE[0]=LGPL
diff --git a/libs/sdl_mixer/HISTORY b/libs/sdl_mixer/HISTORY
index 7ff2b6d..e2c5e43 100644
--- a/libs/sdl_mixer/HISTORY
+++ b/libs/sdl_mixer/HISTORY
@@ -1,3 +1,8 @@
+2011-10-05 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS,INSTALL,PRE_BUILD: use system timidity
+ * DEPENDS: disabled libmikmod dep, libmikmod-3.2.0-beta2 breaks it
+ * BUILD: removed old mikmod options
+
2011-08-19 Bor Kraljič <pyrobor AT ver.si>
* SUB_DEPENDS, PRE_SUB_DEPENDS: removed, no longer available
* DEPENDS: removing optional depenency on libmikmod, fixed typo
diff --git a/libs/sdl_mixer/INSTALL b/libs/sdl_mixer/INSTALL
deleted file mode 100755
index 37a59d9..0000000
--- a/libs/sdl_mixer/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-default_install &&
-mkdir -p ${INSTALL_ROOT}/usr/share/timidity/sdl &&
-cp timidity/instruments/* ${INSTALL_ROOT}/usr/share/timidity/sdl
diff --git a/libs/sdl_mixer/PRE_BUILD b/libs/sdl_mixer/PRE_BUILD
deleted file mode 100755
index d4f9055..0000000
--- a/libs/sdl_mixer/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-unpack_file 2
diff --git a/libs/sdl_mixer/timidity.tar.gz.sig
b/libs/sdl_mixer/timidity.tar.gz.sig
deleted file mode 100644
index 529fd37..0000000
Binary files a/libs/sdl_mixer/timidity.tar.gz.sig and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (e771cdf1716abc6c5ead51c9aea0a0c8ccd2f71e), Arjan Bouter, 10/05/2011

Archive powered by MHonArc 2.6.24.

Top of Page