diff options
author | fredb <fredb> | 2001-05-16 02:27:52 +0000 |
---|---|---|
committer | fredb <fredb> | 2001-05-16 02:27:52 +0000 |
commit | d15c8cbb065ff438a3551c710c6e47dd0c847c0d (patch) | |
tree | 456b160c7415ea21247f887ef74777be5e0fa1c5 /lang/squeak/patches | |
parent | 5787eeaf161cf035d71fd1cfa54bbfcf1fcc3c0c (diff) | |
download | pkgsrc-d15c8cbb065ff438a3551c710c6e47dd0c847c0d.tar.gz |
Update to squeak-3.0pre2. Where to begin? The default image is more
sophisticated than 2.7's, including improved speech synthesis, MIDI,
graphics, even singing faces. A concise change log is not available.
Diffstat (limited to 'lang/squeak/patches')
-rw-r--r-- | lang/squeak/patches/patch-aa | 80 | ||||
-rw-r--r-- | lang/squeak/patches/patch-ab | 65 | ||||
-rw-r--r-- | lang/squeak/patches/patch-ac | 12 | ||||
-rw-r--r-- | lang/squeak/patches/patch-ad | 22 |
4 files changed, 91 insertions, 88 deletions
diff --git a/lang/squeak/patches/patch-aa b/lang/squeak/patches/patch-aa index f167bb3fbd8..bb83e0ec50c 100644 --- a/lang/squeak/patches/patch-aa +++ b/lang/squeak/patches/patch-aa @@ -1,58 +1,30 @@ -$NetBSD: patch-aa,v 1.3 2001/05/02 04:02:06 fredb Exp $ +$NetBSD: patch-aa,v 1.4 2001/05/16 02:27:53 fredb Exp $ ---- conf/configure.in.orig Mon Aug 14 18:07:46 2000 -+++ conf/configure.in Mon Aug 14 18:10:40 2000 -@@ -105,10 +105,10 @@ - AC_TRY_RUN([int main(){return !((__GNUC__ >= 2) && (__GNUC_MINOR__ > 90));}], - ac_cv_prog_egcs="yes", ac_cv_prog_egcs="no")) +--- ../src/unix/Makefile.in.orig Mon Feb 12 16:59:20 2001 ++++ ../src/unix/Makefile.in +@@ -71,7 +71,7 @@ + datadir= @datadir@ + mandir= @mandir@ -- CFLAGS="-g -O2" -- WFLAGS="-Wall" -+ CFLAGS="-O2" -+# WFLAGS="-Wall" - LD="$CC" -- LDFLAGS="-rdynamic" -+ LDFLAGS="-Wl,--export-dynamic" +-docdir= $(prefix)/doc/squeak-$(VERSION) ++docdir= $(prefix)/share/doc/squeak + sqlibdir= $(libdir)/squeak + vsqlibdir= $(sqlibdir)/$(VERSION) + sqdatadir= $(datadir)/squeak +@@ -92,6 +92,7 @@ + INSTALL= @INSTALL@ + INSTALL_PROG= @INSTALL_PROGRAM@ + INSTALL_DATA= @INSTALL_DATA@ ++INSTALL_SCRIPT= @INSTALL_SCRIPT@ - SHCC="$CC" - if test "$ac_cv_prog_egcs" = "yes"; then -@@ -121,12 +121,13 @@ - - case "$host" in - i?86*) CFLAGS="$CFLAGS -fomit-frame-pointer" ;; -- alpha*) CC="$srcdir/../util/decgcc" -- LD="cc" -- LDFLAGS="-taso -call_shared" -- SHCC="../$CC" -- SHLD="cc" -- SHLDFLAGS="-taso -shared -expect_unresolved \"*\"" ;; -+ alpha*) # CC="$srcdir/../util/decgcc" -+ # LD="cc" -+ # LDFLAGS="-taso -call_shared" -+ # SHCC="../$CC" -+ # SHLD="cc" -+ # SHLDFLAGS="-taso -shared -expect_unresolved \"*\"" -+ ;; - esac - - AC_PROG_AWK -@@ -198,7 +199,7 @@ - AC_PATH_X - test ! -f /usr/include/X11/Intrinsic.h -a "$x_includes" != NONE && \ - INCS="-I${x_includes}" -- test "$x_libraries" != NONE -a ! -z "$x_libraries" && LIBS="$LIBS -L${x_libraries}" -+ test "$x_libraries" != NONE -a ! -z "$x_libraries" && LIBS="$LIBS -L${x_libraries} -Wl,-R${x_libraries}" - AC_CHECK_LIB(Xext, XShmAttach) - if test -z "ac_cv_lib_Xext_XShmAttach"; then - AC_MSG_WARN([XShm not found: DISABLING SHARED MEMORY]) -@@ -216,6 +217,10 @@ - case "$host" in - *-linux*) AC_DEFINE(HAVE_OSS) - AC_DEFINE(OSS_DEVICE, ["/dev/dsp"]) -+ ;; -+ *-netbsd*) AC_DEFINE(HAVE_OSS) -+ AC_DEFINE(OSS_DEVICE, ["/dev/audio"]) -+ LIBS="$LIBS -lossaudio" - ;; - esac + UNINSTALL= $(SHELL) $(utldir)/uninstall +@@ -218,7 +219,7 @@ + $(MKINSTALLDIRS) $(DESTDIR)$(vsqlibdir) + $(INSTALL_PROG) squeak $(DESTDIR)$(vsqlibdir) + # test -x j3 && $(INSTALL_PROG) squeak $(DESTDIR)$(vsqlibdir) +- $(INSTALL_PROG) inisqueak $(DESTDIR)$(vsqlibdir) ++ $(INSTALL_SCRIPT) inisqueak $(DESTDIR)$(vsqlibdir) + $(INSTALL_DATA) squeak.map $(DESTDIR)$(vsqlibdir) + $(MKINSTALLDIRS) $(DESTDIR)$(bindir) + ( path=`$(utldir)/relpath $(bindir) $(vsqlibdir)`; \ diff --git a/lang/squeak/patches/patch-ab b/lang/squeak/patches/patch-ab index 97e874595cd..a8d99db7338 100644 --- a/lang/squeak/patches/patch-ab +++ b/lang/squeak/patches/patch-ab @@ -1,29 +1,35 @@ -$NetBSD: patch-ab,v 1.3 2001/05/02 04:02:06 fredb Exp $ +$NetBSD: patch-ab,v 1.4 2001/05/16 02:27:53 fredb Exp $ ---- src/sqUnixSound.c.orig Tue Jun 22 11:07:36 1999 -+++ src/sqUnixSound.c -@@ -38,7 +38,12 @@ - #include <fcntl.h> - #include <sys/time.h> - #include <sys/ioctl.h> +--- ../src/unix/sqUnixSound.c.orig Thu Feb 8 11:27:04 2001 ++++ ../src/unix/sqUnixSound.c +@@ -70,9 +70,16 @@ + # include <fcntl.h> + # include <sys/time.h> + # include <sys/ioctl.h> +#ifdef __NetBSD__ +#include <soundcard.h> ++#ifdef NETBSD_OSS_HACK +#include <sys/audioio.h> ++#endif +#else - #include <sys/soundcard.h> + # include <sys/soundcard.h> +#endif - static unsigned char *auBuf= 0; - -@@ -212,6 +217,30 @@ +-# if !defined(OPEN_SOUND_SYSTEM) && !defined(__FreeBSD__) ++# if !defined(OPEN_SOUND_SYSTEM) && !defined(__FreeBSD__) && !defined(__NetBSD__) + # warning: + # warning: sys/soundcard.h did not define OPEN_SOUND_SYSTEM + # warning: SOUND SUPPORT DISABLED +@@ -274,6 +279,34 @@ int snd_AvailableSpace(void) { -+#if defined(__NetBSD__) && SOUND_VERSION < 0x030001 ++#ifdef NETBSD_OSS_HACK +/* -+ The OSS emulation layer in NetBSD-1.[45].x failed to update -+ audio_buf_info->fragments, so get the information using the -+ native audio driver. ++ This is to work around a bug in NetBSD-1.5.1 and earlier, in which ++ the SNDCTL_DSP_GETOSPACE(&buf_info) ioctl was not handled properly. ++ The correct information is always available via the native audio ++ driver, so use that instead. +*/ + struct audio_info info; + int freeBlocks; @@ -36,21 +42,24 @@ $NetBSD: patch-ab,v 1.3 2001/05/02 04:02:06 fredb Exp $ + } + + /* Make certain we have one, full hardware block free. */ -+ freeBlocks = (long)info.hiwat-- - (long)(info.play.seek--)/info.blocksize; -+ if (freeBlocks > 0) { -+ return info.blocksize; -+ } else { -+ auSemaWaiting= true; -+ return 0; ++ freeBlocks = info.hiwat - (info.play.seek + info.blocksize - 1)/info.blocksize; ++ if (freeBlocks > 0) ++ { ++ return info.blocksize; ++ } ++ else ++ { ++ auSemaWaiting= true; ++ return 0; +#else audio_buf_info info; - if (auFd == -1) return -1; - -@@ -226,6 +255,7 @@ - return 0; - } else { - return info.fragsize; + if (auFd == -1) + return -1; +@@ -294,6 +326,7 @@ + else + { + return info.fragsize; +#endif - } + } } diff --git a/lang/squeak/patches/patch-ac b/lang/squeak/patches/patch-ac index e5cc45cbed4..49566c55a3a 100644 --- a/lang/squeak/patches/patch-ac +++ b/lang/squeak/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2000/08/14 16:51:36 mjl Exp $ +$NetBSD: patch-ac,v 1.3 2001/05/16 02:27:53 fredb Exp $ ---- src/sqXWindow.c.orig Mon Aug 14 18:14:23 2000 -+++ src/sqXWindow.c Mon Aug 14 18:15:35 2000 -@@ -2960,7 +2960,7 @@ +--- ../src/unix/sqXWindow.c.orig Fri Mar 23 16:47:37 2001 ++++ ../src/unix/sqXWindow.c +@@ -4220,7 +4220,7 @@ error("Segmentation fault"); } @@ -11,11 +11,11 @@ $NetBSD: patch-ac,v 1.2 2000/08/14 16:51:36 mjl Exp $ /* headers for setsysinfo (see below) */ # include <sys/sysinfo.h> # include <sys/proc.h> -@@ -2972,7 +2972,7 @@ +@@ -4254,7 +4254,7 @@ /* initialisation */ --#ifdef __alpha__ +-# if defined(__alpha__) +#if defined(__alpha__) && !defined(__NetBSD__) /* disable printing of unaligned access exceptions */ { diff --git a/lang/squeak/patches/patch-ad b/lang/squeak/patches/patch-ad new file mode 100644 index 00000000000..4da90d76b9f --- /dev/null +++ b/lang/squeak/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.1 2001/05/16 02:27:53 fredb Exp $ + +--- ../src/unix/acinclude.m4.orig Mon Feb 12 15:59:05 2001 ++++ ../src/unix/acinclude.m4 +@@ -149,10 +149,16 @@ + AC_DEFUN(AC_HAVE_OSS, + [AC_CACHE_CHECK([for Open Sound System], ac_cv_oss, + AC_TRY_COMPILE([#include <sys/soundcard.h>],[OPEN_SOUND_SYSTEM;], +- ac_cv_oss="yes", ac_cv_oss="no")) ++ ac_cv_oss="yes", ++ AC_TRY_COMPILE([#include <soundcard.h>],[SOUND_VERSION;], ++ ac_cv_oss="yes", ac_cv_oss="no"))) + if $test "$ac_cv_oss" = "yes" -a -e /dev/dsp; then + AC_DEFINE(HAVE_OSS,1) + AC_DEFINE(OSS_DEVICE,"/dev/dsp") ++elif $test "$ac_cv_oss" = "yes" -a -e /dev/audio; then ++ AC_DEFINE(HAVE_OSS,1) ++ AC_DEFINE(OSS_DEVICE,"/dev/audio") ++ AC_CHECK_LIB([ossaudio], [_oss_ioctl]) + fi]) + + AC_DEFUN(AC_C_BYTEORDER, |