gcc3 doesn't like multi-line literals, and pval already knew it's

unhappy with nasm.
This commit is contained in:
espie 2003-12-28 22:26:18 +00:00
parent 7e9f4c3ab7
commit 7548e1358f
2 changed files with 67 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2003/12/07 19:45:42 espie Exp $
# $OpenBSD: Makefile,v 1.30 2003/12/28 22:26:18 espie Exp $
# Uses pthreads
COMMENT= "cross-platform multimedia library"
@ -35,8 +35,10 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-ltdl \
--enable-pthread-sem
.include <bsd.own.mk>
USE_GCC3?=No
# XXX gcc 3/nasm issue.
.if (${MACHINE_ARCH} == "i386") && (${CC} != "egcc")
.if (${MACHINE_ARCH} == "i386") && (${CC} != "egcc" && ${USE_GCC3:L} != "yes")
BUILD_DEPENDS= nasm::devel/nasm
CONFIGURE_ARGS+= --enable-nasm
.else

View File

@ -0,0 +1,63 @@
$OpenBSD: patch-src_audio_openbsd_SDL_openbsdaudio_c,v 1.5 2003/12/28 22:26:18 espie Exp $
--- src/audio/openbsd/SDL_openbsdaudio.c.orig 2003-12-28 19:42:30.000000000 +0100
+++ src/audio/openbsd/SDL_openbsdaudio.c 2003-12-28 19:43:45.000000000 +0100
@@ -262,21 +262,21 @@ OBSD_Status(_THIS)
return;
}
- fprintf(stderr,"
-[play/record info]
-buffer size : %d bytes
-sample rate : %i Hz
-channels : %i
-precision : %i-bit
-encoding : 0x%x
-seek : %i
-sample count : %i
-EOF count : %i
-paused : %s
-error occured : %s
-waiting : %s
-active : %s
-",
+ fprintf(stderr,"\n"
+"[play/record info]\n"
+"buffer size : %d bytes\n"
+"sample rate : %i Hz\n"
+"channels : %i\n"
+"precision : %i-bit\n"
+"encoding : 0x%x\n"
+"seek : %i\n"
+"sample count : %i\n"
+"EOF count : %i\n"
+"paused : %s\n"
+"error occured : %s\n"
+"waiting : %s\n"
+"active : %s\n"
+"",
info.play.buffer_size,
info.play.sample_rate,
info.play.channels,
@@ -290,14 +290,14 @@ active : %s
info.play.waiting ? "yes" : "no",
info.play.active ? "yes": "no");
- fprintf(stderr,"
-[audio info]
-monitor_gain : %i
-hw block size : %d bytes
-hi watermark : %i
-lo watermark : %i
-audio mode : %s
-",
+ fprintf(stderr,"\n"
+"[audio info]\n"
+"monitor_gain : %i\n"
+"hw block size : %d bytes\n"
+"hi watermark : %i\n"
+"lo watermark : %i\n"
+"audio mode : %s\n"
+"",
info.monitor_gain,
info.blocksize,
info.hiwat, info.lowat,