kpriv
/
pkgsrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnuboy[-sdl]: Update to 1.0.4 (switch to modern fork) 

This gets us some fixes for modern compilers and systems,
SDL2 support, and allows deleting a handful of patches.

While here, import the manual pages from Debian.
This commit is contained in:
nia 2023-07-21 09:32:36 +00:00
parent b0efe6c01d
commit 9479ac3f00
18 changed files with 187 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emulators/gnuboy-sdl/DESCR
View File

@ -1,2 +1,12 @@
Gnuboy is a portable program for emulating the Nintendo GameBoy Color
software platform. This is the SDL port, with joystick support.
Welcome to gnuboy, one of the fastest if not the fastest GB/GBC emu-
lator available.
gnuboy was written well over 20 years ago and achieved full speed
on most machines of that era, on today's machines it runs close to
0% CPU usage.
Unlike most modern GB emulators, gnuboy doesn't strive to be
cycle-accurate (except where necessary), but to be fast, portable
and compatible and to provide a good gaming experience.
This is the SDL2 port, with cross-platform controller support.

29
emulators/gnuboy-sdl/Makefile
View File

@ -1,29 +1,28 @@
# $NetBSD: Makefile,v 1.16 2017/08/01 16:47:38 wiz Exp $
# $NetBSD: Makefile,v 1.17 2023/07/21 09:32:36 nia Exp $
.include "../../emulators/gnuboy/Makefile.common"
DISTNAME= gnuboy-1.0.3
PKGNAME= ${DISTNAME:S/-/-sdl-/}
PKGREVISION= 7
CATEGORIES= emulators
#MASTER_SITES= http://gnuboy.unix-fu.org/src/
MAINTAINER= pkgsrc-users@NetBSD.org
#HOMEPAGE= http://gnuboy.unix-fu.org/
COMMENT= SDL port of Gameboy emulator
COMMENT= Fast gameboy emulator (SDL2 version)
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-sdl
CONFIGURE_ARGS+= --with-sdl2
CONFIGURE_ARGS+= --with-sound=sdl
INSTALLATION_DIRS= bin share/doc/gnuboy-sdl share/examples/gnuboy-sdl
BUILDLINK_TRANSFORM+= rm:-fforce-mem
.include "../../devel/SDL/buildlink3.mk"
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= ${PKGMANDIR}/man6
INSTALLATION_DIRS+= share/doc/gnuboy-sdl
INSTALLATION_DIRS+= share/examples/gnuboy-sdl
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/sdlgnuboy \
${INSTALL_PROGRAM} ${WRKSRC}/sdl2gnuboy \
${DESTDIR}${PREFIX}/bin/gnuboy-sdl
${INSTALL_MAN} ${FILESDIR}/gnuboy-sdl.6 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/gnuboy-sdl.6
${INSTALL_DATA} ${WRKSRC}/etc/sample.rc \
${DESTDIR}${PREFIX}/share/examples/gnuboy-sdl/
${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/docs/* \
${DESTDIR}${PREFIX}/share/doc/gnuboy-sdl/
.include "../../devel/SDL2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

3
emulators/gnuboy-sdl/PLIST
View File

@ -1,5 +1,6 @@
@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:51:04 joerg Exp $
@comment $NetBSD: PLIST,v 1.3 2023/07/21 09:32:36 nia Exp $
bin/gnuboy-sdl
man/man6/gnuboy-sdl.6
share/doc/gnuboy-sdl/CHANGES
share/doc/gnuboy-sdl/CONFIG
share/doc/gnuboy-sdl/CREDITS

7
emulators/gnuboy-sdl/distinfo
View File

@ -1,7 +0,0 @@
$NetBSD: distinfo,v 1.7 2021/10/26 10:23:51 nia Exp $
BLAKE2s (gnuboy-1.0.3.tar.gz) = 7986d7c531d04e56a30f1f2732320caa4c690aa97e65ac1633bd5c91dc74e706
SHA512 (gnuboy-1.0.3.tar.gz) = 89e8075dac5ec17b375a5739367b46c55130211fb487a052be1cca49a5d86cc1a7f1619b2b2473d744fbe3c51fdb1a11110b15836cc9cc9de588932b91d258e6
Size (gnuboy-1.0.3.tar.gz) = 187627 bytes
SHA1 (patch-aa) = c72c7de796e01e3a9d123b2bd7464d7397cc6cd5
SHA1 (patch-configure) = 63b9ee2fe6e13f06354a3ef95bb3dedc41221990

40
emulators/gnuboy-sdl/files/gnuboy-sdl.6 Normal file
View File

@ -0,0 +1,40 @@
.TH SDLGNUBOY "6" "July 2001"
.SH NAME
gnuboy-sdl \- gnuboy Game Boy Emulator.
.SH SYNOPSIS
.B gnuboy-sdl
[\fIoptions\fR] \fIromfile\fR
.SH DESCRIPTION
.TP
\fB\-\-source\fR FILE
read rc commands from FILE
.TP
\fB\-\-bind\fR KEY COMMAND
bind KEY to perform COMMAND
.TP
\fB\-\-VAR\fR=\fIVALUE\fR
set rc variable VAR to VALUE
.TP
\fB\-\-VAR\fR
set VAR to 1 (turn on boolean options)
.TP
\fB\-\-no\-VAR\fR
set VAR to 0 (turn off boolean options)
.TP
\fB\-\-showvars\fR
list all available rc variables
.TP
\fB\-\-help\fR
display this help and exit
.TP
\fB\-\-version\fR
output version information and exit
.TP
\fB\-\-copying\fR
show copying permissions
.SH AUTHOR
This manual page was written for the Debian GNU/Linux distribution
because the original program does not have a manual page.
.PP
This manual page was written by Davide Puricelli <evo@debian.org>,
for the Debian GNU/Linux system (but may be used by others).

82
emulators/gnuboy-sdl/patches/patch-aa
View File

@ -1,82 +0,0 @@
$NetBSD: patch-aa,v 1.2 2015/01/03 11:21:07 nat Exp $
--- sys/sdl/sdl.c.orig 2001-09-17 16:40:14.000000000 +0000
+++ sys/sdl/sdl.c
@@ -28,6 +28,7 @@ static int use_joy = 1, sdl_joy_num;
static SDL_Joystick * sdl_joy = NULL;
static const int joy_commit_range = 3276;
static char Xstatus, Ystatus;
+static int closing = 0;
static SDL_Surface *screen;
static SDL_Overlay *overlay;
@@ -441,6 +442,8 @@ static int sound = 1;
static int samplerate = 44100;
static int stereo = 1;
static volatile int audio_done;
+static SDL_sem *pcm_rsem, *pcm_wsem;
+static int atexit_done = 0;
rcvar_t pcm_exports[] =
{
@@ -453,8 +456,19 @@ rcvar_t pcm_exports[] =
static void audio_callback(void *blah, byte *stream, int len)
{
- memcpy(stream, pcm.buf, len);
- audio_done = 1;
+ if (!closing) {
+ SDL_SemWait(pcm_rsem);
+ memcpy(stream, pcm.buf, len);
+ SDL_SemPost(pcm_wsem);
+ }
+}
+
+
+static void audio_atexit(void)
+{
+ closing = 1;
+ if (pcm_wsem)
+ SDL_SemPost(pcm_rsem);
}
@@ -466,6 +480,13 @@ void pcm_init()
if (!sound) return;
SDL_InitSubSystem(SDL_INIT_AUDIO);
+ /* XXX: check for NULL */
+ pcm_rsem = SDL_CreateSemaphore(0);
+ pcm_wsem = SDL_CreateSemaphore(0);
+ if (!atexit_done) {
+ atexit(audio_atexit);
+ atexit_done = 1;
+ }
as.freq = samplerate;
as.format = AUDIO_U8;
as.channels = 1 + stereo;
@@ -491,16 +512,20 @@ int pcm_submit()
{
if (!pcm.buf) return 0;
if (pcm.pos < pcm.len) return 1;
- while (!audio_done)
- SDL_Delay(4);
- audio_done = 0;
+ SDL_SemPost(pcm_rsem);
+ SDL_SemWait(pcm_wsem);
pcm.pos = 0;
return 1;
}
void pcm_close()
{
- if (sound) SDL_CloseAudio();
+ if (sound) {
+ SDL_CloseAudio();
+ SDL_DestroySemaphore(pcm_rsem);
+ SDL_DestroySemaphore(pcm_wsem);
+ pcm_rsem = pcm_wsem = 0;
+ }
}

22
emulators/gnuboy-sdl/patches/patch-configure
View File

@ -1,22 +0,0 @@
$NetBSD: patch-configure,v 1.1 2013/10/28 23:45:28 joerg Exp $
--- configure.orig 2013-10-17 17:46:02.000000000 +0000
+++ configure
@@ -3227,17 +3227,6 @@ case `uname -m` in
i?86) CFLAGS="$CFLAGS -DALLOW_UNALIGNED_IO" ;;
esac
-#case `$CC --version` in
-#2.9*|3.*)
-CFLAGS="$CFLAGS -fstrength-reduce -fthread-jumps \
- -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop \
- -fexpensive-optimizations -fforce-mem -fforce-addr"
-#;;
-#*)
-#AC_MSG_WARN(your compiler is too old for fancy optimizations)
-#;;
-#esac
-
if test "$enable_debug" != yes -a "$enable_profile" != yes ; then
CFLAGS="$CFLAGS -fomit-frame-pointer"
LDFLAGS="$LDFLAGS -s"

