Skip to Content.
Sympa Menu

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

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 (5b7061a577cc3a01ff64e42b91b0fd2c08b482fe)
  • Date: Sat, 1 Aug 2009 07:50:29 -0500

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

audio-creation/ardour2/DEPENDS | 1 +
audio-creation/ardour2/HISTORY | 7 ++++++-
audio-creation/ardour2/PRE_BUILD | 8 +++-----
audio-creation/ardour2/libsndfile-ext.patch | 28
++++++++++++----------------
4 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 5b7061a577cc3a01ff64e42b91b0fd2c08b482fe
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ardour2: complete 2.8.2 bump

diff --git a/audio-creation/ardour2/DEPENDS b/audio-creation/ardour2/DEPENDS
index 58c622e..e428373 100755
--- a/audio-creation/ardour2/DEPENDS
+++ b/audio-creation/ardour2/DEPENDS
@@ -24,6 +24,7 @@ then
depends libsigc++3 &&
depends gtkmm2 &&
depends libgnomecanvasmm &&
+ depends libsndfile &&
depends soundtouch
fi &&

diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index 537cac2..526114c 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,5 +1,10 @@
+2009-08-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: quoting paths, cleaned up
+ * DEPENDS: added missing libsndfile dep if SYSLIBS
+ * libsndfile-ext.patch: updated for the new version
+
2009-08-01 Thomas Orgis <sobukus AT sourcemage.org>
- * DETAILS: updated spell to 2.8.2
+ * DETAILS: updated spell to 2.8.2
* PRE_BUILD: Do not apply external libsndfile patch, it needs fixing
(sorry, Vlad - I hope you manage to do it)

diff --git a/audio-creation/ardour2/PRE_BUILD
b/audio-creation/ardour2/PRE_BUILD
index 49161c1..47c3af1 100755
--- a/audio-creation/ardour2/PRE_BUILD
+++ b/audio-creation/ardour2/PRE_BUILD
@@ -1,9 +1,7 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/mime.patch" &&
-# We want external libsndfile so that FLAC support is possible.
-# But the patch needs fixing.
-#patch -p0 < "$SPELL_DIRECTORY/libsndfile-ext.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/libsndfile-ext.patch" &&

sed -i "s:soundtouch-1.0:soundtouch-1.4:" SConstruct
diff --git a/audio-creation/ardour2/libsndfile-ext.patch
b/audio-creation/ardour2/libsndfile-ext.patch
index cb9c29a..e9aa73c 100644
--- a/audio-creation/ardour2/libsndfile-ext.patch
+++ b/audio-creation/ardour2/libsndfile-ext.patch
@@ -1,17 +1,13 @@
---- SConstruct.orig
-+++ SConstruct
-@@ -459,8 +459,8 @@ libraries = { }
+--- SConstruct.orig 2009-07-20 19:55:10.000000000 +0400
++++ SConstruct 2009-08-01 16:08:33.746802538 +0400
+@@ -1077,14 +1077,16 @@
+ libraries['pangomm'].ParseConfig ('pkg-config --cflags --libs
pangomm-1.4')
+ libraries['libgnomecanvasmm'] = LibraryInfo()
+ libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs
libgnomecanvasmm-2.6')
++ libraries['sndfile-ardour'] = LibraryInfo()
++ libraries['sndfile-ardour'].ParseConfig('pkg-config --cflags --libs
sndfile')

- libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
-
--#libraries['sndfile'] = LibraryInfo()
--#libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile')
-+libraries['sndfile-ardour'] = LibraryInfo()
-+libraries['sndfile-ardour'].ParseConfig('pkg-config --cflags --libs
sndfile')
-
- libraries['lrdf'] = LibraryInfo()
- libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')
-@@ -861,9 +861,9 @@ if env['SYSLIBS']:
+ #
# cannot use system one for the time being
#

@@ -19,12 +15,12 @@
- LIBPATH='#libs/libsndfile',
- CPPPATH=['#libs/libsndfile/src'])
+# libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
-+# LIBPATH='#libs/libsndfile',
-+# CPPPATH=['#libs/libsndfile/src'])
++# LIBPATH='#libs/libsndfile',
++# CPPPATH=['#libs/libsndfile/src'])

# libraries['libglademm'] = LibraryInfo()
# libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs
libglademm-2.4')
-@@ -883,7 +883,6 @@ if env['SYSLIBS']:
+@@ -1105,7 +1107,6 @@
]

subdirs = [



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (5b7061a577cc3a01ff64e42b91b0fd2c08b482fe), Vlad Glagolev, 08/01/2009

Archive powered by MHonArc 2.6.24.

Top of Page