Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (7acc2045b72c5f7b51f4aafa453e3b2631fec1c4)
  • Date: Tue, 19 Dec 2006 06:28:41 -0600

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

audio-creation/audacity/BUILD | 19 ++++++---
audio-creation/audacity/CONFIGURE | 14 +++----
audio-creation/audacity/DEPENDS | 29 +++++++++-----
audio-creation/audacity/DETAILS | 4 +-
audio-creation/audacity/HISTORY | 7 +++
audio-creation/audacity/PREPARE | 5 +-
audio-creation/audacity/PRE_BUILD | 2 +
audio-creation/audacity/audacity.desktop.patch | 46
+++++++++++++++++++++++
audio-creation/audacity/desktop/audacity.desktop | 8 ----
9 files changed, 97 insertions(+), 37 deletions(-)

New commits:
commit 5eb88fd0ae88e152c36eb298b0636cac3886d668
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

audacity: version bump to 1.3.2,
cleaned up some variables and configure options,
removed audacity.desktop as they provide their own
and added a patch to fix their broken desktop file ;)

diff --git a/audio-creation/audacity/BUILD b/audio-creation/audacity/BUILD
index 3e26d06..06224d3 100755
--- a/audio-creation/audacity/BUILD
+++ b/audio-creation/audacity/BUILD
@@ -1,13 +1,18 @@
-if [ "$REL" == "beta" ]; then
- OPTS="$SOUNDTOUCH $OPTS"
+if [ "$AUDACITY_UNI" == "y" ]; then
+ OPTS="$OPTS --enable-unicode"
fi &&

-OPTS="$LADSPA $PORTMIXER $PORTAUDIO $OPTS" &&
+if [ "$AUDACITY_REL" == "beta" ]; then
+ OPTS="$AUDACITY_SOUNDTOUCH $OPTS"
+fi &&
+
+OPTS="$AUDACITY_LADSPA $AUDACITY_PORTMIXER $AUDACITY_PORTAUDIO $OPTS" &&

-./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- $OPTS &&
+./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-lib-preference=system \
+ $OPTS &&

make_single &&
make &&
diff --git a/audio-creation/audacity/CONFIGURE
b/audio-creation/audacity/CONFIGURE
index 49fa515..1afc0f1 100755
--- a/audio-creation/audacity/CONFIGURE
+++ b/audio-creation/audacity/CONFIGURE
@@ -1,16 +1,16 @@
-if [ "$REL" == "beta" ]; then
- config_query_option SOUNDTOUCH "Compile with SoundTouch (for tempo, \
+if [ "$AUDACITY_REL" == "beta" ]; then
+ config_query_option AUDACITY_SOUNDTOUCH "Compile with SoundTouch
(for tempo, \
pitch, and playback rate processing)?" y \
- "" "--without-soundtouch" &&
-config_query_option PORTAUDIO "Compile with PortAudio v19?" y \
+ "--without-soundtouch" "--without-soundtouch" &&
+config_query_option AUDACITY_PORTAUDIO "Compile with PortAudio v19?" y \
"--with-portaudio=v19" "--with-portaudio=v18"
fi &&

-config_query_option NYQUIST "Compile with Nyquist plug-in support?" y \
+config_query_option AUDACITY_NYQUIST "Compile with Nyquist plug-in
support?" y \
"--with-nyquist" "--without-nyquist" &&

-config_query_option LADSPA "Compile with LADSPA plug-in support?" y \
+config_query_option AUDACITY_LADSPA "Compile with LADSPA plug-in support?"
y \
"--with-ladspa" "--without-ladspa" &&

-config_query_option PORTMIXER "Compile with PortMixer?" y \
+config_query_option AUDACITY_PORTMIXER "Compile with PortMixer?" y \
"--with-portmixer" "--without-portmixer"
diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS
index c701695..fdc72f9 100755
--- a/audio-creation/audacity/DEPENDS
+++ b/audio-creation/audacity/DEPENDS
@@ -1,22 +1,29 @@
depends zip &&
-if [ "$REL" == "current" ]; then
+if [ "$AUDACITY_REL" == "current" ]; then
depends wxgtk-no-unicode
else
depends wxgtk
fi &&
depends lame &&
-if [ "$REL" == "cvs" ]; then
+if [ "$AUDACITY_REL" == "cvs" ]; then
depends CVS
fi &&
-depends flac &&
-depends libvorbis &&
+
+optional_depends flac "" "--without-flac" "For flac support" &&
+
+optional_depends twolame "--with-libtwolame" \
+ "--without-libtwolame" \
+ "For twolame support" &&
+
+optional_depends libvorbis "" \
+ "--without-vorbis" \
+ "for flac support" &&
+
optional_depends libmad "--with-libmad=system" "--without-libmad" \
"for MP3 importing support" &&

-optional_depends lame "" "" "for MP3 exporting support" &&
-
-optional_depends libid3tag \
- "" \
+optional_depends libid3tag \
+ "" \
"--without-id3tag" \
"for MP3 ID3 tag support" &&

@@ -26,11 +33,11 @@ optional_depends libsndfile
"to use system libsndfile" &&

