[SCM] bristol/master: Extend 02-disable_sse.patch to disable -march=core2 -msse -msse -mfpmath=sse when compiling libbristol.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8ef2db85e5996372097e9c76c75adfc013dc999b
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jul 18 17:57:18 2012 +0200

    Extend 02-disable_sse.patch to disable -march=core2 -msse -msse
    -mfpmath=sse when compiling libbristol.

diff --git a/debian/patches/02-disable_sse.patch b/debian/patches/02-disable_sse.patch
index 19bb9b4..0fe7e61 100644
--- a/debian/patches/02-disable_sse.patch
+++ b/debian/patches/02-disable_sse.patch
@@ -2,8 +2,9 @@ Description: Disable -msse -mfpmath=sse to avoid FTBFS on many architectures.
 Author: Alessio Treglia <alessio at debian.org>
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674229
 ---
- bristol/Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ bristol/Makefile.am    |    2 +-
+ libbristol/Makefile.am |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 --- bristol.orig/bristol/Makefile.am
 +++ bristol/bristol/Makefile.am
@@ -15,3 +16,14 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674229
  
  bin_PROGRAMS = bristol
  #bristol_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol/.libs -L../libbristolic/.libs
+--- bristol.orig/libbristol/Makefile.am
++++ bristol/libbristol/Makefile.am
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+ AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_PA@
+-libbristol_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -march=core2 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3
++libbristol_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -ffast-math -fomit-frame-pointer -O2
+ #libbristol_la_LIBADD=$(top_builddir)/libbristol/libbristol.la
+ 
+ lib_LTLIBRARIES = libbristol.la

-- 
bristol packaging