- up to 1.3.6

[packages/audacity.git] / audacity-opt.patch

diff --git a/audacity-opt.patch b/audacity-opt.patch
index 4bcf63f4554d060c58f39dd72242fc2239e4a9d6..3984a818a73745c9f099151391752bb2dc3ebb00 100644 (file)
--- a/audacity-opt.patch
+++ b/audacity-opt.patch
@@ -1,33 +1,36 @@
---- audacity-src-1.1.3/lib-src/allegro/Makefile.in.wiget       Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/lib-src/allegro/Makefile.in     Fri Mar 28 01:56:59 2003
-@@ -3,7 +3,7 @@
- CC = @CC@
- CCC = @CXX@
- 
--CFLAGS = -g -O
-+CFLAGS = @CFLAGS@
- OBJ = \
-       allegro.cpp.o \
-       allegrord.cpp.o \
---- audacity-src-1.1.3/lib-src/libnyquist/Makefile.wiget       Thu Mar 20 05:38:11 2003
-+++ audacity-src-1.1.3/lib-src/libnyquist/Makefile     Fri Mar 28 01:58:03 2003
+--- audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in.orig        2006-10-29 01:05:50.000000000 +0200
++++ audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in     2006-12-29 17:29:38.478206151 +0100
 @@ -6,7 +6,7 @@
  INCL = -Inyqsrc -Itran -Ixlisp -Icmt -Isys -Isnd -Ifft
  
- CC = cc
--override CFLAGS += -g -DCMTSTUFF -O2 -DEXT $(INCL)
-+override CFLAGS += $(OPTFLAGS) -DCMTSTUFF -DEXT $(INCL)
- LN = $(CC)
- LFLAGS = -lm
+ CC = @CC@
+-CFLAGS += -DCMTSTUFF -DEXT @CFLAGS@ $(INCL)
++CFLAGS = @CFLAGS@ -DCMTSTUFF -DEXT @CFLAGS@ $(INCL)
+ 
+ INTGEN = misc/intgen
  
---- audacity-src-1.1.3/lib-src/portaudio/pa_unix_oss/Makefile.wiget    Thu Mar 20 05:38:17 2003
-+++ audacity-src-1.1.3/lib-src/portaudio/pa_unix_oss/Makefile  Fri Mar 28 01:58:45 2003
-@@ -2,7 +2,7 @@
+--- audacity-src-1.3.2-beta/lib-src/portmixer/configure.ac.orig        2006-10-29 01:05:51.000000000 +0200
++++ audacity-src-1.3.2-beta/lib-src/portmixer/configure.ac     2006-12-29 20:12:30.975109012 +0100
+@@ -31,6 +31,10 @@
+   [AC_SUBST( cflags, ["$cflags -g"] )  AC_MSG_RESULT(yes)],
+   [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)])
  
- CC = gcc
++if test -n "$CFLAGS" ; then
++      cflags="$CFLAGS"
++fi
++
+ #
+ # Check for portaudio path
+ #
+
+--- a/lib-src/portsmf/configure.ac~    2008-10-25 14:14:23.000000000 +0200
++++ a/lib-src/portsmf/configure.ac     2009-05-26 14:57:39.406323603 +0200
+@@ -24,7 +24,7 @@
+ AC_CONFIG_AUX_DIR(autotools)
+ # which also contains a subdir containing macros
+ AC_CONFIG_MACRO_DIR([autotools/m4])
+-AM_INIT_AUTOMAKE([-Wall foreign])
++AM_INIT_AUTOMAKE
  
--override CFLAGS += -g -O -ansi -I../pa_common
-+override CFLAGS += $(OPTFLAGS) -ansi -I../pa_common
- PASRC = ../pa_common/pa_lib.c pa_unix_oss.c pa_unix.c
- PAINC = ../pa_common/portaudio.h
- PAOBJ = ../pa_common/pa_lib.o pa_unix_oss.o pa_unix.o
+ dnl -------------------------------------------------------
+ dnl Checks for programs.