CVS commit: pkgsrc/lang/squeak-vm

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Dec 20 00:01:37 UTC 2019

Modified Files:
        pkgsrc/lang/squeak-vm: Makefile PLIST PLIST.Linux distinfo
Added Files:
        pkgsrc/lang/squeak-vm/patches:
            patch-unix_plugins_SerialPlugin_sqUnixSerial.c

Log Message:
Deal with custom bitrates on NetBSD. Always build Alsa support, it is
unconditionally at the moment anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/lang/squeak-vm/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/squeak-vm/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/squeak-vm/PLIST.Linux
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/squeak-vm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/squeak-vm/patches/patch-unix_plugins_SerialPlugin_sqUnixSerial.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/squeak-vm/Makefile
diff -u pkgsrc/lang/squeak-vm/Makefile:1.45 pkgsrc/lang/squeak-vm/Makefile:1.46
--- pkgsrc/lang/squeak-vm/Makefile:1.45 Wed Sep 18 14:17:12 2019
+++ pkgsrc/lang/squeak-vm/Makefile      Fri Dec 20 00:01:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2019/09/18 14:17:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2019/12/20 00:01:37 joerg Exp $
 #
 
 SQUEAK_VERSION=        4.10.2.2614
@@ -43,6 +43,7 @@ PLIST_VARS+=  oss
 pre-configure:
        cd ${WRKSRC} && ${MKDIR} ${CONFIGURE_DIRS}
 
+.include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/lang/squeak-vm/PLIST
diff -u pkgsrc/lang/squeak-vm/PLIST:1.4 pkgsrc/lang/squeak-vm/PLIST:1.5
--- pkgsrc/lang/squeak-vm/PLIST:1.4     Mon Oct 29 07:33:40 2012
+++ pkgsrc/lang/squeak-vm/PLIST Fri Dec 20 00:01:37 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/10/29 07:33:40 asau Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/12/20 00:01:37 joerg Exp $
 bin/squeak
 bin/squeak.sh
 lib/squeak/${PKGVERSION}/ckformat
@@ -9,6 +9,7 @@ ${PLIST.pulse}lib/squeak/${PKGVERSION}/s
 lib/squeak/${PKGVERSION}/so.FileCopyPlugin
 lib/squeak/${PKGVERSION}/so.HostWindowPlugin
 lib/squeak/${PKGVERSION}/so.Mpeg3Plugin
+lib/squeak/${PKGVERSION}/so.MIDIPlugin
 lib/squeak/${PKGVERSION}/so.ScratchPlugin
 lib/squeak/${PKGVERSION}/so.Squeak3D
 lib/squeak/${PKGVERSION}/so.SqueakFFIPrims
@@ -18,6 +19,7 @@ lib/squeak/${PKGVERSION}/so.XDisplayCont
 lib/squeak/${PKGVERSION}/so.vm-display-X11
 lib/squeak/${PKGVERSION}/so.vm-display-custom
 lib/squeak/${PKGVERSION}/so.vm-display-null
+lib/squeak/${PKGVERSION}/so.vm-sound-ALSA
 ${PLIST.nas}lib/squeak/${PKGVERSION}/so.vm-sound-NAS
 ${PLIST.oss}lib/squeak/${PKGVERSION}/so.vm-sound-OSS
 lib/squeak/${PKGVERSION}/so.vm-sound-custom

Index: pkgsrc/lang/squeak-vm/PLIST.Linux
diff -u pkgsrc/lang/squeak-vm/PLIST.Linux:1.2 pkgsrc/lang/squeak-vm/PLIST.Linux:1.3
--- pkgsrc/lang/squeak-vm/PLIST.Linux:1.2       Sun Nov 30 02:40:18 2014
+++ pkgsrc/lang/squeak-vm/PLIST.Linux   Fri Dec 20 00:01:37 2019
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2014/11/30 02:40:18 markd Exp $
+@comment $NetBSD: PLIST.Linux,v 1.3 2019/12/20 00:01:37 joerg Exp $
 lib/squeak/${PKGVERSION}/so.CameraPlugin
-lib/squeak/${PKGVERSION}/so.MIDIPlugin
 lib/squeak/${PKGVERSION}/so.WeDoPlugin
 lib/squeak/${PKGVERSION}/so.vm-display-fbdev
-lib/squeak/${PKGVERSION}/so.vm-sound-ALSA

Index: pkgsrc/lang/squeak-vm/distinfo
diff -u pkgsrc/lang/squeak-vm/distinfo:1.8 pkgsrc/lang/squeak-vm/distinfo:1.9
--- pkgsrc/lang/squeak-vm/distinfo:1.8  Tue Nov  3 22:50:45 2015
+++ pkgsrc/lang/squeak-vm/distinfo      Fri Dec 20 00:01:37 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 22:50:45 agc Exp $
+$NetBSD: distinfo,v 1.9 2019/12/20 00:01:37 joerg Exp $
 
 SHA1 (squeak/Squeak-4.10.2.2614-src.tar.gz) = bd807730537122b220840b4a89f04a6689f435c2
 RMD160 (squeak/Squeak-4.10.2.2614-src.tar.gz) = 8e8a94ef036aa9ca51ade7683c3c9c8844a56660
@@ -13,4 +13,5 @@ SHA1 (patch-ac) = bad06ae257766407c90a62
 SHA1 (patch-ad) = e426d1de4b496704be08c67d2d2ab61a24735017
 SHA1 (patch-ae) = 73c358e42d153c9e6fe605fa1c77360ad48c6ec3
 SHA1 (patch-af) = 529550d988f5655791942145c79f5448431c04c4
+SHA1 (patch-unix_plugins_SerialPlugin_sqUnixSerial.c) = 674a9cf191958ecff2cfd1d6527fcff803f27861
 SHA1 (patch-unix_plugins_UUIDPlugin_sqUnixUUID.c) = 949ca3dff48806d99ea8d54d485fea1b6449a6e9

Added files:

Index: pkgsrc/lang/squeak-vm/patches/patch-unix_plugins_SerialPlugin_sqUnixSerial.c
diff -u /dev/null pkgsrc/lang/squeak-vm/patches/patch-unix_plugins_SerialPlugin_sqUnixSerial.c:1.1
--- /dev/null   Fri Dec 20 00:01:37 2019
+++ pkgsrc/lang/squeak-vm/patches/patch-unix_plugins_SerialPlugin_sqUnixSerial.c        Fri Dec 20 00:01:37 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-unix_plugins_SerialPlugin_sqUnixSerial.c,v 1.1 2019/12/20 00:01:37 joerg Exp $
+
+--- unix/plugins/SerialPlugin/sqUnixSerial.c.orig      2019-12-19 23:17:52.826888467 +0000
++++ unix/plugins/SerialPlugin/sqUnixSerial.c
+@@ -16,6 +16,11 @@
+ #include <termios.h>
+ #include <errno.h>
+ 
++#ifdef __NetBSD__
++#define B576000               576000U
++#define B1152000      1152000U
++#endif
++
+ /*** Module variables ***/
+ 
+ #define PORT_NAME_SIZE 64