[SCM] x42-plugins/master: Fix g++ optimalizations in rules file rather than in patch.

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

The following commit has been merged in the master branch:
commit 6f6a8bbf99aaa7319a2a9f8b1ec420b13b4569ce
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun May 31 22:30:25 2015 +0200

    Fix g++ optimalizations in rules file rather than in patch.

diff --git a/debian/patches/01-remove-sse.patch b/debian/patches/01-remove-sse.patch
deleted file mode 100644
index 421fd4c..0000000
--- a/debian/patches/01-remove-sse.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Description:  Remove sse optimalization.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
-
-Index: x42-plugins/balance.lv2/Makefile
-===================================================================
---- x42-plugins.orig/balance.lv2/Makefile
-+++ x42-plugins/balance.lv2/Makefile
-@@ -4,7 +4,7 @@
- #   make CFLAGS=-O2
- #   make install DESTDIR=$(CURDIR)/debian/balance_lv2 PREFIX=/usr
- #
--OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
-+OPTIMIZATIONS ?= -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
- PREFIX ?= /usr/local
- CFLAGS ?= $(OPTIMIZATIONS) -Wall
- LIBDIR ?= lib
-Index: x42-plugins/convoLV2/Makefile
-===================================================================
---- x42-plugins.orig/convoLV2/Makefile
-+++ x42-plugins/convoLV2/Makefile
-@@ -4,7 +4,7 @@
- #   make CXXFLAGS=-O2
- #   make install DESTDIR=$(CURDIR)/debian/convoLV2 PREFIX=/usr
- #
--OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
-+OPTIMIZATIONS ?= -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
- PREFIX ?= /usr/local
- CXXFLAGS ?= $(OPTIMIZATIONS) -Wall
- LIBDIR ?= lib
-Index: x42-plugins/meters.lv2/Makefile
-===================================================================
---- x42-plugins.orig/meters.lv2/Makefile
-+++ x42-plugins/meters.lv2/Makefile
-@@ -4,7 +4,7 @@
- #   make CFLAGS=-O2
- #   make install DESTDIR=$(CURDIR)/debian/meters.lv2 PREFIX=/usr
- #
--OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -fomit-frame-pointer -O3 -fno-finite-math-only
-+OPTIMIZATIONS ?= -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
- PREFIX ?= /usr/local
- CFLAGS ?= -Wall -Wno-unused-function
- LIBDIR ?= lib
-Index: x42-plugins/midifilter.lv2/Makefile
-===================================================================
---- x42-plugins.orig/midifilter.lv2/Makefile
-+++ x42-plugins/midifilter.lv2/Makefile
-@@ -1,6 +1,6 @@
- #!/usr/bin/make -f
- 
--OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
-+OPTIMIZATIONS ?= -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
- PREFIX ?= /usr/local
- CFLAGS ?= $(OPTIMIZATIONS) -Wall
- LIBDIR ?= lib
-Index: x42-plugins/nodelay.lv2/Makefile
-===================================================================
---- x42-plugins.orig/nodelay.lv2/Makefile
-+++ x42-plugins/nodelay.lv2/Makefile
-@@ -4,7 +4,7 @@
- #   make CFLAGS=-O2
- #   make install DESTDIR=$(CURDIR)/debian/nodelay.lv2 PREFIX=/usr
- #
--OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
-+OPTIMIZATIONS ?= -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
- PREFIX ?= /usr/local
- CFLAGS ?= $(OPTIMIZATIONS) -Wall
- LIBDIR ?= lib
-Index: x42-plugins/xfade.lv2/Makefile
-===================================================================
---- x42-plugins.orig/xfade.lv2/Makefile
-+++ x42-plugins/xfade.lv2/Makefile
-@@ -3,7 +3,7 @@
- # these can be overridden using make variables. e.g.
- #   make CFLAGS=-O2
- #
--OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
-+OPTIMIZATIONS ?= -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
- PREFIX ?= /usr/local
- CFLAGS ?= $(OPTIMIZATIONS) -Wall
- LIBDIR ?= lib
-Index: x42-plugins/sisco.lv2/Makefile
-===================================================================
---- x42-plugins.orig/sisco.lv2/Makefile
-+++ x42-plugins/sisco.lv2/Makefile
-@@ -1,6 +1,6 @@
- #!/usr/bin/make -f
- 
--OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
-+OPTIMIZATIONS ?= -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
- PREFIX ?= /usr/local
- CFLAGS ?= -g -Wall -Wno-unused-function
- LIBDIR ?= lib
-Index: x42-plugins/tuna.lv2/Makefile
-===================================================================
---- x42-plugins.orig/tuna.lv2/Makefile
-+++ x42-plugins/tuna.lv2/Makefile
-@@ -1,7 +1,7 @@
- #!/usr/bin/make -f
- 
- #OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
--OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -O3
-+OPTIMIZATIONS ?= -O3
- PREFIX ?= /usr/local
- CFLAGS ?= -g -Wall -Wno-unused-function
- LIBDIR ?= lib
-Index: x42-plugins/mixtri.lv2/Makefile
-===================================================================
---- x42-plugins.orig/mixtri.lv2/Makefile
-+++ x42-plugins/mixtri.lv2/Makefile
-@@ -1,6 +1,6 @@
- #!/usr/bin/make -f
- 
--OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
-+OPTIMIZATIONS ?= -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
- PREFIX ?= /usr/local
- CFLAGS ?= -g -Wall -Wno-unused-function
- LIBDIR ?= lib
-Index: x42-plugins/onsettrigger.lv2/Makefile
-===================================================================
---- x42-plugins.orig/onsettrigger.lv2/Makefile
-+++ x42-plugins/onsettrigger.lv2/Makefile
-@@ -1,6 +1,6 @@
- #!/usr/bin/make -f
- 
--OPTIMIZATIONS ?= -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
-+OPTIMIZATIONS ?= -ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
- PREFIX ?= /usr/local
- CFLAGS ?= -Wall -Wno-unused-function
- LIBDIR ?= lib
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 26dc69a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-remove-sse.patch
diff --git a/debian/rules b/debian/rules
index 8d022c6..c8ed2de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export OPTIMIZATIONS=-ffast-math -fomit-frame-pointer -O3 -fno-finite-math-only
+
 %:
 	dh $@
 

-- 
x42-plugins packaging