summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emulators/vice/Makefile11
-rw-r--r--emulators/vice/PLIST5
-rw-r--r--emulators/vice/distinfo12
-rw-r--r--emulators/vice/patches/patch-ac110
-rw-r--r--emulators/vice/patches/patch-ae18
5 files changed, 123 insertions, 33 deletions
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index fc5eafb47f4..ac858645e4b 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2005/12/04 00:51:36 joerg Exp $
+# $NetBSD: Makefile,v 1.60 2005/12/11 22:46:50 dillo Exp $
#
-DISTNAME= vice-1.16
+DISTNAME= vice-1.18
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/ \
http://www.nic.funet.fi/pub/cbm/crossplatform/emulators/VICE/
@@ -31,12 +31,12 @@ INFO_FILES= vice.info
.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS_VAR= PKG_OPTIONS.vice
-PKG_SUPPORTED_OPTIONS= esound ffmpeg gnome
+PKG_SUPPORTED_OPTIONS= esound ffmpeg lame gnome
.include "../../mk/bsd.options.mk"
.if (${OPSYS} == NetBSD)
-CONFIGURE_ENV+= ac_cv_header_sys_soundcard_h=no
+CONFIGURE_ARGS+= --without-oss
.endif
.if !empty(PKG_OPTIONS:Mffmpeg)
@@ -72,6 +72,9 @@ post-install:
.include "../../graphics/xpm/buildlink3.mk"
.if !empty(PKG_OPTIONS:Mffmpeg)
.include "../../multimedia/ffmpeg/buildlink3.mk"
+. if !empty(PKG_OPTIONS:Mlame)
+.include "../../audio/lame/buildlink3.mk"
+. endif
.endif
.if !empty(PKG_OPTIONS:Mgnome)
.include "../../x11/gnome-libs/buildlink3.mk"
diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST
index fcb47e7ebf5..8347e42005a 100644
--- a/emulators/vice/PLIST
+++ b/emulators/vice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2005/02/06 23:10:09 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.14 2005/12/11 22:46:50 dillo Exp $
bin/c1541
bin/petcat
bin/vsid
@@ -32,7 +32,9 @@ share/doc/html/vice/vice_toc.html
share/doc/vice/64doc.txt
share/doc/vice/BUGS
share/doc/vice/COPYING
+share/doc/vice/MSDOS-Ethernet-Howto.txt
share/doc/vice/MSDOS-Howto.txt
+share/doc/vice/MinixVmd-Howto.txt
share/doc/vice/NEWS
share/doc/vice/NLS-Howto.txt
share/doc/vice/PETdoc.txt
@@ -52,6 +54,7 @@ share/doc/vice/vice-logo.jpg
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/vice.mo
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/vice.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/vice.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/vice.mo
${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/vice.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/vice.mo
share/vice/C128/basic64
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 59378332784..6c42b6e2470 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.19 2005/11/18 20:44:55 kristerw Exp $
+$NetBSD: distinfo,v 1.20 2005/12/11 22:46:50 dillo Exp $
-SHA1 (vice-1.16.tar.gz) = ec3780e66a97fc235e3ff04b334210945fa3750a
-RMD160 (vice-1.16.tar.gz) = dc3583bf1cf23930396d7dbc6c397b70c521843a
-Size (vice-1.16.tar.gz) = 3940579 bytes
+SHA1 (vice-1.18.tar.gz) = f37015c28d226057ce8e48bfdbeb18f1d707e343
+RMD160 (vice-1.18.tar.gz) = 58dbebb2e5942a94865cd24c22d2243be103d15c
+Size (vice-1.18.tar.gz) = 4733819 bytes
SHA1 (patch-aa) = fa152c1d14aad31c0b50fe96c83b4e5cfa06de5f
SHA1 (patch-ab) = e9cebe89629f2dacb500695e4205cc33fab18bfe
-SHA1 (patch-ac) = bb648b8dc668a12540eab9f1be6374aab8cda35a
+SHA1 (patch-ac) = 78b47925355731bd7ab9f99a56d7430204c7617f
SHA1 (patch-ad) = 9f26a52a0f60658b147ad62a8cadc37ddd99fe04
-SHA1 (patch-ae) = c2ede31953ebaf033c9ae1aa1985012fb0e5f3b6
+SHA1 (patch-ae) = bfd6cea294951b01054f90aad0b5fd3225e845ff
SHA1 (patch-af) = c7aef30587e36c6f83daab29f76528f49846aa22
diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac
index 8fa2db26ed6..94263ea32fc 100644
--- a/emulators/vice/patches/patch-ac
+++ b/emulators/vice/patches/patch-ac
@@ -1,12 +1,104 @@
-$NetBSD: patch-ac,v 1.13 2004/07/16 22:59:11 kristerw Exp $
+$NetBSD: patch-ac,v 1.14 2005/12/11 22:46:50 dillo Exp $
---- data/fonts/Makefile.in.orig Sat Jul 17 00:15:03 2004
-+++ data/fonts/Makefile.in Sat Jul 17 00:15:14 2004
-@@ -219,7 +219,6 @@
- fontsdir = $(prefix)/lib/vice/fonts
-
- fonts_DATA = \
-- cbm-directory-charset.fon \
- vice-cbm.bdf
+--- src/sounddrv/soundsun.c.orig 2005-07-24 23:17:09.000000000 +0200
++++ src/sounddrv/soundsun.c
+@@ -61,8 +61,11 @@ static int sun_bufferspace(void);
+
+ static int sun_fd = -1;
+ static int sun_8bit = 0;
++static int sun_channels = 1;
+ static int sun_bufsize = 0;
++#if !defined(__NetBSD__)
+ static int sun_written = 0;
++#endif
+
+ static int toulaw8(SWORD data)
+ {
+@@ -104,8 +107,10 @@ static int sun_init(const char *param, i
+ int st;
+ struct audio_info info;
+
++#if !defined(__NetBSD__)
+ /* No stereo capability. */
+ *channels = 1;
++#endif
+
+ if (!param) {
+ if (getenv("AUDIODEV"))
+@@ -118,7 +123,7 @@ static int sun_init(const char *param, i
+ return 1;
+ AUDIO_INITINFO(&info);
+ info.play.sample_rate = *speed;
+- info.play.channels = 1;
++ info.play.channels = *channels;
+ info.play.precision = 16;
+ info.play.encoding = AUDIO_ENCODING_LINEAR;
+ st = ioctl(sun_fd, AUDIO_SETINFO, &info);
+@@ -133,10 +138,14 @@ static int sun_init(const char *param, i
+ goto fail;
+ sun_8bit = 1;
+ *speed = 8000;
++ *channels = 1;
+ log_message(LOG_DEFAULT, "Playing 8 bit ulaw at 8000Hz");
+ }
+ sun_bufsize = (*fragsize)*(*fragnr);
++#if !defined(__NetBSD__)
+ sun_written = 0;
++#endif
++ sun_channels = *channels;
+ return 0;
+ fail:
+ close(sun_fd);
+@@ -155,14 +164,16 @@ static int sun_write(SWORD *pbuf, size_t
+ total = nr;
+ }
+ else
+- total = nr*sizeof(SWORD);
++ total = nr*sizeof(SWORD)*sun_channels;
+ for (i = 0; i < total; i += now)
+ {
+ now = write(sun_fd, (char *)pbuf + i, total - i);
+ if (now <= 0)
+ return 1;
+ }
++#if !defined(__NetBSD__)
+ sun_written += nr;
++#endif
+
+ while (sun_bufferspace() < 0)
+ usleep(5000);
+@@ -172,7 +183,7 @@ static int sun_write(SWORD *pbuf, size_t
+
+ static int sun_bufferspace(void)
+ {
+- int st;
++ int st, size;
+ struct audio_info info;
+ /* ioctl(fd, AUDIO_GET_STATUS, &info) yields number of played samples
+ in info.play.samples. */
+@@ -180,10 +191,11 @@ static int sun_bufferspace(void)
+ if (st < 0)
+ return -1;
+ #if defined(__NetBSD__)
+- if (!sun_8bit)
+- return sun_bufsize - (sun_written - info.play.samples / sizeof(SWORD));
+-#endif
++ size = (sun_8bit ? 1 : 2) * sun_channels;
++ return sun_bufsize - info.play.seek / size;
++#else
+ return sun_bufsize - (sun_written - info.play.samples);
++#endif
+ }
+
+ static void sun_close(void)
+@@ -192,7 +204,10 @@ static void sun_close(void)
+ sun_fd = -1;
+ sun_8bit = 0;
+ sun_bufsize = 0;
++#if !defined(__NetBSD__)
+ sun_written = 0;
++#endif
++ sun_channels = 1;
+ }
diff --git a/emulators/vice/patches/patch-ae b/emulators/vice/patches/patch-ae
index 58e51fb4cf4..15065105741 100644
--- a/emulators/vice/patches/patch-ae
+++ b/emulators/vice/patches/patch-ae
@@ -1,7 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2003/06/23 19:05:11 kristerw Exp $
---- src/Makefile.in.orig Mon Jun 23 20:03:19 2003
-+++ src/Makefile.in Mon Jun 23 20:04:28 2003
-@@ -18,7 +18,7 @@
+$NetBSD: patch-ae,v 1.6 2005/12/11 22:46:50 dillo Exp $
+
+--- src/Makefile.in.orig 2005-11-20 20:43:07.000000000 +0100
++++ src/Makefile.in
+@@ -18,7 +18,7 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@@ -10,12 +11,3 @@ $NetBSD: patch-ae,v 1.5 2003/06/23 19:05:11 kristerw Exp $
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
-@@ -220,7 +220,7 @@
-
- # We have to override the automake default, because we need to use
- # $(CXX) instead of $(CC) when compiling with reSID.
--LINK = @LINKCC@ $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -o $@
-+LINK = @LINKCC@ $(CFLAGS) $(INCLUDES) $(CPPFLAGS) $(LDFLAGS) -o $@
-
- SUBDIRS = \
- @RESID_DIR@ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-29 09:04:38 +0000