[SCM] zita-convolver/master: Refreshed patch

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 32ca4b6bafb13c115fb3a513fcb4cc7a3385e395
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Oct 20 00:22:50 2011 +0200

    Refreshed patch

diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index 4d63120..930ea33 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -6,9 +6,11 @@ Forwarded: no
  libs/Makefile |   20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
 
---- zita-convolver.orig/libs/Makefile
-+++ zita-convolver/libs/Makefile
-@@ -17,9 +17,9 @@
+Index: zita-convolver/libs/Makefile
+===================================================================
+--- zita-convolver.orig/libs/Makefile	2011-10-19 23:28:52.875896970 +0200
++++ zita-convolver/libs/Makefile	2011-10-20 00:21:00.699815285 +0200
+@@ -20,9 +20,9 @@
  
  # Modify as required.
  #
@@ -19,34 +21,25 @@ Forwarded: no
 +LIBDIR = lib
  
  
- MAJVERS = 2
-@@ -29,8 +29,8 @@ DISTDIR = zita-convolver-$(VERSION)
- 
+ MAJVERS = 3
+@@ -32,8 +32,8 @@
  
  CPPFLAGS += -Wall -I. -fPIC -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O3
--CPPFLAGS += -mmmx -msse -mfpmath=sse -ffast-math -funroll-loops -fpermissive
--CPPFLAGS += -march=i686
-+CPPFLAGS += -ffast-math -funroll-loops
-+#CPPFLAGS += -march=i686
- #CPPFLAGS += -DVECTORIZE 
+ CPPFLAGS += -ffast-math -funroll-loops 
+-CPPFLAGS += -march=native
+-CPPFLAGS += -DENABLE_VECTOR_MODE 
++#CPPFLAGS += -march=native
++#CPPFLAGS += -DENABLE_VECTOR_MODE 
  
  LDLFAGS += 
-@@ -50,12 +50,12 @@ $(ZITA-CONVOLVER_MIN):	$(ZITA-CONVOLVER_
- 
- 
- install:	$(ZITA-CONVOLVER_MIN)
--	install -d $(PREFIX)/include
--	install -d $(PREFIX)/$(LIBDIR)
--	install -m 644 $(ZITA-CONVOLVER_H) $(PREFIX)/include
--	install -m 755 $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)
+ LDLIBS +=
+@@ -56,7 +56,8 @@
+ 	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ 	install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(PREFIX)/include
+ 	install -m 755 $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
 -	ldconfig
--	ln -sf $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
-+	install -d $(DESTDIR)$(PREFIX)/include
-+	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+	install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(PREFIX)/include
-+	install -m 755 $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
 +	/sbin/ldconfig -n $(DESTDIR)$(PREFIX)/$(LIBDIR)
 +	ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
  
- 
  clean:
+ 	/bin/rm -f *~ *.o *.a *.d *.so.*

-- 
zita-convolver packaging