[SCM] drc/master: Refresh 01-makefile.patch, partially applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Oct 12 08:47:52 UTC 2012


The following commit has been merged in the master branch:
commit e01e12dea5a4b33888fbffde4c3a874b165cdd0b
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 12 09:39:01 2012 +0100

    Refresh 01-makefile.patch, partially applied upstream.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 59f3137..549359f 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -7,60 +7,26 @@ Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: yes
 
 ---
- source/makefile |   17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
+ source/makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: drc/source/makefile
-===================================================================
---- drc.orig/source/makefile	2011-12-17 02:31:11.639387944 +0100
-+++ drc/source/makefile	2011-12-17 02:32:30.023385897 +0100
+--- drc.orig/source/makefile
++++ drc/source/makefile
 @@ -4,7 +4,7 @@
- VERSION=3.1.0
+ VERSION=3.2.1
  
  # Where to install
 -INSTALL_PREFIX=$(DESTDIR)/usr/local
 +INSTALL_PREFIX=$(DESTDIR)/usr
  
  # Compiler
- CC=gcc
-@@ -21,7 +21,7 @@
+ CC=g++
+@@ -21,7 +21,7 @@ CC=g++
  
  # Pentium 3 or greater optimizaztions settings with SSE support
  # Be careful: -mfpmath=sse sometimes causes accuracy problems
--CFLAGS=-march=pentium3 -O -mfancy-math-387 -msse -mfpmath=sse -mtune=pentium3 -I. 
-+CFLAGS=-O -I.
+-CFLAGS=-march=pentium3 -O -s -mfancy-math-387 -msse -mfpmath=sse -mtune=pentium3 -I. 
++CFLAGS=-O2 -g -I.
  
  # Same as above, but tested on recent Mac OS X
  # Be careful: -mfpmath=sse sometimes causes accuracy problems
-@@ -65,7 +65,7 @@
- TARGET_TARGETS=target/*
- MIC_TARGETS=mic/*
- IMPULSE_TARGETS=../sample/rs.pcm
--DOC_TARGETS=readme.txt ../doc/text/drc.txt
-+DOC_TARGETS=readme.txt
- BIN_TARGETS=drc lsconv glsweep
- 
- # Targets
-@@ -85,15 +85,16 @@
- 	rm -f $(OBJS)
- 
- install: $(CONFIG_TARGETS) $(TARGET_TARGETS) $(MIC_TARGETS) $(IMPULSE_TARGETS) $(DOC_TARGETS) $(BIN_TARGETS)
--	install $(BIN_TARGETS) $(INSTALL_PREFIX)/bin
-+	install -d $(INSTALL_PREFIX)/bin/
-+	install $(BIN_TARGETS) $(INSTALL_PREFIX)/bin/
- 	install -d $(INSTALL_PREFIX)/share/drc/config/
--	install $(CONFIG_TARGETS) $(INSTALL_PREFIX)/share/drc/config/
-+	cp -ar -t $(INSTALL_PREFIX)/share/drc/config/ $(CONFIG_TARGETS)
- 	install -d $(INSTALL_PREFIX)/share/drc/target/
--	install $(TARGET_TARGETS) $(INSTALL_PREFIX)/share/drc/target/
-+	cp -ar -t $(INSTALL_PREFIX)/share/drc/target/ $(TARGET_TARGETS)
- 	install -d $(INSTALL_PREFIX)/share/drc/mic/
--	install $(MIC_TARGETS) $(INSTALL_PREFIX)/share/drc/mic/
-+	cp -ar -t $(INSTALL_PREFIX)/share/drc/mic/ $(MIC_TARGETS)
- 	install -d $(INSTALL_PREFIX)/share/drc/impulse/
- 	install $(IMPULSE_TARGETS) $(INSTALL_PREFIX)/share/drc/impulse/
- 	install -d $(INSTALL_PREFIX)/share/drc/filter/
--	install -d $(INSTALL_PREFIX)/share/doc/drc-$(VERSION)/
--	install $(DOC_TARGETS) $(INSTALL_PREFIX)/share/doc/drc-$(VERSION)/
-+	install -d $(INSTALL_PREFIX)/share/doc/drc/
-+	install $(DOC_TARGETS) $(INSTALL_PREFIX)/share/doc/drc/

-- 
drc packaging



More information about the pkg-multimedia-commits mailing list