[SCM] zita-convolver packaging branch, master, updated. debian/1.0.0-2-14-g2f3799f

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Wed Dec 2 02:40:27 UTC 2009


The following commit has been merged in the master branch:
commit 7a300aae2fdf8808638abbcf20408d3d3256a634
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Dec 2 03:37:56 2009 +0100

    Repaired patch file

diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index d2c2424..123e189 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -1,36 +1,45 @@
-diff --git a/libs/Makefile b/libs/Makefile
-index 574270b..4a87cfa 100644
---- a/libs/Makefile
-+++ b/libs/Makefile
-@@ -17,9 +17,12 @@
+Patch is applied because autotools are not used by upstream author. Patch setting prefix=/usr and fix install commands.
+
+Index: zita-convolver/libs/Makefile
+===================================================================
+--- zita-convolver.orig/libs/Makefile	2009-12-02 01:23:47.000000000 +0100
++++ zita-convolver/libs/Makefile	2009-12-02 01:26:21.000000000 +0100
+@@ -17,9 +17,10 @@
  
  # Modify as required.
  #
 -PREFIX = /usr/local
-+
 +DESTDIR=
-+
 +PREFIX = /usr
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
 -LIBDIR = lib$(SUFFIX)
 +LIBDIR = lib
  
  
- MAJVERS = 1
-@@ -48,12 +51,12 @@ $(ZITA-CONVOLVER_MIN):	$(ZITA-CONVOLVER_O)
+ MAJVERS = 2
+@@ -30,7 +31,7 @@
+ 
+ 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 += -march=i686
+ #CPPFLAGS += -DVECTORIZE 
+ 
+ LDLFAGS += 
+@@ -50,12 +51,12 @@
  
  
  install:	$(ZITA-CONVOLVER_MIN)
--	/usr/bin/install -d $(PREFIX)/include
--	/usr/bin/install -d $(PREFIX)/$(LIBDIR)
--	/usr/bin/install -m 644 $(ZITA-CONVOLVER_H) $(PREFIX)/include
--	/usr/bin/install -m 755 $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)
--	/sbin/ldconfig -n $(PREFIX)/$(LIBDIR)
+-	install -d $(PREFIX)/include
+-	install -d $(PREFIX)/$(LIBDIR)
+-	install -m 644 $(ZITA-CONVOLVER_H) $(PREFIX)/include
+-	install -m 755 $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)
+-	ldconfig
 -	ln -sf $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
-+	/usr/bin/install -d $(DESTDIR)$(PREFIX)/include
-+	/usr/bin/install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+	/usr/bin/install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(PREFIX)/include
-+	/usr/bin/install -m 755 $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	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)
  

-- 
zita-convolver packaging



More information about the pkg-multimedia-commits mailing list