[SCM] qm-dsp/master: Improve patch.

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

The following commit has been merged in the master branch:
commit e7996f328edecb73bf1f31d32b3822b78f557e39
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Dec 7 01:21:57 2016 +0100

    Improve patch.

diff --git a/debian/patches/01-Makefile.patch b/debian/patches/01-Makefile.patch
index 8983b87..f533896 100644
--- a/debian/patches/01-Makefile.patch
+++ b/debian/patches/01-Makefile.patch
@@ -2,23 +2,18 @@ Description: Provide own Makefile to build shared libs.
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: no
 
-Index: qm-dsp-1.7.1/Makefile
+Index: qm-dsp/Makefile
 ===================================================================
 --- /dev/null
-+++ qm-dsp-1.7.1/Makefile
-@@ -0,0 +1,40 @@
-+
++++ qm-dsp/Makefile
+@@ -0,0 +1,29 @@
 +include build/general/Makefile.inc
 +
 +PREFIX ?= /usr
-+SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
-+LIBDIR ?= lib$(SUFFIX)
-+
++LIBDIR ?=
 +
 +MAJVERS = 0
 +MINVERS = 0.0
-+VERSION = $(MAJVERS).$(MINVERS)
-+
 +
 +CFLAGS += -DNDEBUG -O3 -fPIC -ffast-math -ftree-vectorize -DUSE_PTHREADS -Ibuild/linux/amd64
 +CXXFLAGS += -fPIC -Wall
@@ -26,24 +21,18 @@ Index: qm-dsp-1.7.1/Makefile
 +LDLFAGS +=
 +LDLIBS +=
 +
-+
 +QM-DSP_SO = libqm-dsp.so
 +QM-DSP_MAJ = $(QM-DSP_SO).$(MAJVERS)
 +QM-DSP_MIN = $(QM-DSP_MAJ).$(MINVERS)
-+QM-DSP_DEP =
++QM-DSP_DEP = libqm-dsp.a
 +QM-DSP_H = base/*.h
 +
-+
-+$(QM-DSP_MAJ):	$(QM-DSP_MAJ)
-+	gcc -shared $(LDFLAGS) -o $(QM-DSP_MAJ) -Wl,-soname,$(QM-DSP_MAJ) -Wl,--whole-archive libqm-dsp.a -Wl,--no-whole-archive
++$(QM-DSP_MAJ):	$(QM-DSP_DEP)
++	gcc -shared $(LDFLAGS) -o $(QM-DSP_MAJ) -Wl,-soname,$(QM-DSP_MAJ) -Wl,--whole-archive $(QM-DSP_DEP) -Wl,--no-whole-archive
 +
 +install:	$(QM-DSP_MAJ)
 +	install -d $(DESTDIR)$(PREFIX)/include/base
 +	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
 +	install -m 644 $(QM-DSP_H) $(DESTDIR)$(PREFIX)/include/base
 +	install -m 755 $(QM-DSP_MAJ) $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+	/sbin/ldconfig -n $(DESTDIR)$(PREFIX)/$(LIBDIR)
 +	ln -sf $(QM-DSP_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(QM-DSP_SO)
-+
-+clean:
-+	/bin/rm -f *~ *.o *.a *.d *.so.*

-- 
qm-dsp packaging