[SCM] zam-plugins/master: Refreshed patch.

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

The following commit has been merged in the master branch:
commit 442643460f7d2173aed900bc56ed9c0337952688
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Jul 5 08:34:53 2014 +0200

    Refreshed patch.

diff --git a/debian/patches/01-fix_hardening.patch b/debian/patches/01-fix_hardening.patch
index 65c4ce8..360aaaa 100644
--- a/debian/patches/01-fix_hardening.patch
+++ b/debian/patches/01-fix_hardening.patch
@@ -1,37 +1,24 @@
-Description:  Pass LDFLAGS properly.
+Description:  Pass CPPFLAGS.
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
+Forwarded: yes
 
 
-Index: zam-plugins/zamautosat/Makefile
+Index: zam-plugins/Makefile.mk
 ===================================================================
---- zam-plugins.orig/zamautosat/Makefile	2013-11-24 14:17:17.712608000 +0100
-+++ zam-plugins/zamautosat/Makefile	2013-11-27 19:07:56.205592998 +0100
-@@ -1,9 +1,10 @@
- PREFIX ?= /usr/local
-+LDFLAGS ?= -Wl,--as-needed -lm
+--- zam-plugins.orig/Makefile.mk
++++ zam-plugins/Makefile.mk
+@@ -56,12 +56,12 @@ CXXFLAGS   += -fvisibility-inlines-hidde
+ endif
  
- all: zamautosat.so
+ BUILD_C_FLAGS   = $(BASE_FLAGS) -std=c99 -std=gnu99 $(CFLAGS)
+-BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=c++0x -std=gnu++0x $(CXXFLAGS)
++BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=c++0x -std=gnu++0x $(CXXFLAGS) $(CPPFLAGS)
+ LINK_FLAGS      = $(LINK_OPTS) -Wl,--no-undefined $(LDFLAGS)
  
- zamautosat.so:
--	g++ -O3 -ffast-math -fPIC -shared -Dmydsp=zamautosat -I/usr/lib zamautosat.dsp.cpp -o zamautosat.so
-+	g++ -O3 -ffast-math -fPIC -shared -Dmydsp=zamautosat -I/usr/lib $(LDFLAGS) zamautosat.dsp.cpp -o zamautosat.so
+ ifeq ($(MACOS),true)
+ # No C++11 support
+-BUILD_CXX_FLAGS = $(BASE_FLAGS) $(CXXFLAGS)
++BUILD_CXX_FLAGS = $(BASE_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
+ LINK_FLAGS      = $(LINK_OPTS) $(LDFLAGS)
+ endif
  
- install:
- 	install -d $(DESTDIR)$(PREFIX)/lib/ladspa
-Index: zam-plugins/zamvalve-tanh/Makefile
-===================================================================
---- zam-plugins.orig/zamvalve-tanh/Makefile	2013-11-24 14:17:37.864723000 +0100
-+++ zam-plugins/zamvalve-tanh/Makefile	2013-11-27 19:08:30.373800520 +0100
-@@ -1,9 +1,10 @@
- PREFIX ?= /usr/local
-+LDFLAGS ?= -Wl,--as-needed -lm
- 
- all: zamvalve-tanh.so
- 
- zamvalve-tanh.so: zamvalve-tanh.dsp.cpp
--	g++ -O3 -ffast-math -fPIC -shared -Dmydsp=zamvalve_tanh -I/usr/lib zamvalve-tanh.dsp.cpp -o zamvalve-tanh.so
-+	g++ -O3 -ffast-math -fPIC -shared -Dmydsp=zamvalve_tanh -I/usr/lib $(LDFLAGS) zamvalve-tanh.dsp.cpp -o zamvalve-tanh.so
- 
- install:
- 	install -d $(DESTDIR)$(PREFIX)/lib/ladspa
diff --git a/debian/patches/series b/debian/patches/series
index 353e37a..7f5e56f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#01-fix_hardening.patch
+01-fix_hardening.patch

-- 
zam-plugins packaging