[SCM] rev-plugins/master: Refreshed patches.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Wed Aug 28 21:52:41 UTC 2013


The following commit has been merged in the master branch:
commit 42f17b408bfaf5c09015443abc35b833bca29678
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Aug 28 23:54:23 2013 +0200

    Refreshed patches.

diff --git a/debian/patches/01-destdir.patch b/debian/patches/01-destdir.patch
index 14cc7cc..095a42d 100644
--- a/debian/patches/01-destdir.patch
+++ b/debian/patches/01-destdir.patch
@@ -5,19 +5,22 @@ Forwarded: no
 
 Index: rev-plugins/Makefile
 ===================================================================
---- rev-plugins.orig/Makefile	2012-04-15 16:01:27.015236235 +0200
-+++ rev-plugins/Makefile	2012-04-15 19:12:07.218937461 +0200
-@@ -1,3 +1,4 @@
-+DESTDIR =
+--- rev-plugins.orig/Makefile	2013-08-28 23:47:49.698792542 +0200
++++ rev-plugins/Makefile	2013-08-28 23:49:52.766797546 +0200
+@@ -18,6 +18,7 @@
+ #
+ # -----------------------------------------------------------------------
  
- CPPFLAGS += -I. -fPIC -D_REENTRANT -Wall -O2
++DESTDIR =
  
-@@ -13,7 +14,7 @@
+ CPPFLAGS += -I. -fPIC -D_REENTRANT
+ CXXFLAGS += -Wall -O2
+@@ -33,7 +34,7 @@
  
  
- install:
+ install:	zita-reverbs.so
 -	cp  *.so /usr/lib/ladspa
 +	cp  *.so $(DESTDIR)/usr/lib/ladspa
  
- 
- DIR := $(shell basename `pwd`)
+ clean:
+ 	rm -rf *~ *.o *.so
diff --git a/debian/patches/02-fix_hardening.patch b/debian/patches/02-fix_hardening.patch
index 1fbfd51..3ab9c90 100644
--- a/debian/patches/02-fix_hardening.patch
+++ b/debian/patches/02-fix_hardening.patch
@@ -4,21 +4,20 @@ Forwarded: no
 
 Index: rev-plugins/Makefile
 ===================================================================
---- rev-plugins.orig/Makefile	2013-06-16 14:14:20.638312589 +0200
-+++ rev-plugins/Makefile	2013-06-16 14:16:14.162875523 +0200
-@@ -1,13 +1,14 @@
- DESTDIR =
+--- rev-plugins.orig/Makefile	2013-08-28 23:51:02.874800396 +0200
++++ rev-plugins/Makefile	2013-08-28 23:52:09.938803123 +0200
+@@ -22,12 +22,13 @@
  
- CPPFLAGS += -I. -fPIC -D_REENTRANT -Wall -O2
+ CPPFLAGS += -I. -fPIC -D_REENTRANT
+ CXXFLAGS += -Wall -O2
 +LDFLAGS	+=
  
+ all:	zita-reverbs.so
  
- all:	g2reverb.so
+ REVERBS_O = reverbs.o reverbs_if.o greverb.o zreverb.o pareq.o exp2ap.o
+ zita-reverbs.so:	$(REVERBS_O)	
+-	g++ -shared  -o $@  $(REVERBS_O)
++	g++ -shared  -o $@  $(REVERBS_O) $(LDFLAGS)
  
- 
- g2reverb.so:	greverb.o g2reverb.o g2reverb_if.o exp2ap.o
--	g++ -shared greverb.o g2reverb.o g2reverb_if.o exp2ap.o -o g2reverb.so
-+	g++ -shared greverb.o g2reverb.o g2reverb_if.o exp2ap.o -o g2reverb.so $(LDFLAGS)
- 
- g2reverb.o:	ladspaplugin.h g2reverb.h greverb.o
- g2reverb_if.o:	ladspaplugin.h g2reverb.h
+ reverbs.o:	ladspaplugin.h reverbs.h greverb.o zreverb.h
+ reverbs_if.o:	ladspaplugin.h reverbs.h

-- 
rev-plugins packaging



More information about the pkg-multimedia-commits mailing list