Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3540a6463dc79a5f8cddccfd7f5a6d8fc52776be)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3540a6463dc79a5f8cddccfd7f5a6d8fc52776be)
  • Date: Sun, 23 Mar 2008 12:27:02 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

audio-creation/ardour2/BUILD | 11 -----
audio-creation/ardour2/CONFIGURE | 33 +++++----------
audio-creation/ardour2/DEPENDS | 81
++++++++++++++++-----------------------
audio-creation/ardour2/DETAILS | 2
audio-creation/ardour2/HISTORY | 5 ++
audio-creation/ardour2/INSTALL | 2
audio-creation/ardour2/PRE_BUILD | 4 +
7 files changed, 59 insertions(+), 79 deletions(-)

New commits:
commit 3540a6463dc79a5f8cddccfd7f5a6d8fc52776be
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ardour2: some simple fixes + clean up

diff --git a/audio-creation/ardour2/BUILD b/audio-creation/ardour2/BUILD
index f65bcf4..7fc6c07 100755
--- a/audio-creation/ardour2/BUILD
+++ b/audio-creation/ardour2/BUILD
@@ -1,9 +1,2 @@
-scons "PREFIX=$INSTALL_ROOT/usr" $OPTS \
- $ARDOUR2_SURFACES $ARDOUR2_FFT_ANALYSIS $ARDOUR2_OLDFONTS
-
-#
-# SYSLIBS option is broken in 2.3.1
-#
-#scons "PREFIX=$INSTALL_ROOT/usr" $OPTS \
-# $ARDOUR2_SYSLIBS $ARDOUR2_SURFACES \
-# $ARDOUR2_FFT_ANALYSIS $ARDOUR2_OLDFONTS
+scons "PREFIX=$INSTALL_ROOT/usr" $OPTS \
+ $ARDOUR2_SYSLIBS $ARDOUR2_SURFACES $ARDOUR2_OLDFONTS
diff --git a/audio-creation/ardour2/CONFIGURE
b/audio-creation/ardour2/CONFIGURE
index fd96f2e..e7e371d 100755
--- a/audio-creation/ardour2/CONFIGURE
+++ b/audio-creation/ardour2/CONFIGURE
@@ -1,23 +1,14 @@
-#
-# SYSLIBS option is broken in 2.3.1
-#
-#message "${MESSAGE_COLOR} Warning: using system libraries cancels" \
-# "all support from Ardour developers!$DEFAULT_COLOR" &&
-#
-#config_query_option ARDOUR2_SYSLIBS \
-# "Use system libraries instead of internal ones?" \
-# n \
-# "SYSLIBS=1" \
-# "SYSLIBS=0" &&
+message "${MESSAGE_COLOR} Warning: using system libraries cancels" \
+ "all support from Ardour developers!$DEFAULT_COLOR" &&

-config_query_option ARDOUR2_SURFACES \
- "Build with support for control surfaces?" \
- y \
- "SURFACES=1" \
- "SURFACES=0" &&
+config_query_option ARDOUR2_SYSLIBS \
+ "Use system libraries instead of internal ones?" n \
+ "SYSLIBS=1" "SYSLIBS=0" &&

-config_query_option ARDOUR2_OLDFONTS \
- "Use old school font sizes?" \
- n \
- "OLDFONTS=1" \
- "OLDFONTS=0"
+config_query_option ARDOUR2_SURFACES \
+ "Build with support for control surfaces?" y \
+ "SURFACES=1" "SURFACES=0" &&
+
+config_query_option ARDOUR2_OLDFONTS \
+ "Use old school font sizes?" n \
+ "OLDFONTS=1" "OLDFONTS=0"
diff --git a/audio-creation/ardour2/DEPENDS b/audio-creation/ardour2/DEPENDS
index 5e0c935..f80bd45 100755
--- a/audio-creation/ardour2/DEPENDS
+++ b/audio-creation/ardour2/DEPENDS
@@ -1,52 +1,39 @@
-depends g++ &&
-depends scons &&
-depends python &&
-depends pkgconfig &&
-depends libtool &&
-depends libxml2 &&
-depends libxslt &&
-depends libart_lgpl &&
-depends raptor &&
-depends liblrdf &&
-depends glib2 &&
-depends gtk+2 &&
-depends libgnomecanvas &&
-depends liblo &&
-depends boost &&
-depends alsa-lib &&
-depends libsamplerate &&
-depends fftw &&
+depends g++ &&
+depends scons &&
+depends python &&
+depends pkgconfig &&
+depends libtool &&
+depends libxml2 &&
+depends libxslt &&
+depends libart_lgpl &&
+depends raptor &&
+depends liblrdf &&
+depends glib2 &&
+depends gtk+2 &&
+depends libgnomecanvas &&
+depends liblo &&
+depends boost &&
+depends alsa-lib &&
+depends libsamplerate &&
+depends fftw &&
+depends JACK-DRIVER &&

