[SCM] faust/master: Refreshed patches
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Tue May 17 21:42:45 UTC 2016
The following commit has been merged in the master branch:
commit 50b6bfe6665fbb2a55ae16eb0cf4de5b11dcd7b2
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Tue May 17 22:48:19 2016 +0200
Refreshed patches
diff --git a/debian/patches/atoi b/debian/patches/atoi
index 7156cd8..b16ea8b 100644
--- a/debian/patches/atoi
+++ b/debian/patches/atoi
@@ -4,8 +4,8 @@ Bug-Debian: http://bugs.debian.org/652322
Forwarded: no
Last-Update: 2012-03-24
---- faust-0.9.46.orig/compiler/draw/schema/topSchema.cpp
-+++ faust-0.9.46/compiler/draw/schema/topSchema.cpp
+--- faust.orig/compiler/draw/schema/topSchema.cpp
++++ faust/compiler/draw/schema/topSchema.cpp
@@ -21,6 +21,7 @@
#include <stdlib.h>
@@ -14,9 +14,9 @@ Last-Update: 2012-03-24
#include <iostream>
#include <assert.h>
#include <cstdlib>
---- faust-0.9.46.orig/compiler/tlib/list.cpp
-+++ faust-0.9.46/compiler/tlib/list.cpp
-@@ -105,6 +105,7 @@ This file contains several extensions to
+--- faust.orig/compiler/tlib/list.cpp
++++ faust/compiler/tlib/list.cpp
+@@ -105,6 +105,7 @@
#include <stdlib.h>
#include "list.hh"
#include "compatibility.hh"
@@ -24,13 +24,3 @@ Last-Update: 2012-03-24
#include <map>
#include <cstdlib>
---- faust-0.9.46.orig/architecture/misc.h
-+++ faust-0.9.46/architecture/misc.h
-@@ -4,6 +4,7 @@
-
- #include <map>
- #include <string.h>
-+#include <stdlib.h>
-
- // On Intel set FZ (Flush to Zero) and DAZ (Denormals Are Zero)
- // flags to avoid costly denormals
diff --git a/debian/patches/destdir b/debian/patches/destdir
index 21b0b56..304a02c 100644
--- a/debian/patches/destdir
+++ b/debian/patches/destdir
@@ -4,16 +4,14 @@ Bug-Debian: http://bugs.debian.org/660587
Forwarded: not-needed
Last-Update: 2012-03-24
-Index: faust-0.9.46/examples/Makefile.qtcompile
-===================================================================
---- faust-0.9.46.orig/examples/Makefile.qtcompile 2012-03-24 19:42:10.000000000 +0100
-+++ faust-0.9.46/examples/Makefile.qtcompile 2012-03-24 22:05:22.095365434 +0100
+--- faust.orig/examples/Makefile.qtcompile
++++ faust/examples/Makefile.qtcompile
@@ -31,7 +31,7 @@
$(DEST)%.app : %.dsp
install -d $(TMP)
- faust -a $(ARCH) $(VEC) $< -o $(TMP)/$<.cpp
-- cd $(TMP); qmake -project "$(DEFS)" "INCLUDEPATH+=/usr/local/lib/faust/" "INCLUDEPATH+=/usr/local/lib/faust/osclib" "LIBS+=$(LIB)" "HEADERS+=/usr/local/lib/faust/gui/faustqt.h"
-+ cd $(TMP); qmake -project "$(DEFS)" "INCLUDEPATH+=/usr/lib/faust/" "INCLUDEPATH+=/usr/lib/faust/osclib" "LIBS+=$(LIB)" "HEADERS+=/usr/lib/faust/gui/faustqt.h"
+ 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 $@
@@ -21,11 +19,11 @@ Index: faust-0.9.46/examples/Makefile.qtcompile
### Linux
--hdir1 := $(wildcard /usr/local/lib/faust/gui/faustqt.h)
-+hdir1 := $(wildcard /usr/lib/faust/gui/faustqt.h)
+-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/lib/faust/faustqt.h)
-+hdir3 := $(wildcard /usr/lib/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)
@@ -33,15 +31,13 @@ Index: faust-0.9.46/examples/Makefile.qtcompile
rm -rf $(TMP)
install -d $(TMP)
faust -a $(ARCH) $(VEC) $< -o $(TMP)/$<.cpp
-- cd $(TMP); $(qm) -project "$(DEFS)" "INCLUDEPATH+=/usr/local/lib/faust/" "INCLUDEPATH+=/usr/local/lib/faust/osclib" "LIBS+=$(LIB)" "HEADERS+=$(hdir)faustqt.h"
-+ cd $(TMP); $(qm) -project "$(DEFS)" "INCLUDEPATH+=/usr/lib/faust/" "INCLUDEPATH+=/usr/lib/faust/osclib" "LIBS+=$(LIB)" "HEADERS+=$(hdir)faustqt.h"
+- 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=) $@
-Index: faust-0.9.46/examples/Makefile
-===================================================================
---- faust-0.9.46.orig/examples/Makefile 2012-03-24 21:12:03.834424962 +0100
-+++ faust-0.9.46/examples/Makefile 2012-03-24 22:04:10.295648013 +0100
+--- 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
@@ -52,5 +48,5 @@ Index: faust-0.9.46/examples/Makefile
-LIB := $(if $(wildcard $(ck3)),$(FAUST_LIB_PATH),$(LIB))
+LIB := /usr/lib
- ifeq ($(OSC),1)
- OSCCTRL := -DOSCCTRL -I$(LIB)/faust/osclib
+ # Directory containing Faust include files:
+ ck11 := /opt/local/include/faust/misc.h
diff --git a/debian/patches/kFreeBSD b/debian/patches/kFreeBSD
index 2ab2bfd..25373ea 100644
--- a/debian/patches/kFreeBSD
+++ b/debian/patches/kFreeBSD
@@ -2,13 +2,11 @@ Description: Add support for the GNU/kFreeBSD architecture
Author: Mario Lang <mlang at debian.org>
Bug-Debian: http://bugs.debian.org/644590
-Index: faust-0.9.46/architecture/osclib/oscpack/Makefile
-===================================================================
---- faust-0.9.46.orig/architecture/osclib/oscpack/Makefile 2012-03-24 21:43:10.000000000 +0100
-+++ faust-0.9.46/architecture/osclib/oscpack/Makefile 2012-03-24 21:47:59.877546208 +0100
-@@ -12,12 +12,19 @@
- sources := $(wildcard ip/*.cpp) $(wildcard ip/posix/*.cpp) $(wildcard osc/*.cpp)
+--- faust.orig/architecture/osclib/oscpack/Makefile
++++ faust/architecture/osclib/oscpack/Makefile
+@@ -13,12 +13,19 @@
ARCHFLAGS :=
+ CXXFLAGS += -fPIC
+else
+ifeq ($(system), GNU/kFreeBSD)
diff --git a/debian/patches/unistd b/debian/patches/unistd
index 157ce5a..df7caf0 100644
--- a/debian/patches/unistd
+++ b/debian/patches/unistd
@@ -5,37 +5,13 @@ Author: Mario Lang <mlang at debian.org>
Bug-Debian: http://bugs.debian.org/667163
Forwarded: no
---- faust-0.9.46.orig/compiler/parser/faustlexer.cpp
-+++ faust-0.9.46/compiler/parser/faustlexer.cpp
-@@ -783,8 +783,7 @@ char *yytext;
- #line 6 "parser/faustlexer.l"
- #include "tree.hh"
- #include "faustparser.hpp"
--#define YY_NO_UNISTD_H 1
--extern int isatty (int );
-+#include <unistd.h>
-
-
-
---- faust-0.9.46.orig/compiler/parser/faustlexer.l
-+++ faust-0.9.46/compiler/parser/faustlexer.l
-@@ -5,8 +5,7 @@
- %{
- #include "tree.hh"
- #include "faustparser.hpp"
--#define YY_NO_UNISTD_H 1
--extern int isatty (int );
-+#include <unistd.h>
- %}
-
- DIGIT [0-9]
---- faust-0.9.46.orig/architecture/osclib/faust/src/nodes/RootNode.cpp
-+++ faust-0.9.46/architecture/osclib/faust/src/nodes/RootNode.cpp
+--- faust.orig/architecture/osclib/faust/src/nodes/RootNode.cpp
++++ faust/architecture/osclib/faust/src/nodes/RootNode.cpp
@@ -23,6 +23,7 @@
#include <string>
#include <sstream>
+#include <unistd.h>
- #include "RootNode.h"
- #include "Message.h"
+ #ifndef _WIN32
+ #include <unistd.h>
--
faust packaging
More information about the pkg-multimedia-commits
mailing list