summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorChris Piazza <cpiazza@FreeBSD.org>1999-10-02 16:37:38 +0000
committerChris Piazza <cpiazza@FreeBSD.org>1999-10-02 16:37:38 +0000
commitd07c240d19e1d3ca8756d7164a434195ddac52ff (patch)
tree4d25fc75599f1d9cbd5b6fc4fab99e29faddb64c /audio
parentAdd a hook for a single icon per application instance. (diff)
Fix the use of BIGENDIAN where it should not have been
PR: 11935 Respect CC/CXX/CXXFLAGS/CFLAGS
Notes
Notes: svn path=/head/; revision=22119
Diffstat (limited to 'audio')
-rw-r--r--audio/dap/files/patch-ac38
-rw-r--r--audio/dap/files/patch-ad23
-rw-r--r--audio/dap/files/patch-ae24
-rw-r--r--audio/dap/files/patch-af19
-rw-r--r--audio/dap/files/patch-ag26
5 files changed, 109 insertions, 21 deletions
diff --git a/audio/dap/files/patch-ac b/audio/dap/files/patch-ac
index 874ccbaf3f70..d4e13c154296 100644
--- a/audio/dap/files/patch-ac
+++ b/audio/dap/files/patch-ac
@@ -1,28 +1,26 @@
-Index: libaudio/Makefile.linux
-@@ -21,6 +21,7 @@
- libaudio.a: $(OBJS)
- rm -f $(LIBNAME)
- ar ruv $(LIBNAME) $(OBJS)
-+ ranlib $(LIBNAME)
+--- libaudio/Makefile.linux.orig Sun Jan 10 04:25:03 1999
++++ libaudio/Makefile.linux Sat Oct 2 09:21:01 1999
+@@ -1,11 +1,11 @@
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ BACKDIR = ../bak/libaudio
+ HOMEDIR = $(HOME)
+ INCDIR = -I.
+-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall
++CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DUSINGGCC -Wall
+ DEBUG = -g3
+-OPTIM = -O1
++OPTIM = ${CXXFLAGS}
- clean:
- -rm -f $(OBJS) core
-Index: libaudiofile/Makefile.linux
+ LIBNAME = libaudio.a
+ OBJS = audio.o
@@ -21,6 +21,7 @@
- libaudiofile.a: $(OBJS)
+ libaudio.a: $(OBJS)
rm -f $(LIBNAME)
ar ruv $(LIBNAME) $(OBJS)
+ ranlib $(LIBNAME)
clean:
-rm -f $(OBJS) core
-Index: main/Makefile.linux
-@@ -14,7 +14,7 @@
- CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall
- DEBUG = -g3
- OPTIM = -O1
--LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm
-+LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lxforms -lXpm -lX11 -lm
-
- PROGS = DAP
- OBJS = DPTich.o DPTich_cb.o DPTich_DSP.o DPTich_edit_cb.o DPTich_macros.o \
diff --git a/audio/dap/files/patch-ad b/audio/dap/files/patch-ad
index 34efa2bbfcde..f3c4c51d0826 100644
--- a/audio/dap/files/patch-ad
+++ b/audio/dap/files/patch-ad
@@ -1,4 +1,25 @@
-Index: spkit/spkit/Makefile.linux
+--- spkit/spkit/Makefile.linux.orig Sun Jan 10 04:41:18 1999
++++ spkit/spkit/Makefile.linux Sat Oct 2 09:23:46 1999
+@@ -1,5 +1,5 @@
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ FORMS = ../../../xforms/FORMS
+ SOUND = ../../sound
+ TOOLTIP = ../../tooltips
+@@ -8,9 +8,9 @@
+ HOMEDIR = $(HOME)
+ X11DIR = /usr/X11R6
+ INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include
+-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall
++CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DUSINGGCC -Wall
+ DEBUG = -g3
+-OPTIM = -O2
++OPTIM = ${CXXFLAGS}
+
+ .c.o:
+ $(CC) $(CCFLAGS) -c $*.c -o $*.o
@@ -65,6 +65,7 @@
libdsp.a: $(OBJS)
rm -f $(LIBNAME)
diff --git a/audio/dap/files/patch-ae b/audio/dap/files/patch-ae
new file mode 100644
index 000000000000..3e4e1ef33907
--- /dev/null
+++ b/audio/dap/files/patch-ae
@@ -0,0 +1,24 @@
+--- main/Makefile.linux.orig Sun Jan 10 04:23:53 1999
++++ main/Makefile.linux Sat Oct 2 09:31:48 1999
+@@ -1,5 +1,5 @@
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ FORMS = ../../xforms/FORMS
+ SOUND = ../sound
+ SPKIT = ../spkit
+@@ -11,10 +11,10 @@
+ X11DIR = /usr/X11R6
+ INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include
+ LIBDIR = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib
+-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall
++CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DUSINGGCC -Wall
+ DEBUG = -g3
+-OPTIM = -O1
+-LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm
++OPTIM = ${CXXFLAGS}
++LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lxforms -lXpm -lX11 -lm
+
+ PROGS = DAP
+ OBJS = DPTich.o DPTich_cb.o DPTich_DSP.o DPTich_edit_cb.o DPTich_macros.o \
diff --git a/audio/dap/files/patch-af b/audio/dap/files/patch-af
new file mode 100644
index 000000000000..21ae8a47d2e6
--- /dev/null
+++ b/audio/dap/files/patch-af
@@ -0,0 +1,19 @@
+--- sound/Makefile.linux.orig Sat Oct 2 09:22:30 1999
++++ sound/Makefile.linux Sat Oct 2 09:22:52 1999
+@@ -1,5 +1,5 @@
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ FORMS = ../../xforms/FORMS
+ SPKIT = ../spkit
+ AUDIO = ../libaudio
+@@ -9,7 +9,7 @@
+ HOMEDIR = $(HOME)
+ INCDIR = -I. -I.. -I$(SPKIT) -I$(MAINDIR)
+ LIBDIR = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF)
+-CCFLAGS = -O1 -g3 -DNOFORMS -DLINUX -DBIGENDIAN -DUSINGGCC -Wall
++CCFLAGS = ${CXXFLAGS} -DNOFORMS -DLINUX -DUSINGGCC -Wall
+ LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -lm
+
+ PROGS = SampleTest
diff --git a/audio/dap/files/patch-ag b/audio/dap/files/patch-ag
new file mode 100644
index 000000000000..832525a45adc
--- /dev/null
+++ b/audio/dap/files/patch-ag
@@ -0,0 +1,26 @@
+--- libaudiofile/Makefile.linux.orig Sun Jan 10 04:24:25 1999
++++ libaudiofile/Makefile.linux Sat Oct 2 09:25:01 1999
+@@ -1,11 +1,11 @@
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ BACKDIR = ../bak/libaudiofile
+ HOMEDIR = $(HOME)
+ INCDIR = -I.
+-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall
++CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DUSINGGCC -Wall
+ DEBUG = -g3
+-OPTIM = -O1
++OPTIM = ${CXXFLAGS}
+
+ LIBNAME = libaudiofile.a
+ OBJS = audiofile.o ieee.o macros.o raw.o wav.o
+@@ -21,6 +21,7 @@
+ libaudiofile.a: $(OBJS)
+ rm -f $(LIBNAME)
+ ar ruv $(LIBNAME) $(OBJS)
++ ranlib $(LIBNAME)
+
+ clean:
+ -rm -f $(OBJS) core