[SCM] ardour/master: Refreshed patches.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Tue Oct 1 20:40:09 UTC 2013 

The following commit has been merged in the master branch:
commit 70a11baa035c73f0a1fc0a054c73cfa7eca815aa
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Oct 1 22:35:20 2013 +0200

    Refreshed patches.

diff --git a/debian/patches/100_syslibs.patch b/debian/patches/100_syslibs.patch
index e502572..a7d97e7 100644
--- a/debian/patches/100_syslibs.patch
+++ b/debian/patches/100_syslibs.patch
@@ -1,5 +1,7 @@
---- a/SConstruct
-+++ b/SConstruct
+Index: ardour/SConstruct
+===================================================================
+--- ardour.orig/SConstruct	2013-10-01 22:33:14.872132489 +0200
++++ ardour/SConstruct	2013-10-01 22:33:14.868132489 +0200
 @@ -515,6 +515,12 @@
      libraries['aubio'] = LibraryInfo()
      libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
@@ -13,7 +15,7 @@
  env = conf.Finish ()
  
  if env['FFT_ANALYSIS']:
-@@ -920,13 +926,6 @@
+@@ -921,13 +927,6 @@
  # these are part of the Ardour source tree because they are C++
  # 
  
@@ -27,7 +29,7 @@
  env['RUBBERBAND'] = False
  
  conf = Configure (env)
-@@ -1130,7 +1129,6 @@
+@@ -1131,7 +1130,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
-@@ -1193,7 +1191,6 @@
+@@ -1194,7 +1192,6 @@
          'libs/pbd',
          'libs/midi++2',
          'libs/ardour',
diff --git a/debian/patches/160_kfreebsd.patch b/debian/patches/160_kfreebsd.patch
index 56c977c..26d0ccb 100644
--- a/debian/patches/160_kfreebsd.patch
+++ b/debian/patches/160_kfreebsd.patch
@@ -2,9 +2,11 @@ From: Steven McDonald <steven.mcdonald at libremail.me>
 Description: Remove assumptions about ALSA to make it work on non-Linux ports.
 Forwarded: No (unclean patch, DEB_HOST_ARCH_OS is Debian specific)
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
---- a/SConstruct
-+++ b/SConstruct
-@@ -1043,7 +1043,7 @@
+Index: ardour/SConstruct
+===================================================================
+--- ardour.orig/SConstruct	2013-10-01 22:34:23.260135270 +0200
++++ ardour/SConstruct	2013-10-01 22:34:23.256135270 +0200
+@@ -1044,7 +1044,7 @@
  
  conf = Configure(env)
  
@@ -13,7 +15,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
      libraries['sysmidi'] = LibraryInfo (LIBS='asound')
      env['SYSMIDI'] = 'ALSA Sequencer'
      subst_dict['%MIDITAG%'] = "seq"
-@@ -1061,8 +1061,10 @@
+@@ -1062,8 +1062,10 @@
      subst_dict['%MIDITAG%'] = "ardour"
      subst_dict['%MIDITYPE%'] = "coremidi"
  else:
@@ -26,7 +28,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  
  pname = env['PROGRAM_NAME']
  subst_dict['%MIDI_DEVICE_NAME%'] = pname.lower()
-@@ -1345,9 +1347,12 @@
+@@ -1348,9 +1350,12 @@
  if conf.CheckCHeader('/System/Library/Frameworks/CoreAudio.framework/Versions/A/Headers/CoreAudio.h'):
      subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in"
      subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out"
@@ -40,8 +42,10 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  
  # posix_memalign available
  if not conf.CheckFunc('posix_memalign'):
---- a/libs/midi++2/SConscript
-+++ b/libs/midi++2/SConscript
+Index: ardour/libs/midi++2/SConscript
+===================================================================
+--- ardour.orig/libs/midi++2/SConscript	2013-10-01 22:34:23.260135270 +0200
++++ ardour/libs/midi++2/SConscript	2013-10-01 22:34:23.256135270 +0200
 @@ -39,9 +39,11 @@
     midi2.Append (CCFLAGS="-DWITH_COREMIDI")
     midi2.Append (LINKFLAGS="-framework CoreMIDI")
@@ -55,8 +59,10 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  
  midi2.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
  midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
