diff options
author | markd <markd> | 2010-06-01 21:55:32 +0000 |
---|---|---|
committer | markd <markd> | 2010-06-01 21:55:32 +0000 |
commit | 7cb3ae5962257a2008e109cded1d317537fc46d5 (patch) | |
tree | 586c7b2eeabd9e06e17a00a4e54b242dbb662528 | |
parent | d525ab4f4682d5b62fc2526d0f2e9c8090bacfcd (diff) | |
download | pkgsrc-7cb3ae5962257a2008e109cded1d317537fc46d5.tar.gz |
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.
-rw-r--r-- | lang/squeak-vm/PLIST | 4 | ||||
-rw-r--r-- | lang/squeak-vm/distinfo | 4 | ||||
-rw-r--r-- | lang/squeak-vm/options.mk | 11 | ||||
-rw-r--r-- | lang/squeak-vm/patches/patch-ae | 14 | ||||
-rw-r--r-- | lang/squeak-vm/patches/patch-af | 14 |
5 files changed, 42 insertions, 5 deletions
diff --git a/lang/squeak-vm/PLIST b/lang/squeak-vm/PLIST index e4ba6a76bcb..4d86b3e3322 100644 --- a/lang/squeak-vm/PLIST +++ b/lang/squeak-vm/PLIST @@ -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 @@ ${PLIST.nas}lib/squeak/${PKGVERSION}/so.vm-sound-NAS 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 --git a/lang/squeak-vm/distinfo b/lang/squeak-vm/distinfo index 6e66b6bb97f..cf92726dd16 100644 --- a/lang/squeak-vm/distinfo +++ b/lang/squeak-vm/distinfo @@ -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-aa) = dfdb3be82288e8bd7658832e8dd91d242d2b97b2 SHA1 (patch-ab) = 8f5e72383e4cdc1554e225e9ddafb1c4c17f9ccf SHA1 (patch-ac) = bad06ae257766407c90a62f5927a53c97ee8072a SHA1 (patch-ad) = e426d1de4b496704be08c67d2d2ab61a24735017 +SHA1 (patch-ae) = 73c358e42d153c9e6fe605fa1c77360ad48c6ec3 +SHA1 (patch-af) = 529550d988f5655791942145c79f5448431c04c4 diff --git a/lang/squeak-vm/options.mk b/lang/squeak-vm/options.mk index d6d800f8358..5b2c07f5b4a 100644 --- a/lang/squeak-vm/options.mk +++ b/lang/squeak-vm/options.mk @@ -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 --git a/lang/squeak-vm/patches/patch-ae b/lang/squeak-vm/patches/patch-ae new file mode 100644 index 00000000000..b3837f635b1 --- /dev/null +++ b/lang/squeak-vm/patches/patch-ae @@ -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 --git a/lang/squeak-vm/patches/patch-af b/lang/squeak-vm/patches/patch-af new file mode 100644 index 00000000000..16e9ba34e20 --- /dev/null +++ b/lang/squeak-vm/patches/patch-af @@ -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 () ++ |