12
emulators/gnuboy/DESCR
View File

@ -1,2 +1,10 @@
gnuboy is a portable program for emulating the Nintendo GameBoy Color
software platform.
Welcome to gnuboy, one of the fastest if not the fastest GB/GBC emu-
lator available.
gnuboy was written well over 20 years ago and achieved full speed
on most machines of that era, on today's machines it runs close to
0% CPU usage.
Unlike most modern GB emulators, gnuboy doesn't strive to be
cycle-accurate (except where necessary), but to be fast, portable
and compatible and to provide a good gaming experience.

24
emulators/gnuboy/Makefile
View File

@ -1,30 +1,28 @@
# $NetBSD: Makefile,v 1.15 2012/10/23 10:24:03 wiz Exp $
# $NetBSD: Makefile,v 1.16 2023/07/21 09:32:36 nia Exp $
DISTNAME= gnuboy-1.0.3
PKGREVISION= 2
CATEGORIES= emulators games
MASTER_SITES= http://brightrain.aerifal.cx/~laguna/src/
.include "Makefile.common"
MAINTAINER= njl@sdf.lonestar.org
#HOMEPAGE= http://gnuboy.unix-fu.org/
COMMENT= Gameboy emulator
COMMENT= Fast gameboy emulator (X11 version)
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-x
INSTALLATION_DIRS= bin
BUILDLINK_TRANSFORM+= rm:-fforce-mem
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= ${PKGMANDIR}/man6
INSTALLATION_DIRS+= share/doc/gnuboy
INSTALLATION_DIRS+= share/examples/gnuboy
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/gnuboy
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/gnuboy
${INSTALL_PROGRAM} ${WRKSRC}/xgnuboy ${DESTDIR}${PREFIX}/bin/
${INSTALL_DATA} ${WRKSRC}/etc/sample.rc \
${DESTDIR}${PREFIX}/share/examples/gnuboy/
${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/docs/* \
${DESTDIR}${PREFIX}/share/doc/gnuboy/
${INSTALL_MAN} ${FILESDIR}/xgnuboy.6 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/xgnuboy.6
BUILDLINK_DEPMETHOD.libXt?= build
.include "options.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"

18
emulators/gnuboy/Makefile.common Normal file
View File

@ -0,0 +1,18 @@
# $NetBSD: Makefile.common,v 1.1 2023/07/21 09:32:36 nia Exp $
# used by emulators/gnuboy/Makefile
# used by emulators/gnuboy-sdl/Makefile
DISTNAME= gnuboy-1.0.4
CATEGORIES= emulators games
MASTER_SITES= ${MASTER_SITE_GITHUB:=rofl0r/}
GITHUB_RELEASE= v${PKGVERSION_NOREV}
EXTRACT_SUFX= .tar.xz
MAINTAINER= njl@sdf.lonestar.org
HOMEPAGE= https://github.com/rofl0r/gnuboy
LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
DISTINFO_FILE= ${.CURDIR}/../../emulators/gnuboy/distinfo
PATCHDIR= ${.CURDIR}/../../emulators/gnuboy/patches

3
emulators/gnuboy/PLIST
View File

@ -1,5 +1,6 @@
@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:51:04 joerg Exp $
@comment $NetBSD: PLIST,v 1.5 2023/07/21 09:32:36 nia Exp $
bin/xgnuboy
man/man6/xgnuboy.6
share/doc/gnuboy/CHANGES
share/doc/gnuboy/CONFIG
share/doc/gnuboy/CREDITS

12
emulators/gnuboy/distinfo
View File

@ -1,9 +1,5 @@
$NetBSD: distinfo,v 1.8 2021/10/26 10:23:51 nia Exp $
$NetBSD: distinfo,v 1.9 2023/07/21 09:32:36 nia Exp $
BLAKE2s (gnuboy-1.0.3.tar.gz) = 7986d7c531d04e56a30f1f2732320caa4c690aa97e65ac1633bd5c91dc74e706
SHA512 (gnuboy-1.0.3.tar.gz) = 89e8075dac5ec17b375a5739367b46c55130211fb487a052be1cca49a5d86cc1a7f1619b2b2473d744fbe3c51fdb1a11110b15836cc9cc9de588932b91d258e6
Size (gnuboy-1.0.3.tar.gz) = 187627 bytes
SHA1 (patch-aa) = d99a316e40d1249685204f23e66e3709cefc03e3
SHA1 (patch-ab) = e3fe25086d105864f4d127c84bfe3f3234820927
SHA1 (patch-ac) = 1c3851d5a65c377b25fae529d4505fdb9dd12729
SHA1 (patch-ad) = cac88fded5d8422824faf57d8d32ab571a611fc1
BLAKE2s (gnuboy-1.0.4.tar.xz) = 4ea0a1d510e61e92d514d5d1726af675415e6fac005a8001452f1e4639d0e846
SHA512 (gnuboy-1.0.4.tar.xz) = 04a86b3326e8ac944535275af1aa2d124dc4a59c5625463a41a1e8af0a6fef5e5e230209f1d05fdf32a10a2924750b2494a424afaa7ac1360a15ffa709cb5b5c
Size (gnuboy-1.0.4.tar.xz) = 188192 bytes

40
emulators/gnuboy/files/xgnuboy.6 Normal file
View File

@ -0,0 +1,40 @@
.TH XGNUBOY "6" "July 2001"
.SH NAME
xgnuboy \- gnuboy Game Boy Emulator.
.SH SYNOPSIS
.B xgnuboy
[\fIoptions\fR] \fIromfile\fR
.SH DESCRIPTION
.TP
\fB\-\-source\fR FILE
read rc commands from FILE
.TP
\fB\-\-bind\fR KEY COMMAND
bind KEY to perform COMMAND
.TP
\fB\-\-VAR\fR=\fIVALUE\fR
set rc variable VAR to VALUE
.TP
\fB\-\-VAR\fR
set VAR to 1 (turn on boolean options)
.TP
\fB\-\-no\-VAR\fR
set VAR to 0 (turn off boolean options)
.TP
\fB\-\-showvars\fR
list all available rc variables
.TP
\fB\-\-help\fR
display this help and exit
.TP
\fB\-\-version\fR
output version information and exit
.TP
\fB\-\-copying\fR
show copying permissions
.SH AUTHOR
This manual page was written for the Debian GNU/Linux distribution
because the original program does not have a manual page.
.PP
This manual page was written by Davide Puricelli <evo@debian.org>,
for the Debian GNU/Linux system (but may be used by others).

34
emulators/gnuboy/options.mk Normal file
View File

@ -0,0 +1,34 @@
# $NetBSD: options.mk,v 1.1 2023/07/21 09:32:36 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gnuboy
PKG_OPTIONS_REQUIRED_GROUPS+= sound
PKG_OPTIONS_GROUP.sound+= libao oss
.include "../../mk/bsd.fast.prefs.mk"
.include "../../mk/oss.buildlink3.mk"
.if ${OSS_TYPE} == "none" || ${OPSYS} == "Linux"
PKG_SUGGESTED_OPTIONS+= libao
.else
PKG_SUGGESTED_OPTIONS+= oss
.endif
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Moss)
CONFIGURE_ARGS+= --with-sound=oss
LDFLAGS+= ${LIBOSSAUDIO}
SUBST_CLASSES+= oss
SUBST_STAGE.oss= pre-configure
SUBST_FILES.oss= sys/oss/oss.c
SUBST_SED.oss= -e 's,/dev/sound,${DEVOSSAUDIO},g'
SUBST_SED.oss+= -e 's,/dev/dsp,${DEVOSSAUDIO},g'
.endif
.if !empty(PKG_OPTIONS:Mlibao)
CONFIGURE_ARGS+= --with-sound=ao
. include "../../audio/libao/buildlink3.mk"
.endif

53
emulators/gnuboy/patches/patch-aa
View File

@ -1,53 +0,0 @@
$NetBSD: patch-aa,v 1.3 2003/02/14 20:06:01 salo Exp $
--- Makefile.in.orig Tue Jul 3 12:31:18 2001
+++ Makefile.in
@@ -20,6 +20,8 @@ SYS_DEFS = @DEFS@ @ENDIAN@ @ASM@ @SYS_DE
SYS_OBJS = sys/nix/nix.o $(ASM_OBJS)
SYS_INCS = -I/usr/local/include @XINCS@ -I./sys/nix
+OSS_LIB = @OSS_LIB@
+
FB_OBJS = @FB_OBJS@ @JOY@ @SOUND@
FB_LIBS =
@@ -31,20 +33,20 @@ SDL_LIBS = @SDL_LIBS@
SDL_CFLAGS = @SDL_CFLAGS@
X11_OBJS = sys/x11/xlib.o sys/x11/keymap.o @JOY@ @SOUND@
-X11_LIBS = @XLIBS@ -lX11 -lXext
+X11_LIBS = -Wl,-R${X11BASE}/lib @XLIBS@ -lX11 -lXext
all: $(TARGETS)
include Rules
fbgnuboy: $(OBJS) $(SYS_OBJS) $(FB_OBJS)
- $(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(FB_OBJS) -o $@ $(FB_LIBS)
+ $(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(FB_OBJS) -o $@ $(FB_LIBS) $(OSS_LIB)
sgnuboy: $(OBJS) $(SYS_OBJS) $(SVGA_OBJS)
- $(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(SVGA_OBJS) -o $@ $(SVGA_LIBS)
+ $(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(SVGA_OBJS) -o $@ $(SVGA_LIBS) $(OSS_LIB)
sdlgnuboy: $(OBJS) $(SYS_OBJS) $(SDL_OBJS)
- $(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(SDL_OBJS) -o $@ $(SDL_LIBS)
+ $(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(SDL_OBJS) -o $@ $(SDL_LIBS) $(OSS_LIB)
sys/sdl/sdl.o: sys/sdl/sdl.c
$(MYCC) $(SDL_CFLAGS) -c $< -o $@
@@ -53,11 +55,11 @@ sys/sdl/keymap.o: sys/sdl/keymap.c
$(MYCC) $(SDL_CFLAGS) -c $< -o $@
xgnuboy: $(OBJS) $(SYS_OBJS) $(X11_OBJS)
- $(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(X11_OBJS) -o $@ $(X11_LIBS)
+ $(LD) $(LDFLAGS) $(OBJS) $(SYS_OBJS) $(X11_OBJS) -o $@ $(X11_LIBS) $(OSS_LIB)
install: all
- $(INSTALL) -d $(bindir)
- $(INSTALL) -m 755 $(TARGETS) $(bindir)
+ $(INSTALL) -d $(prefix)$(bindir)
+ $(INSTALL) -m 755 $(TARGETS) $(prefix)$(bindir)
clean:
rm -f *gnuboy gmon.out *.o sys/*.o sys/*/*.o asm/*/*.o

42
emulators/gnuboy/patches/patch-ab
View File

@ -1,42 +0,0 @@
$NetBSD: patch-ab,v 1.3 2013/10/28 23:45:28 joerg Exp $
--- configure.in.orig 2001-09-24 01:09:31.000000000 +0000
+++ configure.in
@@ -53,6 +53,11 @@ OpenBSD)
SYS_DEFS=-DIS_OBSD
AC_CHECK_HEADERS(soundcard.h, [SOUND=sys/oss/oss.o])
;;
+NetBSD)
+SYS_DEFS=-DIS_NBSD
+AC_CHECK_HEADERS(soundcard.h, [SOUND=sys/oss/oss.o])
+OSS_LIB="$OSS_LIB -lossaudio"
+;;
esac
test "$SOUND" || SOUND=sys/dummy/nosound.o
@@ -205,17 +210,6 @@ case `uname -m` in
i?86) CFLAGS="$CFLAGS -DALLOW_UNALIGNED_IO" ;;
esac
-#case `$CC --version` in
-#2.9*|3.*)
-CFLAGS="$CFLAGS -fstrength-reduce -fthread-jumps \
- -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop \
- -fexpensive-optimizations -fforce-mem -fforce-addr"
-#;;
-#*)
-#AC_MSG_WARN(your compiler is too old for fancy optimizations)
-#;;
-#esac
-
if test "$enable_debug" != yes -a "$enable_profile" != yes ; then
CFLAGS="$CFLAGS -fomit-frame-pointer"
LDFLAGS="$LDFLAGS -s"
@@ -251,6 +245,7 @@ AC_SUBST(SDL_LIBS)
AC_SUBST(TARGETS)
AC_SUBST(XINCS)
AC_SUBST(XLIBS)
+AC_SUBST(OSS_LIB)
AC_CONFIG_HEADER(sys/nix/config.h)
AC_OUTPUT(Makefile)

90
emulators/gnuboy/patches/patch-ac
View File

@ -1,90 +0,0 @@
$NetBSD: patch-ac,v 1.3 2013/10/28 23:45:28 joerg Exp $
--- configure.orig 2001-11-06 08:03:13.000000000 +0000
+++ configure
@@ -2499,6 +2499,59 @@ fi
done
;;
+NetBSD)
+SYS_DEFS=-DIS_NBSD
+
+for ac_header in soundcard.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:2508: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line 2514 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:2518: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:2524: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:2543: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+ SOUND=sys/oss/oss.o
+fi
+done
+
+OSS_LIB="$OSS_LIB -lossaudio"
+;;
esac
test "$SOUND" || SOUND=sys/dummy/nosound.o
@@ -3227,17 +3280,6 @@ case `uname -m` in
i?86) CFLAGS="$CFLAGS -DALLOW_UNALIGNED_IO" ;;
esac
-#case `$CC --version` in
-#2.9*|3.*)
-CFLAGS="$CFLAGS -fstrength-reduce -fthread-jumps \
- -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop \
- -fexpensive-optimizations -fforce-mem -fforce-addr"
-#;;
-#*)
-#AC_MSG_WARN(your compiler is too old for fancy optimizations)
-#;;
-#esac
-
if test "$enable_debug" != yes -a "$enable_profile" != yes ; then
CFLAGS="$CFLAGS -fomit-frame-pointer"
LDFLAGS="$LDFLAGS -s"
@@ -3679,6 +3723,7 @@ s,@SDL_LIBS@,$SDL_LIBS,;t t
s,@TARGETS@,$TARGETS,;t t
s,@XINCS@,$XINCS,;t t
s,@XLIBS@,$XLIBS,;t t
+s,@OSS_LIB@,$OSS_LIB,;t t
CEOF
EOF

17
emulators/gnuboy/patches/patch-ad
View File

@ -1,17 +0,0 @@
$NetBSD: patch-ad,v 1.2 2003/02/14 20:06:02 salo Exp $
--- sys/oss/oss.c.orig Sun Sep 23 14:01:10 2001
+++ sys/oss/oss.c
@@ -7,6 +7,12 @@ char *strdup();
#include <sys/stat.h>
#include <fcntl.h>
+#ifdef IS_NBSD
+#include "sys/ioctl.h"
+#include "soundcard.h"
+#define DSP_DEVICE "/dev/audio"
+#endif
+
#ifdef IS_FBSD
#include "machine/soundcard.h"
#define DSP_DEVICE "/dev/dsp"