[SCM] ardour/master: Refreshed 100.syslibs.patch

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit abee878affa95f6932d424a29084ad816163d1aa
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Oct 4 01:29:19 2011 +0200

    Refreshed 100.syslibs.patch

diff --git a/debian/patches/100_syslibs.patch b/debian/patches/100_syslibs.patch
index c0a14a2..c03b51f 100644
--- a/debian/patches/100_syslibs.patch
+++ b/debian/patches/100_syslibs.patch
@@ -1,8 +1,10 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -501,6 +501,12 @@
-     libraries['aubio'] = LibraryInfo()
-     libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
+Index: ardour/SConstruct
+===================================================================
+--- ardour.orig/SConstruct	2011-10-04 00:44:22.833527034 +0200
++++ ardour/SConstruct	2011-10-04 00:44:33.985202645 +0200
+@@ -519,6 +519,12 @@
+     print "Ardour requires either raptor or raptor2 to be available at build time"
+     Exit (1)
  
 +libraries['vamp'] = LibraryInfo ()
 +libraries['vamp'].ParseConfig('pkg-config --cflags --libs vamp-sdk')
@@ -13,7 +15,7 @@
  env = conf.Finish ()
  
  if env['FFT_ANALYSIS']:
-@@ -879,13 +885,6 @@
+@@ -894,13 +900,6 @@
  # these are part of the Ardour source tree because they are C++
  # 
  
@@ -27,7 +29,7 @@
  env['RUBBERBAND'] = False
  
  conf = Configure (env)
-@@ -1107,7 +1106,6 @@
+@@ -1122,7 +1121,6 @@
          'libs/pbd',
          'libs/midi++2',
          'libs/ardour',
@@ -35,7 +37,7 @@
          'libs/vamp-plugins/',
      # these are unconditionally included but have
      # tests internally to avoid compilation etc
-@@ -1173,7 +1171,6 @@
+@@ -1188,7 +1186,6 @@
          'libs/pbd',
          'libs/midi++2',
          'libs/ardour',

-- 
ardour Debian packaging