This commit is contained in:
brad 2004-09-15 20:35:59 +00:00
parent f11549a021
commit 6566b089c6
2 changed files with 12 additions and 12 deletions

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.4 2004/04/20 01:45:30 jolan Exp $
--- Makefile.orig 2004-04-19 11:15:33.000000000 -0500
+++ Makefile 2004-04-19 11:17:03.000000000 -0500
$OpenBSD: patch-Makefile,v 1.5 2004/09/15 20:35:59 brad Exp $
--- Makefile.orig Wed Sep 15 16:22:34 2004
+++ Makefile Wed Sep 15 16:22:34 2004
@@ -4,7 +4,7 @@
# Where to install binary and manpage on "make install":
@ -18,10 +18,11 @@ $OpenBSD: patch-Makefile,v 1.4 2004/04/20 01:45:30 jolan Exp $
@echo "make bsdos BSDI BSD/OS"
@echo "make bsdos4 BSDI BSD/OS 4.0"
@echo "make bsdos-nas BSDI BSD/OS with NAS support"
@@ -510,6 +511,30 @@ netbsd-i386:
@@ -509,6 +510,30 @@ netbsd-i386:
-funroll-all-loops -ffast-math -DROT_I386 \
-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
mpg123-make
+
+.if ${MACHINE_ARCH} == "i386"
+ARCHOPTS= -DROT_I386 -DI386_ASSEM -DPENTIUM_OPT
+ARCHOBJS= decode_i386.o decode_i586.o dct64_i386.o
@ -45,7 +46,6 @@ $OpenBSD: patch-Makefile,v 1.4 2004/04/20 01:45:30 jolan Exp $
+ ${ARCHOPTS} -I${LOCALBASE}/include \
+ -DREAL_IS_FLOAT -DTERM_CONTROL \
+ -DINET6 -DUSE_MMAP -DOPENBSD' mpg123-make
+
bsdos:
$(MAKE) CC=shlicc2 LDFLAGS= \
OBJECTS='decode_i386.o dct64_i386.o \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-audio.c,v 1.2 2001/04/24 00:48:12 naddy Exp $
--- audio.c.orig Tue Apr 6 17:53:05 1999
+++ audio.c Sat Apr 14 22:58:42 2001
$OpenBSD: patch-audio.c,v 1.3 2004/09/15 20:35:59 brad Exp $
--- audio.c.orig Tue Apr 6 11:53:05 1999
+++ audio.c Wed Sep 15 16:22:34 2004
@@ -68,41 +68,42 @@ void audio_capabilities(struct audio_inf
{
int fmts;
@ -56,9 +56,9 @@ $OpenBSD: patch-audio.c,v 1.2 2001/04/24 00:48:12 naddy Exp $
}
}
- }
-
- audio_close(&ai1);
- audio_close(&ai1);
-
- if(param.verbose > 1) {
+ audio_close(&ai1);
fprintf(stderr,"\nAudio capabilities:\n |");