[pkgsrc/trunk]: pkgsrc/lang/squeak-vm Add a pulseaudio option and patch so th...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/496aac324f97
branches:  trunk
changeset: 576102:496aac324f97
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Jun 01 21:55:32 2010 +0000

description:
Add a pulseaudio option and patch so that cmake doesn't try to build
pulseaudio plugin unless option selected.  Option off by default
so no change to default package build.
Fixes build if you happen to have pulseaudio package installed when
building.

diffstat:

 lang/squeak-vm/PLIST            |   4 +++-
 lang/squeak-vm/distinfo         |   4 +++-
 lang/squeak-vm/options.mk       |  11 ++++++++---
 lang/squeak-vm/patches/patch-ae |  14 ++++++++++++++
 lang/squeak-vm/patches/patch-af |  14 ++++++++++++++
 5 files changed, 42 insertions(+), 5 deletions(-)

diffs (99 lines):

diff -r 40baf8271cf2 -r 496aac324f97 lang/squeak-vm/PLIST
--- a/lang/squeak-vm/PLIST      Tue Jun 01 21:48:30 2010 +0000
+++ b/lang/squeak-vm/PLIST      Tue Jun 01 21:55:32 2010 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/11 00:58:19 asau Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/06/01 21:55:32 markd Exp $
 bin/squeak
 bin/squeak.sh
 lib/squeak/${PKGVERSION}/so.AioPlugin
 lib/squeak/${PKGVERSION}/so.B3DAcceleratorPlugin
 lib/squeak/${PKGVERSION}/so.ClipboardExtendedPlugin
+${PLIST.pulse}lib/squeak/${PKGVERSION}/so.DBusPlugin
 lib/squeak/${PKGVERSION}/so.FileCopyPlugin
 lib/squeak/${PKGVERSION}/so.HostWindowPlugin
 lib/squeak/${PKGVERSION}/so.ImmX11Plugin
@@ -25,5 +26,6 @@
 lib/squeak/${PKGVERSION}/so.vm-sound-OSS
 lib/squeak/${PKGVERSION}/so.vm-sound-custom
 lib/squeak/${PKGVERSION}/so.vm-sound-null
+${PLIST.pulse}lib/squeak/${PKGVERSION}/so.vm-sound-pulse
 lib/squeak/${PKGVERSION}/squeakvm
 man/man1/squeak.1
diff -r 40baf8271cf2 -r 496aac324f97 lang/squeak-vm/distinfo
--- a/lang/squeak-vm/distinfo   Tue Jun 01 21:48:30 2010 +0000
+++ b/lang/squeak-vm/distinfo   Tue Jun 01 21:55:32 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/02/11 00:58:19 asau Exp $
+$NetBSD: distinfo,v 1.2 2010/06/01 21:55:32 markd Exp $
 
 SHA1 (squeak/Squeak-3.11.3.2135-src.tar.gz) = cdc033b14e56ea05aa62bcb1686bb73f4347e29f
 RMD160 (squeak/Squeak-3.11.3.2135-src.tar.gz) = abb7dbde7e79f18161842d1451959ad09e7ef3ad
@@ -7,3 +7,5 @@
 SHA1 (patch-ab) = 8f5e72383e4cdc1554e225e9ddafb1c4c17f9ccf
 SHA1 (patch-ac) = bad06ae257766407c90a62f5927a53c97ee8072a
 SHA1 (patch-ad) = e426d1de4b496704be08c67d2d2ab61a24735017
+SHA1 (patch-ae) = 73c358e42d153c9e6fe605fa1c77360ad48c6ec3
+SHA1 (patch-af) = 529550d988f5655791942145c79f5448431c04c4
diff -r 40baf8271cf2 -r 496aac324f97 lang/squeak-vm/options.mk
--- a/lang/squeak-vm/options.mk Tue Jun 01 21:48:30 2010 +0000
+++ b/lang/squeak-vm/options.mk Tue Jun 01 21:55:32 2010 +0000
@@ -1,14 +1,19 @@
-# $NetBSD: options.mk,v 1.1.1.1 2010/02/11 00:58:19 asau Exp $
+# $NetBSD: options.mk,v 1.2 2010/06/01 21:55:32 markd Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.squeak-vm
-PKG_SUPPORTED_OPTIONS=         nas
+PKG_SUPPORTED_OPTIONS=         nas pulseaudio
 PKG_SUGGESTED_OPTIONS=         nas
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS=    nas
+PLIST_VARS=    nas pulse
 
 .if !empty(PKG_OPTIONS:Mnas)
 PLIST.nas=     yes
 .include "../../audio/nas/buildlink3.mk"
 .endif
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+PLIST.pulse=   yes
+.include "../../audio/pulseaudio/buildlink3.mk"
+.endif
diff -r 40baf8271cf2 -r 496aac324f97 lang/squeak-vm/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/squeak-vm/patches/patch-ae   Tue Jun 01 21:55:32 2010 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2010/06/01 21:55:32 markd Exp $
+
+Make pulseaudio optional.
+
+--- unix/vm-sound-pulse/config.cmake.orig      2009-09-14 21:09:24.000000000 +0000
++++ unix/vm-sound-pulse/config.cmake
+@@ -1 +1,7 @@
+ PLUGIN_REQUIRE_LIBRARY (PULSE pulse-simple)
++
++CHECK_LIBRARY_EXISTS (pulse-simple pa_stream_new "" HAVE_PULSE)
++IF (NOT HAVE_PULSE)
++  PLUGIN_DISABLE ()
++ENDIF ()
++
diff -r 40baf8271cf2 -r 496aac324f97 lang/squeak-vm/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/squeak-vm/patches/patch-af   Tue Jun 01 21:55:32 2010 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2010/06/01 21:55:32 markd Exp $
+
+Make dbus optional.
+
+--- unix/plugins/DBusPlugin/config.cmake.orig  2009-08-26 18:38:47.000000000 +0000
++++ unix/plugins/DBusPlugin/config.cmake
+@@ -1 +1,7 @@
+ PLUGIN_REQUIRE_PACKAGE (DBUS1 dbus-1)
++
++CHECK_LIBRARY_EXISTS (dbus-1 dbus_bus_get "" HAVE_DBUS)
++IF (NOT HAVE_DBUS)
++  PLUGIN_DISABLE ()
++ENDIF ()
++