[SCM] ardour/master: Refresh 100_syslibs.patch

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Sat Aug 11 20:45:43 UTC 2012


The following commit has been merged in the master branch:
commit abb2c69f207c64dec6233018a4143c5ec0642f21
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sat Aug 11 20:52:37 2012 +0200

    Refresh 100_syslibs.patch

diff --git a/debian/patches/100_syslibs.patch b/debian/patches/100_syslibs.patch
index 605966d..e502572 100644
--- a/debian/patches/100_syslibs.patch
+++ b/debian/patches/100_syslibs.patch
@@ -1,8 +1,8 @@
 --- a/SConstruct
 +++ b/SConstruct
-@@ -528,6 +528,12 @@
-     print "Ardour requires either raptor or raptor2 to be available at build time"
-     Exit (1)
+@@ -515,6 +515,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']:
-@@ -916,13 +922,6 @@
+@@ -920,13 +926,6 @@
  # these are part of the Ardour source tree because they are C++
  # 
  
@@ -27,7 +27,7 @@
  env['RUBBERBAND'] = False
  
  conf = Configure (env)
-@@ -1133,7 +1132,6 @@
+@@ -1130,7 +1129,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
-@@ -1196,7 +1194,6 @@
+@@ -1193,7 +1191,6 @@
          'libs/pbd',
          'libs/midi++2',
          'libs/ardour',

-- 
ardour Debian packaging



More information about the pkg-multimedia-commits mailing list