[SCM] ardour/master: Refresh syslibs.patch

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Wed May 18 14:02:56 UTC 2011


The following commit has been merged in the master branch:
commit 1722a0400a5d3d4a142b460f8e3f42ae474fa18c
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon May 16 16:42:54 2011 +0200

    Refresh syslibs.patch

diff --git a/debian/patches/100_syslibs.patch b/debian/patches/100_syslibs.patch
index 15287fd..c0a14a2 100644
--- a/debian/patches/100_syslibs.patch
+++ b/debian/patches/100_syslibs.patch
@@ -1,8 +1,8 @@
 --- a/SConstruct
 +++ b/SConstruct
-@@ -503,6 +503,12 @@
- else:
-     env['AUBIO'] = 0
+@@ -501,6 +501,12 @@
+     libraries['aubio'] = LibraryInfo()
+     libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
  
 +libraries['vamp'] = LibraryInfo ()
 +libraries['vamp'].ParseConfig('pkg-config --cflags --libs vamp-sdk')
@@ -13,7 +13,7 @@
  env = conf.Finish ()
  
  if env['FFT_ANALYSIS']:
-@@ -876,13 +882,6 @@
+@@ -879,13 +885,6 @@
  # these are part of the Ardour source tree because they are C++
  # 
  
@@ -27,7 +27,7 @@
  env['RUBBERBAND'] = False
  
  conf = Configure (env)
-@@ -1104,7 +1103,6 @@
+@@ -1107,7 +1106,6 @@
          'libs/pbd',
          'libs/midi++2',
          'libs/ardour',
@@ -35,7 +35,7 @@
          'libs/vamp-plugins/',
      # these are unconditionally included but have
      # tests internally to avoid compilation etc
-@@ -1170,7 +1168,6 @@
+@@ -1173,7 +1171,6 @@
          'libs/pbd',
          'libs/midi++2',
          'libs/ardour',

-- 
ardour Debian packaging



More information about the pkg-multimedia-commits mailing list