[SM-Commit] GIT changes to master grimoire by George Sherwood (4306dde17467967d3ddd2c7d1bd72efefe9726dd)

George Sherwood scm at mail.sourcemage.org
Sun Nov 5 10:51:47 EST 2006


GIT changes to master grimoire by George Sherwood <chat at sourcemage.org>:

 audio-creation/audacity/BUILD     |   12 ++++++++++--
 audio-creation/audacity/CONFIGURE |   16 ++++++++++++++++
 audio-creation/audacity/DEPENDS   |   24 +++++++++++++++++++++++-
 audio-creation/audacity/HISTORY   |    8 ++++++++
 4 files changed, 57 insertions(+), 3 deletions(-)

New commits:
commit 4306dde17467967d3ddd2c7d1bd72efefe9726dd
Author: George Sherwood <chat at sourcemage.org>
Commit: George Sherwood <chat at sourcemage.org>

    audacity:  Fixed up depends and configure options.  Thanks to iuso.

diff --git a/audio-creation/audacity/BUILD b/audio-creation/audacity/BUILD
index 131ecce..3e26d06 100755
--- a/audio-creation/audacity/BUILD
+++ b/audio-creation/audacity/BUILD
@@ -1,6 +1,14 @@
+if [ "$REL" == "beta" ]; then
+   OPTS="$SOUNDTOUCH $OPTS"
+fi &&
+
+OPTS="$LADSPA $PORTMIXER $PORTAUDIO $OPTS" &&
+
 ./configure  --prefix=/usr         \
              --sysconfdir=/etc     \
              --localstatedir=/var  \
-             --without-id3         \
              $OPTS                 &&
-make
+
+make_single &&
+make &&
+make_normal
diff --git a/audio-creation/audacity/CONFIGURE b/audio-creation/audacity/CONFIGURE
new file mode 100755
index 0000000..49fa515
--- /dev/null
+++ b/audio-creation/audacity/CONFIGURE
@@ -0,0 +1,16 @@
+if [ "$REL" == "beta" ]; then
+      config_query_option  SOUNDTOUCH  "Compile with SoundTouch (for tempo, \
+pitch, and playback rate processing)?"  y   \
+                     ""  "--without-soundtouch" &&
+config_query_option  PORTAUDIO  "Compile with PortAudio v19?"  y \
+                     "--with-portaudio=v19" "--with-portaudio=v18"
+fi &&
+
+config_query_option  NYQUIST  "Compile with Nyquist plug-in support?"  y  \
+                     "--with-nyquist"  "--without-nyquist"          &&
+
+config_query_option  LADSPA  "Compile with LADSPA plug-in support?"  y  \
+                     "--with-ladspa"  "--without-ladspa"                &&
+
+config_query_option  PORTMIXER  "Compile with PortMixer?"  y    \
+                     "--with-portmixer"  "--without-portmixer"
diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS
index 45bd097..c701695 100755
--- a/audio-creation/audacity/DEPENDS
+++ b/audio-creation/audacity/DEPENDS
@@ -8,9 +8,31 @@ depends  lame   &&
 if [ "$REL" == "cvs" ]; then
    depends CVS
 fi  &&
+depends flac &&
+depends libvorbis &&
+optional_depends  libmad  "--with-libmad=system"  "--without-libmad"  \
+                  "for MP3 importing support"                         &&
 
+optional_depends  lame  ""  ""  "for MP3 exporting support"  &&
+
+optional_depends  libid3tag  \
+                  ""      \
+                  "--without-id3tag"  \
+                  "for MP3 ID3 tag support" &&
+
+optional_depends  libsndfile                  \
+                  "--with-libsndfile=system"  \
+                  "--with-libsndfile=local"   \
+                  "to use system libsndfile"  &&
+
+optional_depends  libsamplerate                  \
+                  "--with-libsamplerate"  \
+                  "--without-libsamplerate"      \
+                  "to use external libsamplerate" &&
+                 
+if [ "$REL" == "current" ]; then
 optional_depends soundtouch    \
                  "--with-soundtouch=system"  \
                  "--with-soundtouch=local"    \
                  "to use external soundtouch for editing"
-
+fi
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index 6a76a54..532e575 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,11 @@
+2006-11-05 George Sherwood <george at beernabeer.com>
+	* BUILD: Added OPTS from CONFIGURE. Added make_single.
+	  Removed --without-id3, not a valid option
+	* CONFIGURE: Added file. Options for: soundtouch, nyquist,
+	  ladspa and portmixer.  Most provided by iuso.
+	* DEPENDS: Added a few missing depends/optional_depends.
+	  Also thanks to iuso.
+
 2006-10-30 George Sherwood <george at beernabeer.com>
 	* DETAILS: Updated current to 1.2.5 & beta to 1.3.2. Removed UPDATED
 	* DEPENDS: Added optional_depends soundtouch



More information about the SM-Commit mailing list