[SCM] ardour Debian packaging branch, master, updated. upstream/2.8-83-g1c51a8d

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

The following commit has been merged in the master branch:
commit 82f1ff761b885f5c89bb898fe2f26c02ee84a896
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sun Jul 26 15:24:30 2009 +0200

    Updated 100_syslibs.patch

diff --git a/debian/patches/100_syslibs.patch b/debian/patches/100_syslibs.patch
index 182494c..7a9dbc6 100644
--- a/debian/patches/100_syslibs.patch
+++ b/debian/patches/100_syslibs.patch
@@ -1,19 +1,8 @@
 diff --git a/SConstruct b/SConstruct
-index e7df3c7..3b3cb35 100644
+index f1635f2..24c3b84 100644
 --- a/SConstruct
 +++ b/SConstruct
-@@ -504,8 +504,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')
-@@ -533,6 +533,12 @@ if conf.CheckPKGExists ('aubio'):
+@@ -501,6 +501,12 @@ if conf.CheckPKGExists ('aubio'):
  else:
      env['AUBIO'] = 0
  
@@ -26,7 +15,17 @@ index e7df3c7..3b3cb35 100644
  env = conf.Finish ()
  
  if env['FFT_ANALYSIS']:
-@@ -862,13 +868,6 @@ prep_libcheck(env, env)
+@@ -559,6 +565,9 @@ libraries['xml'].ParseConfig('pkg-config --cflags --libs libxml-2.0')
+ libraries['xslt'] = LibraryInfo()
+ libraries['xslt'].ParseConfig('pkg-config --cflags --libs libxslt')
+ 
++libraries['sndfile-ardour'] = LibraryInfo()
++libraries['sndfile-ardour'].ParseConfig('pkg-config --cflags --libs sndfile')
++
+ libraries['lrdf'] = LibraryInfo()
+ libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')
+ 
+@@ -855,13 +864,6 @@ prep_libcheck(env, env)
  # these are part of the Ardour source tree because they are C++
  # 
  
@@ -40,7 +39,7 @@ index e7df3c7..3b3cb35 100644
  env['RUBBERBAND'] = False
  
  conf = Configure (env)
-@@ -1089,10 +1088,6 @@ if env['SYSLIBS']:
+@@ -1082,10 +1084,6 @@ if env['SYSLIBS']:
  # cannot use system one for the time being
  #
      
@@ -51,7 +50,7 @@ index e7df3c7..3b3cb35 100644
  #    libraries['libglademm'] = LibraryInfo()
  #    libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
  
-@@ -1112,11 +1107,9 @@ if env['SYSLIBS']:
+@@ -1105,11 +1103,9 @@ if env['SYSLIBS']:
      ]
      
      subdirs = [
@@ -63,7 +62,7 @@ index e7df3c7..3b3cb35 100644
          'libs/vamp-plugins/',
      # these are unconditionally included but have
      # tests internally to avoid compilation etc
-@@ -1165,9 +1158,6 @@ else:
+@@ -1158,9 +1154,6 @@ else:
      libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
                                            LIBPATH='#libs/soundtouch',
                                            CPPPATH=['#libs', '#libs/soundtouch'])
@@ -73,7 +72,7 @@ index e7df3c7..3b3cb35 100644
  #    libraries['libglademm'] = LibraryInfo(LIBS='libglademm',
  #                                          LIBPATH='#libs/libglademm',
  #                                          CPPPATH='#libs/libglademm')
-@@ -1182,11 +1172,9 @@ else:
+@@ -1175,11 +1168,9 @@ else:
      
      subdirs = [
          'libs/sigc++2',

-- 
ardour Debian packaging