[SCM] ardour/master: Refreshed 160_kfreebsd.patch

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Mon Oct 3 23:34:21 UTC 2011 

The following commit has been merged in the master branch:
commit fcbb14265413e6fca4127f8aba9b3413ed1f4ca3
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Oct 4 01:30:49 2011 +0200

    Refreshed 160_kfreebsd.patch

diff --git a/debian/patches/160_kfreebsd.patch b/debian/patches/160_kfreebsd.patch
index 17f1eee..e08f3ea 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
-@@ -1016,7 +1016,7 @@
+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 @@
  
  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"
-@@ -1034,8 +1034,10 @@
+@@ -1049,8 +1049,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()
-@@ -1320,9 +1322,12 @@
+@@ -1335,9 +1337,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	2011-10-04 00:17:40.840127354 +0200
++++ ardour/libs/midi++2/SConscript	2011-10-04 00:46:58.476999524 +0200
 @@ -39,9 +39,11 @@
     midi2.Append (CCFLAGS="-DWITH_COREMIDI")
     midi2.Append (LINKFLAGS="-framework CoreMIDI")
@@ -55,9 +59,11 @@ 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
-@@ -12,7 +12,7 @@
+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
+@@ -14,7 +14,7 @@
  #include <CoreFoundation/CFString.h>
  #include <sys/param.h>
  #include <mach-o/dyld.h>
@@ -66,7 +72,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  #include <alsa/asoundlib.h>
  #endif
  
-@@ -113,7 +113,9 @@
+@@ -116,7 +116,9 @@
  #ifdef __APPLE__
  	strings.push_back (X_("CoreAudio"));
  #else
@@ -76,7 +82,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  	strings.push_back (X_("OSS"));
  	strings.push_back (X_("FFADO"));
  #endif
-@@ -158,7 +160,7 @@
+@@ -161,7 +163,7 @@
  	basic_packer.attach (period_size_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
  	row++;
  
@@ -85,7 +91,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  	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);
-@@ -179,7 +181,7 @@
+@@ -182,7 +184,7 @@
  	row++;
  	/* no audio mode with CoreAudio, its duplex or nuthin' */
  
@@ -94,7 +100,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  	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);
-@@ -218,7 +220,7 @@
+@@ -222,7 +224,7 @@
  	realtime_button.signal_toggled().connect (mem_fun (*this, &EngineControl::realtime_changed));
  	realtime_changed ();
  
@@ -103,7 +109,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  	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);
-@@ -268,7 +270,7 @@
+@@ -272,7 +274,7 @@
  	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
  	++row;
  
@@ -112,7 +118,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  	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));
-@@ -299,7 +301,7 @@
+@@ -288,7 +290,7 @@
  	device_packer.set_spacings (6);
  	row = 0;
  
@@ -121,7 +127,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  	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);
-@@ -570,7 +572,7 @@
+@@ -620,7 +622,7 @@
  void
  EngineControl::realtime_changed ()
  {
@@ -130,7 +136,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  	priority_spinner.set_sensitive (realtime_button.get_active());
  #endif
  }
-@@ -586,8 +588,10 @@
+@@ -636,8 +638,10 @@
  #endif
  
  #ifndef __APPLE__
@@ -141,7 +147,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  	} else if (driver == "FFADO") {
  		devices[driver] = enumerate_ffado_devices ();
  	} else if (driver == "OSS") {
-@@ -714,6 +718,7 @@
+@@ -764,6 +768,7 @@
  	return devs;
  }
  #else
@@ -149,7 +155,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  vector<string>
  EngineControl::enumerate_alsa_devices ()
  {
-@@ -774,6 +779,7 @@
+@@ -824,6 +829,7 @@
  
  	return devs;
  }
@@ -157,7 +163,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  
  vector<string>
  EngineControl::enumerate_ffado_devices ()
-@@ -816,7 +822,9 @@
+@@ -866,7 +872,9 @@
  	vector<string>& strings = devices[driver];
  
  	if (strings.empty() && driver != "FFADO" && driver != "Dummy") {
@@ -167,7 +173,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636921
  		return;
  	}
  	
-@@ -862,7 +870,7 @@
+@@ -912,7 +920,7 @@
  EngineControl::redisplay_latency ()
  {
  	uint32_t rate = get_rate();

-- 
ardour Debian packaging

More information about the pkg-multimedia-commits mailing list