summaryrefslogtreecommitdiff
path: root/audio/mpg123/patches/patch-aa
blob: 1b9c7825db192023cc8bc67ba62b91ad7afb8bfd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
$NetBSD: patch-aa,v 1.28 2009/05/19 22:16:08 abs Exp $

--- Makefile.orig	2009-05-19 23:13:41.000000000 +0100
+++ Makefile
@@ -6,7 +6,7 @@
 
 PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
-MANDIR=$(PREFIX)/man
+MANDIR=$(PREFIX)/$(PKGMANDIR)
 SECTION=1
 
 # Enable the below line If your plathome support IPv6
@@ -54,6 +54,23 @@ nothing-specified:
 	@echo "make aix-tk3play    IBM AIX"
 	@echo "make os2            IBM OS/2"
 	@echo "make netbsd         NetBSD"
+	@echo "make netbsd-arm     NetBSD for strongarm (32bit fixedpoint)"
+	@echo "make netbsd-arm-64  NetBSD for strongarm (64bit fixedpoint)"
+	@echo "make netbsd-i386    NetBSD optimized for i386"
+	@echo "make netbsd-i386-elf NetBSD optimized for i386, ELF format"
+	@echo "make netbsd-m68k    NetBSD optimized for m68k"
+	@echo "make netbsd-esd     NetBSD with EsounD"
+	@echo "make netbsd-arm-esd NetBSD for strongarm (32bit fixedpoint) with EsounD"
+	@echo "make netbsd-arm-64-esd NetBSD for strongarm (64bit fixedpoint) with EsounD"
+	@echo "make netbsd-i386-esd NetBSD optimized for i386 with EsounD"
+	@echo "make netbsd-i386-elf-esd NetBSD optimized for i386, ELF format with EsounD"
+	@echo "make netbsd-m68k-esd NetBSD optimized for m68k with EsounD"
+	@echo "make netbsd-nas     NetBSD with NAS"
+	@echo "make netbsd-arm-nas NetBSD for strongarm (32bit fixedpoint) with NAS"
+	@echo "make netbsd-arm-64-nas NetBSD for strongarm (64bit fixedpoint) with NAS"
+	@echo "make netbsd-i386-nas NetBSD optimized for i386 with NAS"
+	@echo "make netbsd-i386-elf-nas NetBSD optimized for i386, ELF format with NAS"
+	@echo "make netbsd-m68k-nas NetBSD optimized for m68k with NAS"
 	@echo "make bsdos          BSDI BSD/OS"
 	@echo "make bsdos4         BSDI BSD/OS 4.0"
 	@echo "make bsdos-nas      BSDI BSD/OS with NAS support"
@@ -300,7 +317,7 @@ linux-nas:
 #CFLAGS='$(CFLAGS) -DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g'
 #CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
 
-freebsd:
+dragonfly freebsd:
 	$(MAKE) CC=cc LDFLAGS= \
 		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
@@ -309,11 +326,11 @@ freebsd:
 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
 		mpg123-make
 
-freebsd-esd:
+dragonfly-esd freebsd-esd:
 	$(MAKE) CC=cc LDFLAGS= \
-		AUDIO_LIB='-lesd -laudiofile' \
+                AUDIO_LIB="`esd-config --libs`" \
 		OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o' \
-		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
 			-funroll-all-loops -ffast-math -DROT_I386 \
 			-DREAD_MMAP \
 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
@@ -321,7 +338,7 @@ freebsd-esd:
 			$(CFLAGS)' \
 		mpg123-make
 
