[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9077a682755a79f67e0ff3fa1afb8173d603ddfd)

Vlad Glagolev scm at sourcemage.org
Sat Mar 14 10:35:27 EDT 2009


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

 audio-creation/ardour2/DETAILS              |    3 +-
 audio-creation/ardour2/HISTORY              |    5 ++++
 audio-creation/ardour2/PRE_BUILD            |    3 ++
 audio-creation/ardour2/libsndfile-ext.patch |   34 ++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 1 deletion(-)

New commits:
commit 9077a682755a79f67e0ff3fa1afb8173d603ddfd
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    ardour2: use external (fixed and updated) libsndfile -- allows FLAC files usage

diff --git a/audio-creation/ardour2/DETAILS b/audio-creation/ardour2/DETAILS
index bcced5e..e534ae8 100755
--- a/audio-creation/ardour2/DETAILS
+++ b/audio-creation/ardour2/DETAILS
@@ -1,8 +1,9 @@
            SPELL=ardour2
          VERSION=2.7.1
+      PATCHLEVEL=1
      SOURCE_HASH=sha512:03083dc70ea80b12684495fe60f50679df28539212b29045448c688912c0cddba3f7c0b46d06318d167ddeaa38f8eb15185506e235fd813d7f16700f2ca352b1
           SOURCE=ardour-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/ardour-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/ardour-$VERSION"
    SOURCE_URL[0]=http://ardour.org/files/releases/$SOURCE
         WEB_SITE=http://ardour.org/
          ENTERED=20070829
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index d0f7ec0..bca7f7d 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,3 +1,8 @@
+2009-03-14 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1
+	* PRE_BUILD: apply patch
+	* libsndfile-ext.patch: added, to use fixed external libsndfile
+
 2009-01-28 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: updated to 2.7.1
 	* PRE_BUILD: fixed soundtouch sedit line
diff --git a/audio-creation/ardour2/PRE_BUILD b/audio-creation/ardour2/PRE_BUILD
index a745770..dd34a1d 100755
--- a/audio-creation/ardour2/PRE_BUILD
+++ b/audio-creation/ardour2/PRE_BUILD
@@ -1,3 +1,6 @@
 default_pre_build  &&
 cd $SOURCE_DIRECTORY &&
+
+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
new file mode 100644
index 0000000..cb9c29a
--- /dev/null
+++ b/audio-creation/ardour2/libsndfile-ext.patch
@@ -0,0 +1,34 @@
+--- SConstruct.orig
++++ SConstruct
+@@ -459,8 +459,8 @@ libraries = { }
+ 
+ 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
+ #
+     
+-    libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
+-                                    LIBPATH='#libs/libsndfile',
+-                                    CPPPATH=['#libs/libsndfile/src'])
++#    libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
++#                                   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']:
+     ]
+     
+     subdirs = [
+-        'libs/libsndfile',
+         'libs/pbd',
+         'libs/midi++2',
+         'libs/ardour',



More information about the SM-Commit mailing list