Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0ae1b0d561a3ef938f28b3f157b38b1c45ead837)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0ae1b0d561a3ef938f28b3f157b38b1c45ead837)
  • Date: Tue, 15 Jan 2008 17:26:23 -0600

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

audio-players/mpg123/BUILD | 9 ++++--
audio-players/mpg123/CONFIGURE | 30
++++++++++++----------
audio-players/mpg123/DEPENDS | 27 ++++++++++++++++---
audio-players/mpg123/DETAILS | 2 -
audio-players/mpg123/HISTORY | 7 ++++-
audio-players/mpg123/PRE_BUILD | 3 ++
audio-players/mpg123/mpg123-1.1.0_configure.patch | 12 ++++++++
7 files changed, 67 insertions(+), 23 deletions(-)

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

mpg123: version 1.1.0 and finally a more complete spell, supporting
multiple output modules.

diff --git a/audio-players/mpg123/BUILD b/audio-players/mpg123/BUILD
index f210abe..a91b861 100755
--- a/audio-players/mpg123/BUILD
+++ b/audio-players/mpg123/BUILD
@@ -1,5 +1,8 @@
-if [[ "$MPG123_AUDIO" != auto ]]; then
- OPTS="$OPTS --with-audio=$MPG123_AUDIO"
+if [[ "$MPG123_WITH_AUDIO" != "" ]]; then
+ OPTS="--with-audio=$MPG123_WITH_AUDIO $OPTS"
fi &&
-OPTS="$OPTS $MPG123_OPTS --with-seektable=$MPG123_SEEKTABLE" &&
+if [[ "$MPG123_SEEKTABLE" != "" ]]; then
+ OPTS="--with-seektable=$MPG123_SEEKTABLE $OPTS"
+fi &&
+OPTS="$MPG123_MODULES $OPTS"
default_build
diff --git a/audio-players/mpg123/CONFIGURE b/audio-players/mpg123/CONFIGURE
index 1860889..bf44fba 100755
--- a/audio-players/mpg123/CONFIGURE
+++ b/audio-players/mpg123/CONFIGURE
@@ -1,16 +1,20 @@
+. $GRIMOIRE/config_query_multi.function &&
message "${MESSAGE_COLOR}Optimization is chosen automatically now, though
you can force your will via custom spell options.$DEFAULT_COLOR" &&
-# Change that for proper plugin set selection and dependencies!
-config_query_list MPG123_AUDIO "choose audio output (will possibly add
dependencies, auto will build all plugins that are possible)" \
- auto \
- oss \
- alsa \
- portaudio \
- jack \
- esd \
- nas \
- sdl \
- pulseaudio \
- dummy &&
+config_query_option MPG123_MODULES "Build output modules?" y \
+ --enable-modules --disable-modules &&
+local modlist="oss alsa portaudio jack esd nas sdl \
+ pulseaudio arts dummy auto" &&
+message "${MESSAGE_COLOR}\"auto\" will select (a) working output(s) at build
time, disregarding spell dependencies.$DEFAULT_COLOR" &&
+if [[ "$MPG123_MODULES" == "--enable-modules" ]]; then
+ config_query_multi MPG123_AUDIO "Select the modules you want:" \
+ $modlist
+else
+ config_query_list MPG123_AUDIO "Choose the audio output:" \
+ $modlist
+fi &&
message "${MESSAGE_COLOR}Gapless playback on by upstream default
now.$DEFAULT_COLOR" &&
# 1000 is upstream default
-config_query_string MPG123_SEEKTABLE "seektable size" 1000
+message "${MESSAGE_COLOR}Seektable size can be tuned via configure
options...$DEFAULT_COLOR" &&
+if [[ "$MPG123_SEEKTABLE" != "" ]]; then
+message "${MESSAGE_COLOR}But I still will use your old setting of
$MPG123_SEEKTABLE.$DEFAULT_COLOR"
+fi
diff --git a/audio-players/mpg123/DEPENDS b/audio-players/mpg123/DEPENDS
index 52c782a..241f937 100755
--- a/audio-players/mpg123/DEPENDS
+++ b/audio-players/mpg123/DEPENDS
@@ -1,4 +1,13 @@
-case ${MPG123_AUDIO} in
+persistent_add MPG123_WITH_AUDIO &&
+MPG123_WITH_AUDIO="" &&
+for i in $MPG123_AUDIO
+do
+ local add=$i
+case $i in
+ auto)
+ MPG123_WITH_AUDIO=""
+ add=""
+ ;;
esd)
depends esound
;;
@@ -25,7 +34,15 @@ case ${MPG123_AUDIO} in
pulseaudio)
depends pulseaudio
;;
- dummy)
- message "building mpg123 without audio device output (only raw and
wav/au)"
- ;;
-esac
+ arts)
+ depends arts
+ ;;
+esac &&
+if [[ "$add" != "" ]]; then
+ MPG123_WITH_AUDIO="$MPG123_WITH_AUDIO,$add"
+fi
+done &&
+# Use libtool's libltdl.
+if [[ "$MPG123_MODULES" == "--enable-modules" ]]; then
+ depends libtool
+fi
diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index 6bb66e4..9987cf6 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
SPELL=mpg123
- VERSION=1.0.1
+ VERSION=1.1.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index 3efbc2c..8d80527 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,9 @@
+2008-01-16 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: bump to version 1.1.0
+ * BUILD, CONFIGURE, DEPENDS, PRE_BUILD, mpg123-1.1.0_configure.patch:
+ Enhance/cleanup the spell, supports proper output module selection
now.
+ Also doesn't ask for seektable anymore (that's a custom spell opt).
+
2007-12-28 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: bump to bugfix release 1.0.1

@@ -92,4 +98,3 @@

2002-06-12 Unet <unet AT sourcemage.org>
* BUILD, DETAILS, HISTORY: Created this.
-
diff --git a/audio-players/mpg123/PRE_BUILD b/audio-players/mpg123/PRE_BUILD
new file mode 100755
index 0000000..4b06e9b
--- /dev/null
+++ b/audio-players/mpg123/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -Np0 < "$SCRIPT_DIRECTORY/mpg123-1.1.0_configure.patch"
diff --git a/audio-players/mpg123/mpg123-1.1.0_configure.patch
b/audio-players/mpg123/mpg123-1.1.0_configure.patch
new file mode 100644
index 0000000..c06eaeb
--- /dev/null
+++ b/audio-players/mpg123/mpg123-1.1.0_configure.patch
@@ -0,0 +1,12 @@
+--- configure.orig 2008-01-15 03:29:41.000000000 +0100
++++ configure 2008-01-15 23:39:21.000000000 +0100
+@@ -14702,7 +14702,8 @@
+
+ # Check whether --with-audio was given.
+ if test "${with_audio+set}" = set; then
+- withval=$with_audio;
++ with_audio=`echo $with_audio|tr , ' '`;
++ withval="$with_audio";
+ fi
+
+



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0ae1b0d561a3ef938f28b3f157b38b1c45ead837), Thomas Orgis, 01/15/2008

Archive powered by MHonArc 2.6.24.

Top of Page