[SCM] ardour/master: Refresh kfreebsd patch

Mon Jun 25 16:07:03 UTC 2012

The following commit has been merged in the master branch:
commit 12501266bb78ad6d17b8e946de1353d4150f3bde
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Jun 25 16:41:04 2012 +0200

    Refresh kfreebsd patch

diff --git a/debian/patches/160_kfreebsd.patch b/debian/patches/160_kfreebsd.patch
index e08f3ea..bbe7008 100644
--- a/debian/patches/160_kfreebsd.patch
+++ b/debian/patches/160_kfreebsd.patch
@@ -2,11 +2,9 @@ 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
-Index: ardour/SConstruct
-===================================================================
---- ardour.orig/SConstruct	2011-10-04 00:46:29.749835171 +0200
-+++ ardour/SConstruct	2011-10-04 00:46:58.476999524 +0200
-@@ -1031,7 +1031,7 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -1046,7 +1046,7 @@
  
  conf = Configure(env)
  
@@ -15,7 +13,7 @@ Index: ardour/SConstruct
      libraries['sysmidi'] = LibraryInfo (LIBS='asound')
      env['SYSMIDI'] = 'ALSA Sequencer'
      subst_dict['%MIDITAG%'] = "seq"
-@@ -1049,8 +1049,10 @@
+@@ -1064,8 +1064,10 @@
      subst_dict['%MIDITAG%'] = "ardour"
      subst_dict['%MIDITYPE%'] = "coremidi"
  else:
@@ -28,7 +26,7 @@ Index: ardour/SConstruct
  
  pname = env['PROGRAM_NAME']
  subst_dict['%MIDI_DEVICE_NAME%'] = pname.lower()
-@@ -1335,9 +1337,12 @@
+@@ -1344,9 +1346,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"
@@ -42,10 +40,8 @@ Index: ardour/SConstruct
  
  # posix_memalign available
  if not conf.CheckFunc('posix_memalign'):
-Index: ardour/libs/midi++2/SConscript
-===================================================================
---- ardour.orig/libs/midi++2/SConscript	2011-10-04 00:17:40.840127354 +0200
-+++ ardour/libs/midi++2/SConscript	2011-10-04 00:46:58.476999524 +0200
+--- a/libs/midi++2/SConscript
++++ b/libs/midi++2/SConscript
 @@ -39,9 +39,11 @@
     midi2.Append (CCFLAGS="-DWITH_COREMIDI")
     midi2.Append (LINKFLAGS="-framework CoreMIDI")
@@ -59,10 +55,8 @@ Index: ardour/libs/midi++2/SConscript
  
  midi2.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
  midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-Index: ardour/gtk2_ardour/engine_dialog.cc
-===================================================================
---- ardour.orig/gtk2_ardour/engine_dialog.cc	2011-10-04 00:17:40.576135033 +0200
-+++ ardour/gtk2_ardour/engine_dialog.cc	2011-10-04 00:46:58.480999410 +0200
+--- a/gtk2_ardour/engine_dialog.cc
++++ b/gtk2_ardour/engine_dialog.cc
 @@ -14,7 +14,7 @@
  #include <CoreFoundation/CFString.h>
  #include <sys/param.h>
@@ -72,7 +66,7 @@ Index: ardour/gtk2_ardour/engine_dialog.cc
  #include <alsa/asoundlib.h>
  #endif
  
-@@ -116,7 +116,9 @@
+@@ -117,7 +117,9 @@
  #ifdef __APPLE__
  	strings.push_back (X_("CoreAudio"));
  #else
@@ -82,7 +76,7 @@ Index: ardour/gtk2_ardour/engine_dialog.cc
  	strings.push_back (X_("OSS"));
  	strings.push_back (X_("FFADO"));
  #endif
-@@ -161,7 +163,7 @@
+@@ -162,7 +164,7 @@
  	basic_packer.attach (period_size_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
  	row++;
  
@@ -91,7 +85,7 @@ Index: ardour/gtk2_ardour/engine_dialog.cc
  	label = manage (new Label (_("Number of buffers")));
  	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
  	basic_packer.attach (periods_spinner, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-@@ -182,7 +184,7 @@
+@@ -183,7 +185,7 @@
  	row++;
  	/* no audio mode with CoreAudio, its duplex or nuthin' */
  
@@ -100,7 +94,7 @@ Index: ardour/gtk2_ardour/engine_dialog.cc
  	label = manage (new Label (_("Audio Mode")));
  	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
  	basic_packer.attach (audio_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-@@ -222,7 +224,7 @@
+@@ -223,7 +225,7 @@
  	realtime_button.signal_toggled().connect (mem_fun (*this, &EngineControl::realtime_changed));
  	realtime_changed ();
  
@@ -109,7 +103,7 @@ Index: ardour/gtk2_ardour/engine_dialog.cc
  	label = manage (new Label (_("Realtime Priority")));
  	label->set_alignment (1.0, 0.5);
  	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-@@ -272,7 +274,7 @@
+@@ -273,7 +275,7 @@
  	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
  	++row;
  
@@ -118,7 +112,7 @@ Index: ardour/gtk2_ardour/engine_dialog.cc
  	label = manage (new Label (_("Dither")));	
  	label->set_alignment (1.0, 0.5);
  	options_packer.attach (dither_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
-@@ -288,7 +290,7 @@
+@@ -289,7 +291,7 @@
  	device_packer.set_spacings (6);
  	row = 0;
  
@@ -127,7 +121,7 @@ Index: ardour/gtk2_ardour/engine_dialog.cc
  	label = manage (new Label (_("Input device")));
  	label->set_alignment (1.0, 0.5);
  	device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-@@ -620,7 +622,7 @@
+@@ -613,7 +615,7 @@
  void
  EngineControl::realtime_changed ()
  {
@@ -136,7 +130,7 @@ Index: ardour/gtk2_ardour/engine_dialog.cc
  	priority_spinner.set_sensitive (realtime_button.get_active());
  #endif
  }
-@@ -636,8 +638,10 @@
+@@ -629,8 +631,10 @@
  #endif
  
  #ifndef __APPLE__
@@ -147,7 +141,7 @@ Index: ardour/gtk2_ardour/engine_dialog.cc
  	} else if (driver == "FFADO") {
  		devices[driver] = enumerate_ffado_devices ();
  	} else if (driver == "OSS") {
-@@ -764,6 +768,7 @@
+@@ -757,6 +761,7 @@
  	return devs;
  }
  #else
@@ -155,7 +149,7 @@ Index: ardour/gtk2_ardour/engine_dialog.cc
  vector<string>
  EngineControl::enumerate_alsa_devices ()
  {
-@@ -824,6 +829,7 @@
+@@ -817,6 +822,7 @@
  
  	return devs;
  }
@@ -163,7 +157,7 @@ Index: ardour/gtk2_ardour/engine_dialog.cc
  
  vector<string>
  EngineControl::enumerate_ffado_devices ()
-@@ -866,7 +872,9 @@
+@@ -859,7 +865,9 @@
  	vector<string>& strings = devices[driver];
  
  	if (strings.empty() && driver != "FFADO" && driver != "Dummy") {

-- 
ardour Debian packaging