-freebsd-frontend:
+dragonfly-frontend freebsd-frontend:
 	$(MAKE) CC=cc LDFLAGS= \
 		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \
 			control_sajber.o control_tk3play.o' \
@@ -398,7 +415,7 @@ solaris-x86-gcc-oss:
 
 solaris-gcc-nas:
 	$(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
-		AUDIO_LIB='-L/usr/openwin/lib -laudio -lXau'\
+		AUDIO_LIB='-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -laudio -lXt -lXau'\
 		OBJECTS='decode.o dct64.o audio_nas.o' \
 		CFLAGS='$(CFLAGS) -O2 -I/usr/openwin/include -Wall \
 			-DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \
@@ -496,18 +513,194 @@ os2:
 
 netbsd:
 	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_sun.o' \
+		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
-			-funroll-all-loops -ffast-math \
-			-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
+			-funroll-all-loops -ffast-math -DREAD_MMAP \
+			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \
 		mpg123-make
 
 netbsd-i386:
 	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \
-		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
+			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \
+		mpg123-make
+
+netbsd-i386-elf:
+	$(MAKE) CC=cc LDFLAGS= \
+		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+			audio_sun.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DROT_I386 \
+			-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
+			-DREAD_MMAP -DNETBSD -DTERM_CONTROL' \
+		mpg123-make
+
+netbsd-m68k:
+	$(MAKE) CC=cc LDFLAGS= \
+		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
+			-DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL' \
+		mpg123-make
+
+netbsd-arm:
+	$(MAKE) CC=cc LDFLAGS= \
+		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm -mcpu=strongarm \
+			-DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
+			-DNETBSD' \
+		mpg123-make
+
+netbsd-arm-64:
+	$(MAKE) CC=cc LDFLAGS= \
+		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
+			-DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
+			-DTERM_CONTROL -DNETBSD' \
+		mpg123-make
+
+netbsd-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode.o dct64.o audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DREAD_MMAP \
+			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
+			`esd-config --cflags`' \
+		mpg123-make
+
+netbsd-i386-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode_i386.o dct64_i386.o audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
+			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
+			`esd-config --cflags`' \
+		mpg123-make
+
+netbsd-i386-elf-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+			audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DROT_I386 \
+			-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
+			-DREAD_MMAP -DNETBSD -DTERM_CONTROL \
+			`esd-config --cflags`' \
+		mpg123-make
+
+netbsd-m68k-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode.o dct64.o audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
+			-DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \
+			`esd-config --cflags`' \
+		mpg123-make
+
+netbsd-arm-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode.o dct64.o audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm -mcpu=strongarm \
+			-DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
+			-DNETBSD `esd-config --cflags`' \
+		mpg123-make
+
+netbsd-arm-64-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode.o dct64.o audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
+			-DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
+			-DTERM_CONTROL -DNETBSD `esd-config --cflags`' \
+		mpg123-make
+
+netbsd-nas:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DREAD_MMAP \
+			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
+			-DNAS' \
+		mpg123-make
+
+dragonfly-nas freebsd-nas:
+	$(MAKE) CC=cc LDFLAGS= \
+	         AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+	         OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_nas.o' \
+	         CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+	                 -funroll-all-loops -ffast-math -DROT_I386 \
+	                 -DREAD_MMAP \
+	                 -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNAS' \
+	         mpg123-make
+
+netbsd-i386-nas:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
+			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
+			-DNAS' \
+		mpg123-make
+
+netbsd-i386-elf-nas:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+			audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
 			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
+			-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
+			-DREAD_MMAP -DNETBSD -DTERM_CONTROL \
+			-DNAS' \
+		mpg123-make
+
+netbsd-m68k-nas:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
+			-DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \
+			-DNAS' \
+		mpg123-make
+
+netbsd-arm-nas:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm -mcpu=strongarm \
+			-DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
+			-DNETBSD -DNAS' \
+		mpg123-make
+
+netbsd-arm-64-nas:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
+			-DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
+			-DTERM_CONTROL -DNETBSD -DNAS' \
 		mpg123-make
 
 bsdos:
@@ -556,6 +749,16 @@ generic:
 		CFLAGS='$(CFLAGS) -O -DGENERIC -DNOXFERMEM' \
 		mpg123-make
 
+darwin-esd:
+	$(MAKE) CC=cc LDFLAGS= \
+		AUDIO_LIB="`esd-config --libs`" \
+		OBJECTS='decode.o dct64.o audio_esd.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DREAD_MMAP \
+			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL \
+			`esd-config --cflags`' \
+		mpg123-make
+
 ###########################################################################
 ###########################################################################
 ###########################################################################
@@ -644,12 +847,12 @@ system: mpg123.h system.c
 install:	prepared-for-install
 	strip mpg123
 	if [ -x /usr/ccs/bin/mcs ]; then /usr/ccs/bin/mcs -d mpg123; fi
-	mkdir -p $(BINDIR)
-	mkdir -p $(MANDIR)/man$(SECTION)
-	cp -f mpg123 $(BINDIR)
-	chmod 755 $(BINDIR)/mpg123
-	cp -f mpg123.1 $(MANDIR)/man$(SECTION)
-	chmod 644 $(MANDIR)/man$(SECTION)/mpg123.1
+	mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)/man$(SECTION)
+	cp -f mpg123 $(DESTDIR)$(BINDIR)
+	chmod 755 $(DESTDIR)$(BINDIR)/mpg123
+	cp -f mpg123.1 $(DESTDIR)$(MANDIR)/man$(SECTION)
+	chmod 644 $(DESTDIR)$(MANDIR)/man$(SECTION)/mpg123.1
 
 dist:	clean
 	DISTNAME="`basename \`pwd\``" ; \