optional_depends libsamplerate \
- "--with-libsamplerate" \
+ "" \
"--without-libsamplerate" \
"to use external libsamplerate" &&
-
-if [ "$REL" == "current" ]; then
+
+if [ "$AUDACITY_REL" == "current" ]; then
optional_depends soundtouch \
"--with-soundtouch=system" \
"--with-soundtouch=local" \
diff --git a/audio-creation/audacity/DETAILS b/audio-creation/audacity/DETAILS
index ca3b98d..9e41c68 100755
--- a/audio-creation/audacity/DETAILS
+++ b/audio-creation/audacity/DETAILS
@@ -1,5 +1,5 @@
SPELL=audacity
-if [ "$REL" == "cvs" ]; then
+if [ "$AUDACITY_REL" == "cvs" ]; then
if [ "$AUD_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
@@ -11,7 +11,7 @@ if [ "$REL" == "cvs" ]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
else
- if [ "$REL" == "beta" ]; then
+ if [ "$AUDACITY_REL" == "beta" ]; then
VERSION=1.3.2
SOURCE=$SPELL-src-$VERSION.tar.gz
SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index b067d73..53cd03a 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,10 @@
+2006-12-19 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: Updated current to 1.3.2
+ * audacity.desktop.patch: added
+ * PRE_BUILD: added
+ * DEPENDS: cleaned up variables and dependencies
+ * desktop/audacity.desktop: removed
+
2006-11-16 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated current to 1.2.6

diff --git a/audio-creation/audacity/PREPARE b/audio-creation/audacity/PREPARE
index 4152590..8b96dd3 100755
--- a/audio-creation/audacity/PREPARE
+++ b/audio-creation/audacity/PREPARE
@@ -1,5 +1,6 @@
-config_query_list REL "Which release?" current beta cvs
-if [ "$REL" == "cvs" ]; then
+config_query_list AUDACITY_REL "Which release?" current beta cvs
+if [ "$AUDACITY_REL" == "cvs" ]; then
config_query AUD_CVS_AUTOUPDATE \
"Update to the latest CVS automatically on every cast?" n
fi
+config_query AUDACITY_UNI "Enable unicode support?" n
diff --git a/audio-creation/audacity/PRE_BUILD
b/audio-creation/audacity/PRE_BUILD
new file mode 100755
index 0000000..92a24ce
--- /dev/null
+++ b/audio-creation/audacity/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+patch -p1 < $SCRIPT_DIRECTORY/audacity.desktop.patch
diff --git a/audio-creation/audacity/audacity.desktop.patch
b/audio-creation/audacity/audacity.desktop.patch
new file mode 100644
index 0000000..56861c1
--- /dev/null
+++ b/audio-creation/audacity/audacity.desktop.patch
@@ -0,0 +1,46 @@
+diff -Naur audacity-src-1.3.2-beta/src/audacity.desktop
audacity-src-1.3.2-beta-fixed/src/audacity.desktop
+--- audacity-src-1.3.2-beta/src/audacity.desktop 2006-10-29
01:05:29.000000000 +0200
++++ audacity-src-1.3.2-beta-fixed/src/audacity.desktop 2006-12-18
22:50:52.000000000 +0100
+@@ -1,22 +1,22 @@
+-???[Desktop Entry]
+-Encoding=UTF-8
+-
+-Name=Audacity Sound Editor
+-Name[de]=Audacity Audio-Editor
+-Name[ru]=???????????????? ???????????????? ???????????? Audacity
+-GenericName=Sound Editor
+-GenericName[de]=Audio-Editor
+-GenericName[ru]=???????????????? ???????????????? ????????????
+-Comment=Record and edit audio files
++[Desktop Entry]
++Encoding=UTF-8
++
++Name=Audacity Sound Editor
++Name[de]=Audacity Audio-Editor
++Name[ru]=???????????????? ???????????????? ???????????? Audacity
++GenericName=Sound Editor
++GenericName[de]=Audio-Editor
++GenericName[ru]=???????????????? ???????????????? ????????????
++Comment=Record and edit audio files
+ Comment[de]=Audio-Dateien aufnehmen und bearbeiten
+-Comment[ru]=???????????? ?? ???????????????????????????? ????????????????
????????????
++Comment[ru]=???????????? ?? ???????????????????????????? ????????????????
????????????
++
++Icon=/usr/share/audacity/audacity.xpm
++
++Type=Application
++Categories=Application;AudioVideo;Audio;Multimedia;
+
+-Icon=/usr/share/audacity/audacity.xpm
+-
+-Type=Application
+-Categories=Application;AudioVideo;Audio;Multimedia;
+-
+-Exec=audacity
+-StartupNotify=false
+-Terminal=false
+-MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project;
++Exec=audacity
++StartupNotify=false
++Terminal=false
++MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project;
diff --git a/audio-creation/audacity/desktop/audacity.desktop
b/audio-creation/audacity/desktop/audacity.desktop
deleted file mode 100644
index 1114f3f..0000000
--- a/audio-creation/audacity/desktop/audacity.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Audacity
-Exec=audacity
-Icon=
-Terminal=false
-Type=Application
-Categories=Application;Audio




Archive powered by MHonArc 2.6.24.

Top of Page