[SCM] bristol/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1f7499265210b8a46c452416b5e7fb744fa7a989
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jan 31 01:18:26 2013 +0000

    Refresh patches.

diff --git a/debian/patches/02-disable_sse.patch b/debian/patches/02-disable_sse.patch
index 0fe7e61..945f5e9 100644
--- a/debian/patches/02-disable_sse.patch
+++ b/debian/patches/02-disable_sse.patch
@@ -2,9 +2,8 @@ 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 +-
- libbristol/Makefile.am |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ bristol/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 --- bristol.orig/bristol/Makefile.am
 +++ bristol/bristol/Makefile.am
@@ -15,15 +14,4 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674229
 +AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -I. -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@ @BRISTOL_JACK_DEFAULT_MIDI@ @BRISTOL_JACK_DEFAULT@ @BRISTOL_JACK_MULTI_CLOSE@ @BRISTOL_SEMAPHORE@ @BRISTOL_SEM_OPEN@ @BRISTOL_BARRIER@ @BRISTOL_HAS_PA@ -DBRISTOL_RAMP_RATE=@BRR@ @BRISTOL_LIN_ATTACK@ @BRISTOL_HAS_DRAIN@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @BRISTOL_HAS_JACK_SESSION@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@ -ffast-math -fomit-frame-pointer -O2
  
  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_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol -L../libbristolic

-- 
bristol packaging