---- a/gtk2_ardour/engine_dialog.cc
-+++ b/gtk2_ardour/engine_dialog.cc
+Index: ardour/gtk2_ardour/engine_dialog.cc
+===================================================================
+--- ardour.orig/gtk2_ardour/engine_dialog.cc	2013-10-01 22:34:23.260135270 +0200
++++ ardour/gtk2_ardour/engine_dialog.cc	2013-10-01 22:34:23.256135270 +0200
 @@ -14,7 +14,7 @@
  #include <CoreFoundation/CFString.h>
  #include <sys/param.h>
diff --git a/debian/patches/90_ardour-x-change.patch b/debian/patches/90_ardour-x-change.patch
index e5bd43a..69ab8ec 100644
--- a/debian/patches/90_ardour-x-change.patch
+++ b/debian/patches/90_ardour-x-change.patch
@@ -1,6 +1,8 @@
---- a/gtk2_ardour/SConscript
-+++ b/gtk2_ardour/SConscript
-@@ -178,6 +178,7 @@
+Index: ardour/gtk2_ardour/SConscript
+===================================================================
+--- ardour.orig/gtk2_ardour/SConscript	2013-10-01 22:33:01.132131930 +0200
++++ ardour/gtk2_ardour/SConscript	2013-10-01 22:33:01.128131930 +0200
+@@ -180,6 +180,7 @@
  imageframe_time_axis_group.cc
  imageframe_time_axis_view.cc
  imageframe_view.cc
@@ -8,8 +10,10 @@
  io_selector.cc
  keyboard.cc
  keyeditor.cc
---- /dev/null
-+++ b/gtk2_ardour/import_helper_aaf.cc
+Index: ardour/gtk2_ardour/import_helper_aaf.cc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ardour/gtk2_ardour/import_helper_aaf.cc	2013-10-01 22:33:01.128131930 +0200
 @@ -0,0 +1,1389 @@
 +/*
 +    Copyright (C) 2005 Paul Davis
@@ -1400,8 +1404,10 @@
 +/***************************************************************
 +*                                                              *
 +****************************************************************/
---- /dev/null
-+++ b/gtk2_ardour/import_helper_aaf.h
+Index: ardour/gtk2_ardour/import_helper_aaf.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ardour/gtk2_ardour/import_helper_aaf.h	2013-10-01 22:33:01.128131930 +0200
 @@ -0,0 +1,81 @@
 +/*
 +    Copyright (C) 2005 Paul Davis
@@ -1484,8 +1490,10 @@
 +}
 +
 +#endif // IMPORT_HELPER_AAF_H
---- a/gtk2_ardour/new_session_dialog.cc
-+++ b/gtk2_ardour/new_session_dialog.cc
+Index: ardour/gtk2_ardour/new_session_dialog.cc
+===================================================================
+--- ardour.orig/gtk2_ardour/new_session_dialog.cc	2013-10-01 22:33:01.132131930 +0200
++++ ardour/gtk2_ardour/new_session_dialog.cc	2013-10-01 22:33:01.128131930 +0200
 @@ -1,5 +1,5 @@
  /*
 -    Copyright (C) 2005 Paul Davis 
@@ -1759,8 +1767,10 @@
  }
  
  void
---- a/gtk2_ardour/new_session_dialog.h
-+++ b/gtk2_ardour/new_session_dialog.h
+Index: ardour/gtk2_ardour/new_session_dialog.h
+===================================================================
+--- ardour.orig/gtk2_ardour/new_session_dialog.h	2013-10-01 22:33:01.132131930 +0200
++++ ardour/gtk2_ardour/new_session_dialog.h	2013-10-01 22:33:01.128131930 +0200
 @@ -1,5 +1,5 @@
  /*
 -    Copyright (C) 2005 Paul Davis 
@@ -1830,8 +1840,10 @@
  
  	sigc::connection ic_connection;
  	void engine_interface_chosen();
---- /dev/null
-+++ b/libs/ardour/ardour/ax_errors.h
+Index: ardour/libs/ardour/ardour/ax_errors.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ardour/libs/ardour/ardour/ax_errors.h	2013-10-01 22:33:01.128131930 +0200
 @@ -0,0 +1,40 @@
 +/* ax_errors.h
 +

-- 
ardour Debian packaging

More information about the pkg-multimedia-commits mailing list