Update to xtrs-4.9dnb1: enable sound support through OSS.diff -r1.17 -r1.18 pkgsrc/emulators/xtrs/Makefile
(is)
@@ -1,37 +1,53 @@ | @@ -1,37 +1,53 @@ | |||
1 | # $NetBSD: Makefile,v 1.17 2013/01/12 19:07:55 is Exp $ | 1 | # $NetBSD: Makefile,v 1.18 2013/01/13 20:54:30 is Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= xtrs-4.9d | 4 | DISTNAME= xtrs-4.9d | |
5 | #PKGREVISION= 1 | 5 | PKGREVISION= 1 | |
6 | CATEGORIES= emulators | 6 | CATEGORIES= emulators | |
7 | MASTER_SITES= http://www.tim-mann.org/trs80/ | 7 | MASTER_SITES= http://www.tim-mann.org/trs80/ | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= ${MASTER_SITES} | 10 | HOMEPAGE= ${MASTER_SITES} | |
11 | COMMENT= TRS-80 Model I/III/4 Emulator for Unix | 11 | COMMENT= TRS-80 Model I/III/4 Emulator for Unix | |
12 | 12 | |||
13 | BUILD_TARGET= default | 13 | BUILD_TARGET= default | |
14 | 14 | |||
15 | .include "../../mk/oss.buildlink3.mk" | |||
16 | ||||
15 | SUBST_CLASSES+= mf | 17 | SUBST_CLASSES+= mf | |
16 | SUBST_STAGE.mf= post-patch | 18 | SUBST_STAGE.mf= post-patch | |
17 | SUBST_FILES.mf= Makefile.local | 19 | SUBST_FILES.mf= Makefile.local | |
18 | SUBST_SED.mf= -e 's|/usr/local|${PREFIX}|g' \ | 20 | SUBST_SED.mf= -e 's|/usr/local|${PREFIX}|g' \ | |
19 | -e 's|/usr/X11/|${X11PREFIX}/|g' \ | 21 | -e 's|/usr/X11/|${X11PREFIX}/|g' \ | |
20 | -e 's|/usr/include/X11|${X11BASE}/include|g' \ | 22 | -e 's|/usr/include/X11|${X11BASE}/include|g' \ | |
21 | -e 's|^\(LDFLAGS = \)-L/usr/X11R6/lib|\1-Wl,-R${X11BASE}/lib -L${X11BASE}/lib|g' \ | 23 | -e 's|^\(LDFLAGS = \)-L/usr/X11R6/lib|\1-Wl,-R${X11BASE}/lib -L${X11BASE}/lib|g' \ | |
24 | -e 's|^\#EXTRALIBS.*|EXTRALIBS=${BUILDLINK_LDADD.oss}|'\ | |||
22 | -e 's|/share/man|/man|g' | 25 | -e 's|/share/man|/man|g' | |
23 | 26 | |||
27 | SUBST_CLASSES+= oss | |||
28 | SUBST_STAGE.oss= post-patch | |||
29 | SUBST_FILES.oss= trs_cassette.c cassette | |||
30 | .if ${OSS_TYPE} != none | |||
31 | SUBST_SED.oss= -e 's|/dev/dsp|${DEVOSSSOUND}|g' \ | |||
32 | -e 's|if __linux|if 1|' | |||
33 | .endif | |||
34 | ||||
35 | ||||
24 | INSTALL_MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin \ | 36 | INSTALL_MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin \ | |
25 | MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} | 37 | MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} | |
26 | INSTALLATION_DIRS= bin lib/xtrs ${PKGMANDIR}/man1 share/doc/xtrs share/xtrs | 38 | INSTALLATION_DIRS= bin lib/xtrs ${PKGMANDIR}/man1 share/doc/xtrs share/xtrs | |
27 | 39 | |||
40 | pre-patch: | |||
41 | mv ${WRKSRC}/cassette.sh ${WRKSRC}/cassette | |||
42 | ||||
28 | post-install: | 43 | post-install: | |
29 | ${INSTALL_DATA} ${WRKSRC}/xtrsrom4p.hex ${DESTDIR}${PREFIX}/lib/xtrs/romimage.m4p | 44 | ${INSTALL_DATA} ${WRKSRC}/xtrsrom4p.hex ${DESTDIR}${PREFIX}/lib/xtrs/romimage.m4p | |
30 | ${INSTALL_DATA} ${WRKSRC}/xtrsrom4p.README ${DESTDIR}${PREFIX}/share/doc/xtrs | 45 | ${INSTALL_DATA} ${WRKSRC}/xtrsrom4p.README ${DESTDIR}${PREFIX}/share/doc/xtrs | |
31 | ${INSTALL_DATA} ${WRKSRC}/utility.dsk ${DESTDIR}${PREFIX}/share/xtrs | 46 | ${INSTALL_DATA} ${WRKSRC}/utility.dsk ${DESTDIR}${PREFIX}/share/xtrs | |
32 | ${INSTALL_DATA} ${WRKSRC}/cpmutil.dsk ${DESTDIR}${PREFIX}/share/xtrs | 47 | ${INSTALL_DATA} ${WRKSRC}/cpmutil.dsk ${DESTDIR}${PREFIX}/share/xtrs | |
48 | ${INSTALL_SCRIPT} ${WRKSRC}/cassette ${DESTDIR}${PREFIX}/bin | |||
33 | 49 | |||
34 | .include "../../devel/ncurses/buildlink3.mk" | 50 | .include "../../devel/ncurses/buildlink3.mk" | |
35 | .include "../../devel/readline/buildlink3.mk" | 51 | .include "../../devel/readline/buildlink3.mk" | |
36 | .include "../../x11/libX11/buildlink3.mk" | 52 | .include "../../x11/libX11/buildlink3.mk" | |
37 | .include "../../mk/bsd.pkg.mk" | 53 | .include "../../mk/bsd.pkg.mk" |
@@ -1,14 +1,15 @@ | @@ -1,14 +1,15 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.3 2013/01/12 19:26:51 is Exp $ | 1 | @comment $NetBSD: PLIST,v 1.4 2013/01/13 20:54:30 is Exp $ | |
2 | bin/cassette | |||
2 | bin/cmddump | 3 | bin/cmddump | |
3 | bin/hex2cmd | 4 | bin/hex2cmd | |
4 | bin/mkdisk | 5 | bin/mkdisk | |
5 | bin/xtrs | 6 | bin/xtrs | |
6 | lib/xtrs/romimage.m4p | 7 | lib/xtrs/romimage.m4p | |
7 | man/man1/cassette.1 | 8 | man/man1/cassette.1 | |
8 | man/man1/cmddump.1 | 9 | man/man1/cmddump.1 | |
9 | man/man1/hex2cmd.1 | 10 | man/man1/hex2cmd.1 | |
10 | man/man1/mkdisk.1 | 11 | man/man1/mkdisk.1 | |
11 | man/man1/xtrs.1 | 12 | man/man1/xtrs.1 | |
12 | share/doc/xtrs/xtrsrom4p.README | 13 | share/doc/xtrs/xtrsrom4p.README | |
13 | share/xtrs/cpmutil.dsk | 14 | share/xtrs/cpmutil.dsk | |
14 | share/xtrs/utility.dsk | 15 | share/xtrs/utility.dsk |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.6 2013/01/12 19:07:55 is Exp $ | 1 | $NetBSD: distinfo,v 1.7 2013/01/13 20:54:30 is Exp $ | |
2 | 2 | |||
3 | SHA1 (xtrs-4.9d.tar.gz) = 72b99ede6e8024b8ade4f8aa22eb073078576e74 | 3 | SHA1 (xtrs-4.9d.tar.gz) = 72b99ede6e8024b8ade4f8aa22eb073078576e74 | |
4 | RMD160 (xtrs-4.9d.tar.gz) = 009786b70fe1006d552b1d89ac2b74247b17e03f | 4 | RMD160 (xtrs-4.9d.tar.gz) = 009786b70fe1006d552b1d89ac2b74247b17e03f | |
5 | Size (xtrs-4.9d.tar.gz) = 455355 bytes | 5 | Size (xtrs-4.9d.tar.gz) = 455355 bytes | |
6 | SHA1 (patch-trs_cassette.c) = 44c1a8617a4b9d984aa1b740ca14b5a471acad79 | 6 | SHA1 (patch-trs_cassette.c) = 1f129feecf54b2165d993f0fa2dbfac63bdb146f | |
7 | SHA1 (patch-trs_disk.c) = b43c7592db9a183b69bc2b17a7ddc4a1e32713e4 | 7 | SHA1 (patch-trs_disk.c) = b43c7592db9a183b69bc2b17a7ddc4a1e32713e4 | |
8 | SHA1 (patch-trs_xinterface.c) = e2190ea74f38d2cfc8fb7e8d17c5e889490aaa48 | 8 | SHA1 (patch-trs_xinterface.c) = e2190ea74f38d2cfc8fb7e8d17c5e889490aaa48 |
@@ -1,37 +1,38 @@ | @@ -1,37 +1,38 @@ | |||
1 | $NetBSD: patch-trs_cassette.c,v 1.1 2013/01/12 19:07:55 is Exp $ | 1 | $NetBSD: patch-trs_cassette.c,v 1.2 2013/01/13 20:54:31 is Exp $ | |
2 | 2 | |||
3 | --- trs_cassette.c.orig 2008-06-26 04:40:13.000000000 +0000 | 3 | --- trs_cassette.c.orig 2008-06-26 04:40:13.000000000 +0000 | |
4 | +++ trs_cassette.c | 4 | +++ trs_cassette.c | |
5 | @@ -234,15 +234,17 @@ static long wave_dataid_offset = WAVE_DA | 5 | @@ -234,15 +234,19 @@ static long wave_dataid_offset = WAVE_DA | |
6 | static long wave_datasize_offset = WAVE_DATASIZE_OFFSET; | 6 | static long wave_datasize_offset = WAVE_DATASIZE_OFFSET; | |
7 | static long wave_data_offset = WAVE_DATA_OFFSET; | 7 | static long wave_data_offset = WAVE_DATA_OFFSET; | |
8 | 8 | |||
9 | +#if HAVE_OSS | 9 | +#if HAVE_OSS | |
10 | /* Orchestra 80/85/90 stuff */ | 10 | /* Orchestra 80/85/90 stuff */ | |
11 | static int orch90_left = 128, orch90_right = 128; | 11 | static int orch90_left = 128, orch90_right = 128; | |
12 | +#endif | 12 | +#endif | |
13 | 13 | |||
14 | #if SB_SOUND | 14 | #if SB_SOUND | |
15 | /* ioport of the SoundBlaster command register. 0 means none */ | 15 | /* ioport of the SoundBlaster command register. 0 means none */ | |
16 | static unsigned char sb_cassette_volume[4]; | 16 | static unsigned char sb_cassette_volume[4]; | |
17 | static unsigned char sb_sound_volume[2]; | 17 | static unsigned char sb_sound_volume[2]; | |
18 | -#endif /*SB_SOUND*/ | 18 | #endif /*SB_SOUND*/ | |
19 | +#if SB_SOUND || OSS_SOUND | |||
19 | static unsigned int sb_address=0; | 20 | static unsigned int sb_address=0; | |
20 | +#endif /*SB_SOUND*/ | 21 | +#endif | |
21 | static int sb_volume = 0; | 22 | static int sb_volume = 0; | |
22 | 23 | |||
23 | /* Put a 2-byte quantity to a file in little-endian order */ | 24 | /* Put a 2-byte quantity to a file in little-endian order */ | |
24 | @@ -1221,11 +1223,13 @@ trs_sound_out(int value) | 25 | @@ -1221,11 +1225,13 @@ trs_sound_out(int value) | |
25 | #endif | 26 | #endif | |
26 | } | 27 | } | |
27 | 28 | |||
28 | +#if HAVE_OSS | 29 | +#if HAVE_OSS | |
29 | static void | 30 | static void | |
30 | orch90_flush(int dummy) | 31 | orch90_flush(int dummy) | |
31 | { | 32 | { | |
32 | trs_orch90_out(0, FLUSH); | 33 | trs_orch90_out(0, FLUSH); | |
33 | } | 34 | } | |
34 | +#endif | 35 | +#endif | |
35 | 36 | |||
36 | /* Orchestra 85/90 */ | 37 | /* Orchestra 85/90 */ | |
37 | /* Not supported in obsolescent SB_SOUND mode */ | 38 | /* Not supported in obsolescent SB_SOUND mode */ |