From 90d33ab0801a91ad32fc785660ff0a461eaf9227 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Thu, 18 Jan 2007 20:50:37 +0000
Subject: - Update to 2.0beta11.1 - Fix build problems with amd64

PR:             108061
Submitted by:   trasz
---
 audio/ardour/files/patch-SConstruct | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'audio/ardour/files')

diff --git a/audio/ardour/files/patch-SConstruct b/audio/ardour/files/patch-SConstruct
index 2f1bd84efc2c..0d6e40912e10 100644
--- a/audio/ardour/files/patch-SConstruct
+++ b/audio/ardour/files/patch-SConstruct
@@ -1,5 +1,5 @@
---- SConstruct.orig	Wed Jan  3 20:17:56 2007
-+++ SConstruct	Thu Jan  4 22:26:17 2007
+--- SConstruct.orig	Wed Jan 17 22:13:21 2007
++++ SConstruct	Wed Jan 17 22:55:30 2007
 @@ -38,7 +38,7 @@
      BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
      BoolOption('LIBLO', 'Compile with support for liblo library', 1),
@@ -9,7 +9,7 @@
      BoolOption('SURFACES', 'Build support for control surfaces', 1),
      BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
      BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0),
-@@ -655,12 +655,7 @@
+@@ -655,13 +655,7 @@
  # prepend boiler plate optimization flags
  #
  
@@ -17,13 +17,14 @@
 -    "-O3",
 -    "-fomit-frame-pointer",
 -    "-ffast-math",
--    "-fstrength-reduce"
+-    "-fstrength-reduce",
+-    "-fno-strict-aliasing"
 -    ]
 +opt_flags[:0] = [ "%%CFLAGS%%" ];
  
  if env['DEBUG'] == 1:
      env.Append(CCFLAGS=" ".join (debug_flags))
-@@ -741,9 +736,9 @@
+@@ -742,9 +736,9 @@
      prep_libcheck(env, libraries['lo'])
  
      conf = Configure (libraries['lo'])
@@ -36,7 +37,7 @@
      
      libraries['lo'] = conf.Finish ()
  
-@@ -783,8 +778,10 @@
+@@ -784,8 +778,10 @@
      subst_dict['%MIDITAG%'] = "ardour"
      subst_dict['%MIDITYPE%'] = "coremidi"
  else:
@@ -49,7 +50,7 @@
  
  env = conf.Finish()
  
-@@ -1003,33 +1000,33 @@
+@@ -1006,33 +1002,33 @@
  # i18n support
  #
  
@@ -110,7 +111,7 @@
  
  if env['NLS'] == 1:
      env.Append(CCFLAGS="-DENABLE_NLS")
-@@ -1046,8 +1043,8 @@
+@@ -1049,8 +1045,8 @@
      subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in"
      subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out"
  else:
-- 
cgit v1.2.3