[SCM] ardour/master: Refresh syslib patch

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Mon Jun 25 16:06:59 UTC 2012


The following commit has been merged in the master branch:
commit 8092785951ee9747934f87b6ca01b6be096151a4
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Jun 25 16:36:48 2012 +0200

    Refresh syslib patch

diff --git a/debian/patches/100_syslibs.patch b/debian/patches/100_syslibs.patch
index c03b51f..605966d 100644
--- a/debian/patches/100_syslibs.patch
+++ b/debian/patches/100_syslibs.patch
@@ -1,8 +1,6 @@
-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 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -528,6 +528,12 @@
      print "Ardour requires either raptor or raptor2 to be available at build time"
      Exit (1)
  
@@ -15,7 +13,7 @@ Index: ardour/SConstruct
  env = conf.Finish ()
  
  if env['FFT_ANALYSIS']:
-@@ -894,13 +900,6 @@
+@@ -916,13 +922,6 @@
  # these are part of the Ardour source tree because they are C++
  # 
  
@@ -29,7 +27,7 @@ Index: ardour/SConstruct
  env['RUBBERBAND'] = False
  
  conf = Configure (env)
-@@ -1122,7 +1121,6 @@
+@@ -1133,7 +1132,6 @@
          'libs/pbd',
          'libs/midi++2',
          'libs/ardour',
@@ -37,7 +35,7 @@ Index: ardour/SConstruct
          'libs/vamp-plugins/',
      # these are unconditionally included but have
      # tests internally to avoid compilation etc
-@@ -1188,7 +1186,6 @@
+@@ -1196,7 +1194,6 @@
          'libs/pbd',
          'libs/midi++2',
          'libs/ardour',

-- 
ardour Debian packaging



More information about the pkg-multimedia-commits mailing list