[SCM] faust/master: Refreshed patches.

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Wed Sep 21 19:30:02 UTC 2016


The following commit has been merged in the master branch:
commit 3506f317bd8a09e4032fdbc63972039b6778c899
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Sep 21 21:28:43 2016 +0200

    Refreshed patches.

diff --git a/debian/patches/kFreeBSD b/debian/patches/kFreeBSD
index 25373ea..b3b3f88 100644
--- a/debian/patches/kFreeBSD
+++ b/debian/patches/kFreeBSD
@@ -4,23 +4,22 @@ Bug-Debian: http://bugs.debian.org/644590
 
 --- faust.orig/architecture/osclib/oscpack/Makefile
 +++ faust/architecture/osclib/oscpack/Makefile
-@@ -13,12 +13,19 @@
- ARCHFLAGS 	:= 
+@@ -14,11 +14,18 @@
  CXXFLAGS += -fPIC
- 
-+else 
-+ifeq ($(system), GNU/kFreeBSD)
-+subprojects := ip ip/posix osc
-+sources     := $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp)
-+ARCHFLAGS 	:= 
-+
- else
- subprojects := ip ip/win32 osc
- sources     := $(wildcard ip/*.cpp)  $(wildcard ip/win32/*.cpp)  $(wildcard osc/*.cpp)
- ARCHFLAGS 	:= 
- endif
- endif
-+endif
- 
- VPATH = $(subprojects)
- 
+ 
+ else
++ifeq ($(system), GNU/kFreeBSD)
++subprojects := ip ip/posix osc
++sources     := $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp)
++ARCHFLAGS      :=
++
++else
+ subprojects := ip ip/win32 osc
+ sources     := $(wildcard ip/*.cpp)  $(wildcard ip/win32/*.cpp)  $(wildcard osc/*.cpp)
+ ARCHFLAGS 	:=
+ endif
+ endif
++endif
+ 
+ VPATH = $(subprojects)
+ 
diff --git a/debian/patches/ldflags b/debian/patches/ldflags
deleted file mode 100644
index a39d917..0000000
--- a/debian/patches/ldflags
+++ /dev/null
@@ -1,117 +0,0 @@
-Description: make build-system respect LDFLAGS
- so we can pass hardening flags
-Author: Debian
-Forwarded: no
-Last-Update: 2016-05-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- faust.orig/architecture/httpdlib/src/Makefile
-+++ faust/architecture/httpdlib/src/Makefile
-@@ -62,7 +62,7 @@
- 	$(CXX) -dynamiclib $(INSTALL_NAME) $(ARCHFLAGS) $(objects) `pkg-config --libs libmicrohttpd` -o $@
- 
- ../libHTTPDFaust.so  :  $(objects)
--	$(CXX) -shared -fPIC -o $@ $(objects) `pkg-config --libs libmicrohttpd`
-+	$(CXX) -shared -fPIC -o $@ $(objects) `pkg-config --libs libmicrohttpd` $(LDFLAGS)
- 
- ../libHTTPDFaust.dll  :  $(objects)
- 	$(CXX) -shared -o $@ $(objects) `pkg-config --libs libmicrohttpd` -lwsock32
---- faust.orig/architecture/osclib/faust/Makefile
-+++ faust/architecture/osclib/faust/Makefile
-@@ -69,7 +69,7 @@
- 	$(CXX) -dynamiclib $(INSTALL_NAME) -compatibility_version $(SOVERSION) -current_version $(VERSION) $(ARCHFLAGS) $(objects) -L.. -loscpack -o libOSCFaust.$(VERSION).dylib
- 
- libOSCFaust.so.$(VERSION) : $(objects)
--	$(CXX) -shared -Wl,-soname,$(SONAME) -fPIC $(ARCHFLAGS) $(objects) -L.. -loscpack -o libOSCFaust.so.$(VERSION)
-+	$(CXX) -shared -Wl,-soname,$(SONAME) -fPIC $(ARCHFLAGS) $(objects) -L.. -loscpack -o libOSCFaust.so.$(VERSION) $(LDFLAGS)
- 
- libOSCFaust-$(VERSION).dll : $(objects)
- 	$(CXX) -shared $(ARCHFLAGS) $(objects) -L.. -loscpack -lwsock32 -lws2_32 -lwinmm -o libOSCFaust-$(VERSION).dll
---- faust.orig/benchmark/Makefile.compile
-+++ faust/benchmark/Makefile.compile
-@@ -8,7 +8,7 @@
- 
- $(DEST)%$(EXT) : %.dsp 
- 	faust $(VEC) -a $(ARCH) $< -o $@.cpp
--	$(CXX) -O3 $(CXXFLAGS) $@.cpp $(LIB) -o $@
-+	$(CXX) -O3 $(CXXFLAGS) $@.cpp $(LIB) -o $@ $(LDFLAGS)
- 	
- 
- clean :
---- faust.orig/examples/Makefile.compile
-+++ faust/examples/Makefile.compile
-@@ -8,7 +8,7 @@
- 
- $(DEST)%$(EXT) : %.dsp 
- 	faust $(VEC) -a $(ARCH) $< -o $@.cpp
--	$(CXX) $@.cpp $(CXXFLAGS) $(LIB) -o $@
-+	$(CXX) $@.cpp $(CXXFLAGS) $(LIB) -o $@ $(LDFLAGS)
- 	
- 
- clean :
---- faust.orig/examples/faust-tubes/Makefile.compile
-+++ faust/examples/faust-tubes/Makefile.compile
-@@ -8,7 +8,7 @@
- 
- $(DEST)%$(EXT) : %.dsp 
- 	faust $(VEC) -a $(ARCH) $< -o $@.cpp
--	$(CXX) $@.cpp $(CXXFLAGS) $(LIB) -o $@
-+	$(CXX) $@.cpp $(CXXFLAGS) $(LIB) -o $@ $(LDFLAGS)
- 	
- 
- clean :
---- faust.orig/tools/faust2pd/examples/basic/Makefile
-+++ faust/tools/faust2pd/examples/basic/Makefile
-@@ -46,7 +46,7 @@
- xml: $(xml)
- 
- %~$(DLL): %.cpp
--	$(CXX) $(shared) $(EXTRA_CFLAGS) $(CFLAGS) -Dmydsp=$(@:%~$(DLL)=%) $< -o $@ $(PDLIB)
-+	$(CXX) $(shared) $(EXTRA_CFLAGS) $(CFLAGS) -Dmydsp=$(@:%~$(DLL)=%) $< -o $@ $(PDLIB) $(LDFLAGS)
- 
- %.cpp: %.dsp
- 	faust $(VEC) -a $(ARCH) $< -o $@
---- faust.orig/tools/faust2pd/examples/faust/Makefile
-+++ faust/tools/faust2pd/examples/faust/Makefile
-@@ -46,7 +46,7 @@
- xml: $(xml)
- 
- %~$(DLL): %.cpp
--	$(CXX) $(shared) $(EXTRA_CFLAGS) $(CFLAGS) -Dmydsp=$(@:%~$(DLL)=%) $< -o $@ $(PDLIB)
-+	$(CXX) $(shared) $(EXTRA_CFLAGS) $(CFLAGS) -Dmydsp=$(@:%~$(DLL)=%) $< -o $@ $(PDLIB) $(LDFLAGS)
- 
- %.cpp: %.dsp
- 	faust $(VEC) -a $(ARCH) $< -o $@
---- faust.orig/tools/faust2pd/examples/seqdemo/Makefile
-+++ faust/tools/faust2pd/examples/seqdemo/Makefile
-@@ -48,7 +48,7 @@
- xml: $(xml)
- 
- %~$(DLL): %.cpp
--	$(CXX) $(shared) $(EXTRA_CFLAGS) $(CFLAGS) -Dmydsp=$(@:%~$(DLL)=%) $< -o $@ $(PDLIB)
-+	$(CXX) $(shared) $(EXTRA_CFLAGS) $(CFLAGS) -Dmydsp=$(@:%~$(DLL)=%) $< -o $@ $(PDLIB) $(LDFLAGS)
- 
- %.cpp: %.dsp
- 	faust $(VEC) -a $(ARCH) $< -o $@
---- faust.orig/tools/faust2pd/examples/synth/Makefile
-+++ faust/tools/faust2pd/examples/synth/Makefile
-@@ -82,7 +82,7 @@
- 	faust -xml $< -o /dev/null
- 
- %~$(DLL): %.cpp
--	$(CXX) $(shared) $(EXTRA_CFLAGS) $(CFLAGS) -Dmydsp=$(@:%~$(DLL)=%) $< -o $@ $(PDLIB)
-+	$(CXX) $(shared) $(EXTRA_CFLAGS) $(CFLAGS) -Dmydsp=$(@:%~$(DLL)=%) $< -o $@ $(PDLIB) $(LDFLAGS)
- 
- %.pd: %.dsp.xml
- 	$(faust2pd) -s $<
---- faust.orig/compiler/Makefile.unix
-+++ faust/compiler/Makefile.unix
-@@ -28,7 +28,7 @@
- all : faust
- 
- faust : $(objects)
--	$(CXX) $(CXXFLAGS) $(objects) -o faust $(LIBS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(objects) -o faust $(LIBS)
- 
- 
- .PHONY: clean depend ctags parser
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
index 0674183..d5e93ce 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -23,32 +23,32 @@ Description: Sort list of source files for deterministic linking order
 --- faust.orig/architecture/osclib/oscpack/Makefile
 +++ faust/architecture/osclib/oscpack/Makefile
 @@ -3,25 +3,25 @@
- 
- ifeq ($(system), Darwin)
- subprojects := ip ip/posix osc
--sources     := $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp)
-+sources     := $(sort $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp))
- #ARCHFLAGS 	:=  -arch i386 -arch x86_64
- 
- else 
- ifeq ($(system), Linux)
- subprojects := ip ip/posix osc
--sources     := $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp)
-+sources     := $(sort $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp))
- ARCHFLAGS 	:= 
+ 
+ ifeq ($(system), Darwin)
+ subprojects := ip ip/posix osc
+-sources     := $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp)
++sources     := $(sort $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp))
+ ARCHFLAGS 	:=  -mmacosx-version-min=10.9
+ 
+ else
+ ifeq ($(system), Linux)
+ subprojects := ip ip/posix osc
+-sources     := $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp)
++sources     := $(sort $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp))
+ ARCHFLAGS 	:=
  CXXFLAGS += -fPIC
- 
- else 
- ifeq ($(system), GNU/kFreeBSD)
- subprojects := ip ip/posix osc
--sources     := $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp)
-+sources     := $(sort $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp))
- ARCHFLAGS 	:= 
- 
- else
- subprojects := ip ip/win32 osc
--sources     := $(wildcard ip/*.cpp)  $(wildcard ip/win32/*.cpp)  $(wildcard osc/*.cpp)
-+sources     := $(sort $(wildcard ip/*.cpp)  $(wildcard ip/win32/*.cpp)  $(wildcard osc/*.cpp))
- ARCHFLAGS 	:= 
- endif
- endif
+ 
+ else
+ ifeq ($(system), GNU/kFreeBSD)
+ subprojects := ip ip/posix osc
+-sources     := $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp)
++sources     := $(sort $(wildcard ip/*.cpp)  $(wildcard ip/posix/*.cpp)  $(wildcard osc/*.cpp))
+ ARCHFLAGS      :=
+ 
+ else
+ subprojects := ip ip/win32 osc
+-sources     := $(wildcard ip/*.cpp)  $(wildcard ip/win32/*.cpp)  $(wildcard osc/*.cpp)
++sources     := $(sort $(wildcard ip/*.cpp)  $(wildcard ip/win32/*.cpp)  $(wildcard osc/*.cpp))
+ ARCHFLAGS 	:=
+ endif
+ endif
diff --git a/debian/patches/series b/debian/patches/series
index 4b15094..ba62faa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-strip-usrlocal
 kFreeBSD
-ldflags
 spelling
 reproducible-build.patch
diff --git a/debian/patches/spelling b/debian/patches/spelling
index 803b8da..63ce348 100644
--- a/debian/patches/spelling
+++ b/debian/patches/spelling
@@ -4,34 +4,23 @@ Forwarded: no
 Last-Update: 2016-05-18
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- faust.orig/architecture/faust/audio/alsa-dsp.h
-+++ faust/architecture/faust/audio/alsa-dsp.h
-@@ -416,7 +416,7 @@
+--- faust.orig/benchmark/alsa-gtk-bench.cpp
++++ faust/benchmark/alsa-gtk-bench.cpp
+@@ -575,7 +575,7 @@
  			}
- 
+ 			
  		} else {
 -			check_error_msg(-10000, "unknow access mode");
 +			check_error_msg(-10000, "unknown access mode");
  		}
-     }
  
-@@ -501,7 +501,7 @@
- 			}
  
+@@ -663,7 +663,7 @@
+ 			}
+ 			
  		} else {
 -			check_error_msg(-10000, "unknow access mode");
 +			check_error_msg(-10000, "unknown access mode");
  		}
  	}
  
---- faust.orig/compiler/draw/drawschema.cpp
-+++ faust/compiler/draw/drawschema.cpp
-@@ -530,7 +530,7 @@
-              << boxpp(step)<< ')';
-     }
-     else {
--        cerr << "INTERNAL ERROR : unknow user interface element " << endl;
-+        cerr << "INTERNAL ERROR : unknown user interface element " << endl;
-         exit(0);
-     }
-     d = fout.str();
diff --git a/debian/patches/strip-usrlocal b/debian/patches/strip-usrlocal
deleted file mode 100644
index 304a02c..0000000
--- a/debian/patches/strip-usrlocal
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Make sure the examples Makefile does not reference /usr/local
-Author: Mario Lang <mlang at debian.org>
-Bug-Debian: http://bugs.debian.org/660587
-Forwarded: not-needed
-Last-Update: 2012-03-24
-
---- faust.orig/examples/Makefile.qtcompile
-+++ faust/examples/Makefile.qtcompile
-@@ -31,7 +31,7 @@
- $(DEST)%.app : %.dsp
- 	install -d $(TMP)
- 	faust -i -a $(ARCH) $(VEC) $< -o $(TMP)/$<.cpp
--	cd $(TMP); qmake -project "QT+=widgets printsupport network"  "$(DEFS)" "CONFIG+=warn_off" "CONFIG+=c++11" "INCLUDEPATH+=/usr/local/include/" "HEADERS+=/usr/local/include/faust/gui/faustqt.h" "LIBS+=$(LIB)" "QMAKE_CXXFLAGS= -O3 -mfpmath=sse -msse -msse2 -msse3 -ffast-math -ftree-vectorize -Wno-unused-parameter"
-+	cd $(TMP); qmake -project "QT+=widgets printsupport network"  "$(DEFS)" "CONFIG+=warn_off" "CONFIG+=c++11" "INCLUDEPATH+=/usr/include/" "HEADERS+=/usr/include/faust/gui/faustqt.h" "LIBS+=$(LIB)" "QMAKE_CXXFLAGS= -O3 -mfpmath=sse -msse -msse2 -msse3 -ffast-math -ftree-vectorize -Wno-unused-parameter"
- 	cd $(TMP); qmake $(SPEC)
- 	make -C $(TMP)
- 	rm -rf $@
-@@ -40,9 +40,9 @@
- 
- 
- ### Linux
--hdir1 := $(wildcard /usr/local/include/faust/gui/faustqt.h)
-+hdir1 := $(wildcard /usr/include/faust/gui/faustqt.h)
- hdir2 := $(wildcard /usr/share/faust/faustqt.h)
--hdir3 := $(wildcard /usr/local/include/faust/faustqt.h)
-+hdir3 := $(wildcard /usr/include/faust/faustqt.h)
- hdir23 := $(if $(hdir2),$(dir $(hdir2)),$(dir $(hdir3)))
- hdir := $(if $(hdir1),$(dir $(hdir1)),$(hdir23))
- qm4 := $(shell which qmake-qt4)
-@@ -52,7 +52,7 @@
- 	rm -rf $(TMP)
- 	install -d $(TMP)
- 	faust -a $(ARCH) $(VEC) $< -o $(TMP)/$<.cpp
--	cd $(TMP); $(qm) -project "QT += widgets printsupport" "$(DEFS)" "INCLUDEPATH+=/usr/local/include/faust/" "INCLUDEPATH+=/usr/local/include/faust/osclib" "LIBS+=$(LIB)" "HEADERS+=$(hdir)faustqt.h" 
-+	cd $(TMP); $(qm) -project "QT += widgets printsupport" "$(DEFS)" "INCLUDEPATH+=/usr/include/faust/" "INCLUDEPATH+=/usr/include/faust/osclib" "LIBS+=$(LIB)" "HEADERS+=$(hdir)faustqt.h" 
- 	cd $(TMP); $(qm) $(SPEC)
- 	make -C $(TMP)
- 	mv $(TMP)/$(<:.dsp=) $@
---- faust.orig/examples/Makefile
-+++ faust/examples/Makefile
-@@ -1,10 +1,5 @@
- # Directory containing Faust .lib and .cpp architecture files:
--ck1 := /opt/local/lib/faust/music.lib
--ck2 := /usr/local/lib/faust/music.lib
--ck3 := $(FAUST_LIB_PATH)/faust/music.lib
--LIB := $(if $(wildcard $(ck1)),/opt/local/lib,"")
--LIB := $(if $(wildcard $(ck2)),/usr/local/lib,$(LIB))
--LIB := $(if $(wildcard $(ck3)),$(FAUST_LIB_PATH),$(LIB))
-+LIB := /usr/lib
- 
- # Directory containing Faust include files:
- ck11 := /opt/local/include/faust/misc.h

-- 
faust packaging



More information about the pkg-multimedia-commits mailing list