-#
-# SYSLIBS option is broken in 2.3.1
-#
-#if [[ $ARDOUR2_SYSLIBS == 'SYSLIBS=1' ]]
-#then
-# depends libsigc++3 &&
-# depends gtkmm2 &&
-# depends libgnomecanvasmm &&
-# depends soundtouch
-#fi &&
-
-depends JACK-DRIVER &&
+if [[ $ARDOUR2_SYSLIBS == "SYSLIBS=1" ]]; then
+ depends libsigc++3 &&
+ depends gtkmm2 &&
+ depends libgnomecanvasmm &&
+ depends soundtouch
+fi &&

# slv2 >= 0.6.0 (SVN version) required
-#optional_depends slv2 \
-# "LV2=1" \
-# "LV2=0" \
-# "for LV2 plugin support" &&
-
-optional_depends fftw \
- "FFT_ANALYSIS=1" \
- "FFT_ANALYSIS=0" \
- "to include FFT analysis window" &&
+#optional_depends slv2 \
+# "LV2=1" "LV2=0" \
+# "for LV2 plugin support" &&

-optional_depends libusb \
- "TRANZPORT=1" \
- "TRANZPORT=0" \
- "for TranzPort controller support" &&
+optional_depends libusb \
+ "TRANZPORT=1" "TRANZPORT=0" \
+ "for TranzPort controller support" &&

-optional_depends gettext \
- "NLS=1" \
- "NLS=0" \
- "for internationalization support"
+optional_depends gettext \
+ "NLS=1" "NLS=0" \
+ "for internationalization support"
diff --git a/audio-creation/ardour2/DETAILS b/audio-creation/ardour2/DETAILS
index 061ec62..3aa4483 100755
--- a/audio-creation/ardour2/DETAILS
+++ b/audio-creation/ardour2/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/ardour-${VERSION:0:3}"
ENTERED=20070829
LICENSE[0]=GPL
KEYWORDS="disk editors audio"
- SHORT="A multi-track, professional Digital Audio Workstation."
+ SHORT="A multi-track, professional Digital Audio Workstation"
cat << EOF
Ardour is a digital audio workstation. You can use it to record, edit and mix
multi-track audio. You can produce your own CDs, mix video soundtracks, or
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index 421ecea..9bb36be 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,3 +1,8 @@
+2008-03-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: fftw is not optional
+ * PRE_BUILD: fixed SoundTouch detection
+ * BUILD, CONFIGURE: SYSLIBS OK
+
2008-02-26 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 2.3.1.
* DEPENDS: Added depends fftw, added commented-out optional_depends
diff --git a/audio-creation/ardour2/INSTALL b/audio-creation/ardour2/INSTALL
index b7e83d0..9f0c0eb 100755
--- a/audio-creation/ardour2/INSTALL
+++ b/audio-creation/ardour2/INSTALL
@@ -1 +1 @@
-scons install
+scons install
diff --git a/audio-creation/ardour2/PRE_BUILD
b/audio-creation/ardour2/PRE_BUILD
new file mode 100755
index 0000000..ad6591f
--- /dev/null
+++ b/audio-creation/ardour2/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+sed -i "s:libSoundTouch:soundtouch-1.0:" SConstruct



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3540a6463dc79a5f8cddccfd7f5a6d8fc52776be), Vlad Glagolev, 03/23/2008

Archive powered by MHonArc 2.6.24.

Top of Page